Merge pull request #2939 from brave/76.0.3809.62-0.67.x

Upgrade from Chromium 75.0.3770.100 to Chromium 76.0.3809.62 (0.67.x)
brave · Jul 19, 2019 · 7448f4f · 7448f4f
2 parents ac98d0d + a350bfb
commit 7448f4f
Show file tree

Hide file tree

Showing 647 changed files with 12,974 additions and 7,040 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -239,33 +239,6 @@ if (!is_mac && !is_android) {
   }
 }
 
-if (target_cpu == "x86") {
-  target_arch = "ia32"
-} else {
-  target_arch = target_cpu
-}
-
-if (!is_android) {
-  chromedriver = "chromedriver"
-  if (is_win) {
-    chromedriver = "$chromedriver.exe"
-  }
-
-  chromedriver_version = "2.33"
-
-  copy("brave_chromedriver_dist_resources") {
-    sources = [
-      "$root_out_dir/$chromedriver",
-    ]
-
-    outputs = [
-      "$brave_dist_dir/$chromedriver"
-    ]
-
-    deps = [ "//chrome/test/chromedriver:chromedriver" ]
-  }
-}
-
 action("generate_chromium_licenses") {
   license_file = "$root_gen_dir/LICENSES.chromium.html"
 
@@ -350,28 +323,19 @@ if (!is_android) {
       "$brave_dist_dir/{{source_file_part}}"
     ]
   }
+}
 
-  zip("chromedriver_zip") {
-    inputs = get_target_outputs(":brave_chromedriver_dist_resources")
-    inputs += get_target_outputs(":brave_license_dist_resources")
-    output = "$brave_dist_dir/chromedriver-v$chromedriver_version-$brave_platform-$target_arch.zip"
-
-    base_dir = brave_dist_dir
-
-    deps = [
-      "app/$current_os:chromedriver_dist_resources",
-      ":brave_chromedriver_dist_resources",
-      ":brave_license_dist_resources",
-    ]
-  }
+if (target_cpu == "x86") {
+  target_arch = "ia32"
+} else {
+  target_arch = target_cpu
 }
 
 action("create_symbols_dist") {
   output = "$brave_dist_dir/$brave_project_name-v$brave_version-$brave_platform-$target_arch-symbols.zip"
 
   script = "//brave/script/create-dist.py"
 
-  # inputs = get_target_outputs(":brave_chromedriver_dist_resources")
   inputs = get_target_outputs(":brave_license_dist_resources")
   dir_inputs = [ "$brave_project_name.breakpad.syms" ]
 
@@ -448,10 +412,6 @@ action("create_dist_zips") {
     "app/$current_os:dist_resources",
   ]
 
-  if (!is_android) {
-    deps += [ ":chromedriver_zip" ]
-  }
-
   if (!is_mac && !is_android) {
     deps += [
       ":brave_dist_resources",

diff --git a/app/android/BUILD.gn b/app/android/BUILD.gn
@@ -1,5 +1,4 @@
 import("//brave/build/config.gni")
 
-group("chromedriver_dist_resources") {}
 group("symbol_dist_resources") {}
 group("dist_resources") {}
diff --git a/app/app_management_strings.grdp b/app/app_management_strings.grdp
@@ -14,7 +14,7 @@
      other {<ph name="APP_1">$1<ex>Gmail</ex></ph>, <ph name="APP_2">$2<ex>Youtube</ex></ph>, <ph name="APP_3">$3<ex>Calendar</ex></ph>, and <ph name="EXTRA_APPS">$4<ex>4</ex></ph> other apps}}
   </message>
   <message name="IDS_APP_MANAGEMENT_APP_LIST_TITLE" desc="Title of app list card on main app management page.">
-    Your apps
+    Manage your apps
   </message>
   <message name="IDS_APP_MANAGEMENT_BACK" desc="Label for button for going back to the previous page.">
     Back
@@ -49,6 +49,12 @@
   <message name="IDS_APP_MANAGEMENT_PERMISSIONS" desc="Label for permissions section in the app settings page.">
     Permissions
   </message>
+  <message name="IDS_APP_MANAGEMENT_MORE_PERMISSIONS" desc="Label for a link to more permissions for an app.">
+    More permissions
+  </message>
+  <message name="IDS_APP_MANAGEMENT_THIS_APP_CAN" desc="Label for permissions that a Brave app can use.">
+    This app can:
+  </message>
   <message name="IDS_APP_MANAGEMENT_PIN_TO_SHELF" desc="Label for the pin to shelf button in the app settings page.">
     Pin to shelf
   </message>

diff --git a/app/brave_command_ids.h b/app/brave_command_ids.h
@@ -1,4 +1,5 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/* Copyright (c) 2019 The Brave Authors. All rights reserved.
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 

diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -140,12 +140,10 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) {
 #if BUILDFLAG(ENABLE_EXTENSIONS)
       extensions_features::kNewExtensionUpdaterService.name,
 #endif
-      features::kDesktopPWAWindowing.name,
   };
 
   // Disabled features.
   const std::unordered_set<const char*> disabled_features = {
-      autofill::features::kAutofillSaveCardSignInAfterLocalSave.name,
       autofill::features::kAutofillServerCommunication.name,
       features::kAudioServiceOutOfProcess.name,
       features::kDefaultEnableOopRasterization.name,

diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc
@@ -40,7 +40,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisableHyperlinkAuditing) {
 
 IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) {
   const base::Feature* disabled_features[] = {
-      &autofill::features::kAutofillSaveCardSignInAfterLocalSave,
       &autofill::features::kAutofillServerCommunication,
       &features::kAudioServiceOutOfProcess,
       &features::kDefaultEnableOopRasterization,

diff --git a/app/brave_strings.grd b/app/brave_strings.grd
@@ -422,34 +422,19 @@ Brave is unable to recover your settings.
       <message name="IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS" desc="Message shown on the download shelf when the download is known to change settings in the browser in a malicious way.">
         <ph name="FILE_NAME">$1<ex>bla.exe</ex></ph> may be dangerous, so Brave has blocked it.
       </message>
-      <message name="IDS_PROMPT_DOWNLOAD_CHANGES_SETTINGS_IN_ADVANCED_PROTECTION" desc="Message shown on the download shelf when the download is known to change settings in the browser in a malicious way. This variant is shown when the user is enrolled in the Advanced Protection program.">
-        <ph name="FILE_NAME">$1<ex>bla.exe</ex></ph> may be dangerous, so Brave has blocked it. You're defended by Advanced Protection.
-      </message>
 
       <message name="IDS_PROMPT_MALICIOUS_DOWNLOAD_URL" desc="Message shown to the user to validate the download when the download url is classified to lead to malware by the safebrowsing database.">
         This file is dangerous, so Brave has blocked it.
       </message>
-      <message name="IDS_PROMPT_MALICIOUS_DOWNLOAD_URL_IN_ADVANCED_PROTECTION" desc="Message shown to the user to validate the download when the download url is classified to lead to malware by the safebrowsing database. This variant is shown when the user is enrolled in this Advanced Protection program.">
-        This file is dangerous, so Brave has blocked it. You're defended by Advanced Protection.
-      </message>
       <message name="IDS_PROMPT_MALICIOUS_DOWNLOAD_CONTENT" desc="Message shown to the user to validate the download when the download content is classified to lead to malware by safebrowsing.">
         <ph name="FILE_NAME">$1<ex>malware.exe</ex></ph> is dangerous, so Brave has blocked it.
       </message>
-      <message name="IDS_PROMPT_MALICIOUS_DOWNLOAD_CONTENT_IN_ADVANCED_PROTECTION" desc="Message shown to the user to validate the download when the download content is classified to lead to malware by safebrowsing. This variant is shown when the user is enrolled in the Advanced Protection program.">
-        <ph name="FILE_NAME">$1<ex>malware.exe</ex></ph> is dangerous, so Brave has blocked it. You're defended by Advanced Protection.
-      </message>
       <message name="IDS_BLOCK_REASON_DANGEROUS_DOWNLOAD" desc="Message shown to the user on chrome://downloads page to explain that this download is blocked because it is malware.">
         This file is dangerous, so Brave has blocked it.
       </message>
-      <message name="IDS_BLOCK_REASON_DANGEROUS_DOWNLOAD_IN_ADVANCED_PROTECTION" desc="Message shown to the user on chrome://downloads page to explain that this download is blocked because it is malware. This variant is shown when the user is enrolled in the Advanced Protection program.">
-        This file is dangerous, so Brave has blocked it. You're defended by Advanced Protection.
-      </message>
       <message name="IDS_BLOCK_REASON_UNWANTED_DOWNLOAD" desc="Message shown to the user on chrome://downloads page to explain that this download is blocked because it is unwanted sofware.">
         This file may be dangerous, so Brave has blocked it.
       </message>
-      <message name="IDS_BLOCK_REASON_UNWANTED_DOWNLOAD_IN_ADVANCED_PROTECTION" desc="Message shown to the user on chrome://downloads page to explain that this download is blocked because it is unwanted sofware. This variant is shown when the user is enrolled in the Advanced Protection program.">
-        This file may be dangerous, so Brave has blocked it. You're defended by Advanced Protection.
-      </message>
 
       <!-- Abandon in-progress downloads confirmation dialog -->
       <if expr="not is_macosx">
@@ -753,15 +738,11 @@ Signing in anyway will merge Brave information like bookmarks, history, and othe
         </message>
       </if>
 
-      <message name="IDS_AUTOFILL_DIALOG_SAVE_LOCALLY_CHECKBOX" desc="Checkbox that controls whether info the user types into the autofill dialog is saved by chrome.">
-        Save details in Brave
-      </message>
-      <message name="IDS_AUTOFILL_DIALOG_SAVE_LOCALLY_TOOLTIP" desc="Tooltip which explains function of checkbox that controls whether info the user types into the autofill dialog is saved by chrome.">
-        Brave will securely store your personal details so you don't need to type them in again.
-      </message>
-      <message name="IDS_AUTOFILL_DESCRIBE_LOCAL_COPY" desc="Text label that described a Wallet credit card which has been copied to the local Brave instance.">
-        Copied to Brave
-      </message>
+      <if expr="is_android">
+        <message name="IDS_AUTOFILL_DESCRIBE_LOCAL_COPY" desc="Text label that described a Wallet credit card which has been copied to the local Brave instance.">
+          Copied to Brave
+        </message>
+      </if>
 
       <!-- App list -->
       <if expr="enable_app_list">
@@ -930,7 +911,7 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
           If an image doesn’t have a useful description, Brave will try to provide one for you. To create descriptions, images are sent to Brave.
         </message>
         <message name="IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT" desc="The text of a bubble that confirms users allows integrating the spelling service of Brave to Brave.">
-          This uses the same spellchecker that's used in Brave search. Text you type in the browser is sent to Brave. You can always change this behavior in settings.
+          This uses the same spell checker that's used in Brave search. Text you type in the browser is sent to Brave. You can always change this behavior in settings.
         </message>
         <if expr="not use_titlecase">
           <message name="IDS_CONTENT_CONTEXT_OPENLINKNEWTAB_INAPP" desc="The name of the command to open a link in a newly created browser tab when the user is in an app window">
@@ -1213,76 +1194,39 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
       <!-- Relaunch notification bubble and dialog. -->
       <if expr="not is_android">
         <if expr="not chromeos">
-          <then>
-            <message name="IDS_RELAUNCH_RECOMMENDED_TITLE" desc="The title of a dialog that tells users that a browser relaunch is recommended for an update available for some number of days.">
-              {0, plural,
-               =0 {A Brave update is available}
-               =1 {A Brave update is available}
-               other {A Brave update has been available for # days}}
-            </message>
-            <message name="IDS_RELAUNCH_RECOMMENDED_BODY" desc="The body text of a dialog that tells users that a browser relaunch is recommended for an update.">
-              Your administrator asks that you relaunch Brave to apply this update
-            </message>
-            <message name="IDS_RELAUNCH_REQUIRED_TITLE_DAYS" desc="The title of a dialog that tells users the browser must be relaunched within two or more days.">
-              {0, plural,
-               =1 {Relaunch Brave within a day}
-               other {Relaunch Brave within # days}}
-            </message>
-            <message name="IDS_RELAUNCH_REQUIRED_TITLE_HOURS" desc="The title of a dialog that tells users the browser must be relaunched within one or more hours.">
-              {0, plural,
-               =1 {Brave will relaunch in an hour}
-               other {Brave will relaunch in # hours}}
-            </message>
-            <message name="IDS_RELAUNCH_REQUIRED_TITLE_MINUTES" desc="The title of a dialog that tells users the browser must be relaunched within one or more minutes.">
-              {0, plural,
-               =1 {Brave will relaunch in 1 minute}
-               other {Brave will relaunch in # minutes}}
-            </message>
-            <message name="IDS_RELAUNCH_REQUIRED_TITLE_SECONDS" desc="The title of a dialog that tells users the browser must be relaunched within some number of seconds.">
-              {0, plural,
-               =0 {Brave will relaunch now}
-               =1 {Brave will relaunch in 1 second}
-               other {Brave will relaunch in # seconds}}
-            </message>
-            <message name="IDS_RELAUNCH_REQUIRED_BODY" desc="The body text of a dialog that tells users the browser must be relaunched.">
-              Your administrator requires that you relaunch Brave to apply an update
-            </message>
-          </then>
-          <else>
-            <message name="IDS_RELAUNCH_RECOMMENDED_TITLE" desc="The title of a dialog that tells users that a device restart is recommended for an update available for some number of days.">
-              {0, plural,
-               =0 {A Brave OS update is available}
-               =1 {A Brave OS update is available}
-               other {A Brave OS update has been available for # days}}
-            </message>
-            <message name="IDS_RELAUNCH_RECOMMENDED_BODY" desc="The body text of a dialog that tells users that a device restart is recommended for an update.">
-              Your administrator asks that you restart Brave OS to apply this update
-            </message>
-            <message name="IDS_RELAUNCH_REQUIRED_TITLE_DAYS" desc="The title of a dialog that tells users the device must be restarted within two or more days.">
-              {0, plural,
-               =1 {Restart Brave OS within a day}
-               other {Restart Brave OS within # days}}
-            </message>
-            <message name="IDS_RELAUNCH_REQUIRED_TITLE_HOURS" desc="The title of a dialog that tells users the device must be restarted within one or more hours.">
-              {0, plural,
-               =1 {Brave OS will restart in an hour}
-               other {Brave OS will restart in # hours}}
-            </message>
-            <message name="IDS_RELAUNCH_REQUIRED_TITLE_MINUTES" desc="The title of a dialog that tells users the device must be restarted within one or more minutes.">
-              {0, plural,
-               =1 {Brave OS will restart in 1 minute}
-               other {Brave OS will restart in # minutes}}
-            </message>
-            <message name="IDS_RELAUNCH_REQUIRED_TITLE_SECONDS" desc="The title of a dialog that tells users the device must be restarted within some number of seconds.">
-              {0, plural,
-               =0 {Brave OS will restart now}
-               =1 {Brave OS will restart in 1 second}
-               other {Brave OS will restart in # seconds}}
-            </message>
-            <message name="IDS_RELAUNCH_REQUIRED_BODY" desc="The body text of a dialog that tells users the device must be restarted.">
-              Your administrator requires that you restart Brave OS to apply an update
-            </message>
-          </else>
+          <message name="IDS_RELAUNCH_RECOMMENDED_TITLE" desc="The title of a dialog that tells users that a browser relaunch is recommended for an update available for some number of days.">
+            {0, plural,
+              =0 {A Brave update is available}
+              =1 {A Brave update is available}
+              other {A Brave update has been available for # days}}
+          </message>
+          <message name="IDS_RELAUNCH_RECOMMENDED_BODY" desc="The body text of a dialog that tells users that a browser relaunch is recommended for an update.">
+            Your administrator asks that you relaunch Brave to apply this update
+          </message>
+          <message name="IDS_RELAUNCH_REQUIRED_TITLE_DAYS" desc="The title of a dialog that tells users the browser must be relaunched within two or more days.">
+            {0, plural,
+              =1 {Relaunch Brave within a day}
+              other {Relaunch Brave within # days}}
+          </message>
+          <message name="IDS_RELAUNCH_REQUIRED_TITLE_HOURS" desc="The title of a dialog that tells users the browser must be relaunched within one or more hours.">
+            {0, plural,
+              =1 {Brave will relaunch in an hour}
+              other {Brave will relaunch in # hours}}
+          </message>
+          <message name="IDS_RELAUNCH_REQUIRED_TITLE_MINUTES" desc="The title of a dialog that tells users the browser must be relaunched within one or more minutes.">
+            {0, plural,
+              =1 {Brave will relaunch in 1 minute}
+              other {Brave will relaunch in # minutes}}
+          </message>
+          <message name="IDS_RELAUNCH_REQUIRED_TITLE_SECONDS" desc="The title of a dialog that tells users the browser must be relaunched within some number of seconds.">
+            {0, plural,
+              =0 {Brave will relaunch now}
+              =1 {Brave will relaunch in 1 second}
+              other {Brave will relaunch in # seconds}}
+          </message>
+          <message name="IDS_RELAUNCH_REQUIRED_BODY" desc="The body text of a dialog that tells users the browser must be relaunched.">
+            Your administrator requires that you relaunch Brave to apply an update
+          </message>
         </if>
       </if>
       <!-- Brave launch blocking dialog. -->
@@ -1300,6 +1244,9 @@ Please check your email at <ph name="ACCOUNT_EMAIL">$2<ex>jane.doe@example.com</
           Close
         </message>
       </if>
+      <message name="IDS_DESKTOP_MEDIA_PICKER_TITLE_WEB_CONTENTS_ONLY" desc="Title for the window picker dialog shown when desktop capture of a tab is requested by an app.">
+        Share a Brave tab
+      </message>
     </messages>
   </release>
 </grit>
diff --git a/app/extensions_strings.grdp b/app/extensions_strings.grdp
@@ -179,6 +179,9 @@
   <message name="IDS_EXTENSIONS_ACTIVITY_LOG_COLLAPSE_ALL" desc="The label of the button to collapse all activity log items.">
     Collapse all
   </message>
+  <message name="IDS_EXTENSIONS_ACTIVITY_LOG_EXPORT_HISTORY" desc="The label of the button to export the activity log history as JSON.">
+    Export Activities
+  </message>
   <message name="IDS_EXTENSIONS_ITEM_ID" desc="The text for the label next to the extension id.">
     &lt;span&gt;ID: &lt;/span&gt;<ph name="EXTENSION_ID">$1<ex>cfhdojbkjhnklbpkdaibdccddilifddb</ex></ph>
   </message>
@@ -293,6 +296,9 @@
   <message name="IDS_EXTENSIONS_LOADING_ACTIVITIES" desc="The message shown to the user when the activity log for an extension is currently being fetched from the API.">
     Fetching activities...
   </message>
+  <message name="IDS_MISSING_OR_UNINSTALLED_EXTENSION" desc="The placeholder for the activity log page header if the extension does not exist or is not installed.">
+    Missing or uninstalled extension
+  </message>
   <message name="IDS_EXTENSIONS_NO_ACTIVITIES" desc="The message shown to the user when an extension has no recent activities.">
     No recent activities
   </message>