diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 788ccfbfeba2..7a4f244e8249 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -610,7 +610,7 @@ are declared in tools/grit/grit_rule.gni. - Remove highlights + Remove highlight @@ -839,7 +839,7 @@ are declared in tools/grit/grit_rule.gni. - Remove Highlights + Remove Highlight @@ -6173,10 +6173,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Suggest strong password - Update password for $1example.com + Update password for %1$sexample.com - Passwords are saved in your Brave sync chain ($1user@gmail.com) so you can use them on any device + Passwords are saved in your Brave sync chain (%1$suser@gmail.com) so you can use them on any device diff --git a/app/nearby_share_strings.grdp b/app/nearby_share_strings.grdp index 71a4cb0663dd..be5d1a3e868b 100644 --- a/app/nearby_share_strings.grdp +++ b/app/nearby_share_strings.grdp @@ -157,25 +157,25 @@ {COUNT, plural, =1 {App} other {# apps}} - {COUNT, plural, =1 {app} other {# apps}} + {COUNT, plural, =1 {an app} other {# apps}} {COUNT, plural, =1 {Image} other {# images}} - {COUNT, plural, =1 {image} other {# images}} + {COUNT, plural, =1 {an image} other {# images}} {COUNT, plural, =1 {File} other {# files}} - {COUNT, plural, =1 {file} other {# files}} + {COUNT, plural, =1 {a file} other {# files}} {COUNT, plural, =1 {Video} other {# videos}} - {COUNT, plural, =1 {video} other {# videos}} + {COUNT, plural, =1 {a video} other {# videos}} Secure connection ID: $11234 @@ -184,19 +184,19 @@ {COUNT, plural, =1 {Address} other {# addresses}} - {COUNT, plural, =1 {address} other {# addresses}} + {COUNT, plural, =1 {an address} other {# addresses}} {COUNT, plural, =1 {Link} other {# links}} - {COUNT, plural, =1 {link} other {# links}} + {COUNT, plural, =1 {a link} other {# links}} {COUNT, plural, =1 {Phone number} other {# phone numbers}} - {COUNT, plural, =1 {phone number} other {# phone numbers}} + {COUNT, plural, =1 {a phone number} other {# phone numbers}} {COUNT, plural, =1 {Text} other {# texts}} @@ -208,7 +208,7 @@ {COUNT, plural, =1 {Item} other {# items}} - {COUNT, plural, =1 {item} other {# items}} + {COUNT, plural, =1 {an item} other {# items}} diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index dc7298412bb4..4db24bc51011 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -257,7 +257,7 @@ Touch the power button with your finger - + The fingerprint sensor is in the power button. Touch it lightly with any finger. @@ -266,12 +266,18 @@ The fingerprint sensor is the bottom left-hand key on your keyboard. Touch it lightly with any finger. - + The fingerprint sensor is the bottom right-hand key on your keyboard. Touch it lightly with any finger. - + The fingerprint sensor is the top right-hand key on your keyboard. Touch it lightly with any finger. + + The fingerprint sensor is on the right-hand side of your $1Bravebook. Touch it lightly with any finger. + + + The fingerprint sensor is on the left-hand side of your $1Bravebook. Touch it lightly with any finger. + diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 09daf4eb8468..e7a00fb22a40 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -568,6 +568,9 @@ CHAR-LIMIT guidelines: Deleting this password will not delete your account on %1$sexample.com + + Deleting this password will not delete your account on %1$sexample.com. Change your password or delete your account on %1$sexample.com to keep it safe from others. + Delete password? @@ -1406,7 +1409,7 @@ Your Brave account may have other forms of browsing history like searches and ac - Choose when to download + Download later instead? You'll see a notification when this file is ready @@ -1429,6 +1432,24 @@ Your Brave account may have other forms of browsing history like searches and ac Ask when to save files + + Your %1$s2G connection might slow down your download + + + 2G + + + Bluetooth + + + Wi-Fi + + + This file is large (%1$s300MB) + + + Done + @@ -2010,13 +2031,13 @@ To change this setting, <resetlink>reset sync

%1$sDownloading file (200 MB) %2$sDetails button - Download will start on Wi-Fi. + You’ll see a notification when this download starts on Wi-Fi. - Download will start on %1$sFeb 28 2020. + You’ll see a notification when this download starts on %1$sFeb 28 2020. - Download will start at %1$s8:30PM. + You’ll see a notification when this download starts at %1$s8:30PM. @@ -3381,10 +3402,16 @@ Data from your Private session will only be cleared from Brave when you %1$sThe meaning of life - Conceal Clipboard Contents + Hide clipboard contents - Reveal Clipboard Contents + Show clipboard contents + + + Clipboard contents hidden + + + Clipboard contents shown Switch To Tab diff --git a/components/arc_strings.grdp b/components/arc_strings.grdp index e82819056b04..2c9b490f55df 100644 --- a/components/arc_strings.grdp +++ b/components/arc_strings.grdp @@ -3,7 +3,7 @@ - Enable Maximizing? + Enable Resizing? This app is designed for mobile devices. It is running in a compatibility mode. Allow resizing might encounter issues including app restarting. @@ -14,4 +14,16 @@ Don't ask me again for this app + + Phone + + + Tablet + + + Desktop + + + Resize Settings + diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 997b4fc8b236..46683bf81174 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index f9e098611a176e638be65297045a13425ab8c688..e22602bff119c8c3732ae5e834f55816053d1534 100644 +index acaff526ff2d8e1822dca295d7eed55ac8fa677d..dd6a801e83448b1d2c4f03aff94d3932393f7d02 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3927,6 +3927,7 @@ if (is_android) { +@@ -3936,6 +3936,7 @@ if (is_android) { "android/java/src/org/chromium/base/task/TaskTraits.java", "android/java/src/org/chromium/base/task/TaskTraitsExtensionDescriptor.java", ] diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index a11d4adac795..c5d69e5719e1 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index b7a01a6160b770ef25db0198b7e310c8a7bd8f95..0fcf8a77b9d5dbba2bd4086f1bf6a2a25e2dcd72 100644 +index 4573bd4fa051a9ea96b992ac425bd01cdfde76b1..59d81b7e54bdb92bff01a1b23e60a0e20b9452be 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -169,6 +169,7 @@ if (!is_android && !is_mac) { @@ -77,7 +77,7 @@ index b7a01a6160b770ef25db0198b7e310c8a7bd8f95..0fcf8a77b9d5dbba2bd4086f1bf6a2a2 ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ] -@@ -1293,6 +1301,7 @@ if (is_win) { +@@ -1297,6 +1305,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -85,7 +85,7 @@ index b7a01a6160b770ef25db0198b7e310c8a7bd8f95..0fcf8a77b9d5dbba2bd4086f1bf6a2a2 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/app:shutdown_signal_handlers", -@@ -1395,12 +1404,13 @@ group("child_dependencies") { +@@ -1399,12 +1408,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -100,7 +100,7 @@ index b7a01a6160b770ef25db0198b7e310c8a7bd8f95..0fcf8a77b9d5dbba2bd4086f1bf6a2a2 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1454,6 +1464,7 @@ group("resources") { +@@ -1458,6 +1468,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index dae4402c2581..a2d8f31880fd 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 25eb5c98e6d91b16f4f21b3ac1327bcf5716b5ed..72888782328d9b51776d0ee69f4719447ef3d74f 100644 +index 9b3f6baacbcf3f6d2d1c0f81f83519566edca30e..72888782328d9b51776d0ee69f4719447ef3d74f 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=91 -MINOR=0 -BUILD=4472 --PATCH=19 +-PATCH=38 +MINOR=1 +BUILD=26 +PATCH=11 diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index a7ce4e5e2ec8..4d7ca758f26e 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 0aeb400764afe3decc10a91d8222b2ec4add99ed..5c4a2ae3685f1ab4d6e8e7d8e52141913f571e75 100644 +index f131e4b93f60674e0dd32c4fc4839e95c122e71d..1b948378047102063a2b7f4c0018d943e7cde245 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -239,6 +239,7 @@ android_resources("chrome_app_java_resources") { @@ -10,7 +10,7 @@ index 0aeb400764afe3decc10a91d8222b2ec4add99ed..5c4a2ae3685f1ab4d6e8e7d8e5214191 } if (enable_vr) { -@@ -565,6 +566,7 @@ android_library("chrome_java") { +@@ -566,6 +567,7 @@ android_library("chrome_java") { ] deps += feed_deps @@ -18,7 +18,7 @@ index 0aeb400764afe3decc10a91d8222b2ec4add99ed..5c4a2ae3685f1ab4d6e8e7d8e5214191 srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -595,6 +597,7 @@ android_library("chrome_java") { +@@ -596,6 +598,7 @@ android_library("chrome_java") { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -26,7 +26,7 @@ index 0aeb400764afe3decc10a91d8222b2ec4add99ed..5c4a2ae3685f1ab4d6e8e7d8e5214191 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -729,6 +732,7 @@ group("jni_headers") { +@@ -732,6 +735,7 @@ group("jni_headers") { "//components/ukm/android:jni_headers", "//components/webauthn/android:jni_headers", ] @@ -34,7 +34,7 @@ index 0aeb400764afe3decc10a91d8222b2ec4add99ed..5c4a2ae3685f1ab4d6e8e7d8e5214191 } # TODO(crbug.com/1112471): Get this to run cleanly under Python 3. -@@ -1961,6 +1965,7 @@ if (current_toolchain == default_toolchain) { +@@ -1969,6 +1973,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -42,7 +42,7 @@ index 0aeb400764afe3decc10a91d8222b2ec4add99ed..5c4a2ae3685f1ab4d6e8e7d8e5214191 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2351,6 +2356,7 @@ android_library("base_module_java") { +@@ -2359,6 +2364,7 @@ android_library("base_module_java") { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 9227ac4ece95..42f923f8fe10 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index 7390a29a662f2d58285fc9f586257c5f1e57e05a..0ae5b05ce35a34326cdb0af9f72a805c23f2fe03 100644 +index b7c22331e2d1cbe71d3d30f308ff30b2b43a3f12..880b243a2a9b16ae3fecfebafb771d8a46027310 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1421,3 +1421,4 @@ chrome_java_sources = [ +@@ -1424,3 +1424,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch index a482b2ee40f4..a9b90148a5c6 100644 --- a/patches/chrome-android-expectations-lint-suppressions.xml.patch +++ b/patches/chrome-android-expectations-lint-suppressions.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml -index 9a0e2da1beb205889f793da52725a61c603f543d..bb310c8485669d2f6edb4032b4a01b33edac7e1e 100644 +index c6c44106495dd3221164ff9621d285b94b9ac31f..2b91b7d11706262ff039946bc634743c102f71a0 100644 --- a/chrome/android/expectations/lint-suppressions.xml +++ b/chrome/android/expectations/lint-suppressions.xml -@@ -285,4 +285,5 @@ https://chromium.googlesource.com/chromium/src/+/master/build/android/docs/lint. +@@ -290,4 +290,5 @@ https://chromium.googlesource.com/chromium/src/+/master/build/android/docs/lint. diff --git a/patches/chrome-android-features-tab_ui-BUILD.gn.patch b/patches/chrome-android-features-tab_ui-BUILD.gn.patch index aa6b631b4122..537fb75c53bb 100644 --- a/patches/chrome-android-features-tab_ui-BUILD.gn.patch +++ b/patches/chrome-android-features-tab_ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn -index 7e9ec6a11e47b4509f4bdbb7fd83187485762356..ceac2817006eff94d86f09d6cddf836906014bc7 100644 +index dd226de107fc488d25ea342019baaaf809978ca3..5778a75368de560e511c0f056ba5d182feddffa5 100644 --- a/chrome/android/features/tab_ui/BUILD.gn +++ b/chrome/android/features/tab_ui/BUILD.gn -@@ -189,6 +189,7 @@ android_library("java") { +@@ -191,6 +191,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsRanker.java", "java/src/org/chromium/chrome/browser/tasks/tab_management/suggestions/TabSuggestionsServerFetcher.java", ] diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 4951a48414e6..d3330191b546 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 5ef8c658a16c1543507d71228f8ece1efd8a8ca9..79b7321c16c3b4fe45e9f52a086cd046b6c58a89 100644 +index e5a9fd2d98b65ff7bb54ded343d1de3891b232a8..70a15ac085e9c2dd413d73b13d252dfe053447e3 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -38,7 +38,9 @@ by a child template that "extends" this file. @@ -57,7 +57,7 @@ index 5ef8c658a16c1543507d71228f8ece1efd8a8ca9..79b7321c16c3b4fe45e9f52a086cd046 android:icon="@drawable/ic_launcher" android:roundIcon="@drawable/ic_launcher_round" android:label="{% block application_label %}@string/app_name{% endblock %}" -@@ -1137,6 +1150,7 @@ by a child template that "extends" this file. +@@ -1139,6 +1152,7 @@ by a child template that "extends" this file. {% endif %} @@ -65,7 +65,7 @@ index 5ef8c658a16c1543507d71228f8ece1efd8a8ca9..79b7321c16c3b4fe45e9f52a086cd046 {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1215,6 +1229,7 @@ by a child template that "extends" this file. +@@ -1217,6 +1231,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch index ff9f7bc8b076..64915b61ef98 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -index 79c961ce1ae883887805d14fdee9e3ceef54a766..3b73225086c0ac021a49604278195631b4edc17e 100644 +index 4d92d80ebc1167794aeda43b2cfc94bcde41bfff..e390477f90c865f27d8a5f9bcaa1516317159203 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java @@ -370,7 +370,7 @@ public abstract class ChromeActivity diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index c1d23d28e5fd..d881f3bac7a5 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 2ae4ebab650f7e7794a1ff3fee754bfdcda189fe..5dd47dd262361ee749d24ae4d56b2e520a2b5563 100644 +index 7311821a8c1e5e187eae1520931ed1d08cd02e62..072b155175dc83569c49044ba8005afa87c6da37 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn @@ -2455,6 +2455,7 @@ static_library("browser") { diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index fb4a55ae0bcc..5e6e0c126aee 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 33dcf3c4cf1b13040f449f0c96af2f626eda437f..a290d5ef8013c2f2140d7364c2d42661506a41f5 100644 +index 41b381acc941d469ec329e0d8bef834167b19e23..1acca5535dbea5132a7f1a37c0506d130a1205e9 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -309,14 +309,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { @@ -21,7 +21,7 @@ index 33dcf3c4cf1b13040f449f0c96af2f626eda437f..a290d5ef8013c2f2140d7364c2d42661 const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -7248,6 +7248,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7273,6 +7273,7 @@ const FeatureEntry kFeatureEntries[] = { // "LoginCustomFlags" in tools/metrics/histograms/enums.xml. See "Flag // Histograms" in tools/metrics/histograms/README.md (run the // AboutFlagsHistogramTest unit test to verify this process). diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index 3a2e4f7cb8e8..816fc93cd20e 100644 --- a/patches/chrome-browser-chrome_content_browser_client.h.patch +++ b/patches/chrome-browser-chrome_content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h -index 43a09d7fd31726721171c72ec75ddf2ba546fd45..d22aa25c1ba535448a2a35a85cdc86c5199d55a4 100644 +index c3ae215e9ed55e265737baabdee8552e4a5ac591..a11261e897c6340900db5ec88c84b4723b3392c4 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -734,6 +734,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -738,6 +738,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index 88d7ef47a165..004876170bb4 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index 036078dfad0781d659e651043bce0e0825c8a3e6..fecafeca44f77a13a0091f0b6f33b04ad0b19957 100644 +index 067740efe3eb88b7bf0dd0537b2700a65a47a7d1..2cedfd30a25bc3323fdd0dbca3271f59d297c952 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -314,6 +314,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -316,6 +316,7 @@ const base::Feature* kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index c3f435ece510..52f895dfed00 100644 --- a/patches/chrome-browser-prefs-browser_prefs.cc.patch +++ b/patches/chrome-browser-prefs-browser_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc -index 7f814486ab6749d94ecb2a77c7d1b77ef3fbf706..3944abe625bfb53f8b0a2e6b01ea1bd93ca548e2 100644 +index 2d724556541329b6d024e52a54097c18892e72d8..3f1b9abe41bc68178b94de7e1dfa7219a06b693d 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -882,6 +882,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -884,6 +884,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 7f814486ab6749d94ecb2a77c7d1b77ef3fbf706..3944abe625bfb53f8b0a2e6b01ea1bd9 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1165,6 +1166,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1167,6 +1168,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch index ef98660a175d..d912c591a3ec 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index 5045ae89d1826c0e25008551eab40dffc28a456a..f359424436735cbad8ced5013ae5aedfd35c8456 100644 +index 8278eb35671c1b06e9053228838751fa5fc16bb0..d1d244c8b013504d2f5adce89fe5ddada5e992a3 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -29,6 +29,7 @@ diff --git a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch index 3c3ea5f9a73c..9b0eec7b9f09 100644 --- a/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-permission_bubble-permission_prompt_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc -index 034dbcd3cc442428ade41df7764069715e79e19c..c6554a0bfe23a6f51808f484cade4e6fa4fc4521 100644 +index 02defde6f37aaece74c5c3ad0a704bef6f2b42a4..18332fcfe9ece933fcf999d27119970ff6ed07eb 100644 --- a/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc +++ b/chrome/browser/ui/views/permission_bubble/permission_prompt_bubble_view.cc -@@ -134,6 +134,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView( +@@ -135,6 +135,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView( for (permissions::PermissionRequest* request : GetVisibleRequests()) AddRequestLine(request); diff --git a/patches/chrome-installer-linux-BUILD.gn.patch b/patches/chrome-installer-linux-BUILD.gn.patch index 5bde5df79d59..bb52febb20ad 100644 --- a/patches/chrome-installer-linux-BUILD.gn.patch +++ b/patches/chrome-installer-linux-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn -index 35f01d0a423f5c395df3539d65df18670f63ed9e..a639677008f17a27cd9d1ec72b7dbba632a29142 100644 +index 8fc934acfddeb4f4c9551dbc1ccac75f6397a4fd..f007b861b7c59a7c97b19df7751f83fc342e4615 100644 --- a/chrome/installer/linux/BUILD.gn +++ b/chrome/installer/linux/BUILD.gn -@@ -74,6 +74,8 @@ if (enable_swiftshader) { +@@ -75,6 +75,8 @@ if (enable_swiftshader) { ] } @@ -11,7 +11,7 @@ index 35f01d0a423f5c395df3539d65df18670f63ed9e..a639677008f17a27cd9d1ec72b7dbba6 packaging_files_binaries = packaging_files_executables + packaging_files_shlibs copy("swiftshader_libs") { -@@ -174,7 +176,9 @@ strip_binary("strip_chrome_binary") { +@@ -176,7 +178,9 @@ strip_binary("strip_chrome_binary") { binary_input = "$root_out_dir/chrome" symbol_output = "$root_out_dir/chrome.debug" stripped_binary_output = "$root_out_dir/chrome.stripped" @@ -21,7 +21,7 @@ index 35f01d0a423f5c395df3539d65df18670f63ed9e..a639677008f17a27cd9d1ec72b7dbba6 } # This target builds all "normal" Linux installers. You must set -@@ -223,6 +227,7 @@ copy("common_packaging_files") { +@@ -225,6 +229,7 @@ copy("common_packaging_files") { } sources += [ "//buildtools/third_party/eu-strip/bin/eu-strip" ] @@ -29,7 +29,7 @@ index 35f01d0a423f5c395df3539d65df18670f63ed9e..a639677008f17a27cd9d1ec72b7dbba6 outputs = [ "$root_out_dir/installer/common/{{source_file_part}}" ] } -@@ -319,6 +324,7 @@ group("installer_deps") { +@@ -321,6 +326,7 @@ group("installer_deps") { "//sandbox/linux:chrome_sandbox", "//third_party/crashpad/crashpad/handler:crashpad_handler", ] @@ -37,7 +37,7 @@ index 35f01d0a423f5c395df3539d65df18670f63ed9e..a639677008f17a27cd9d1ec72b7dbba6 if (enable_nacl) { public_deps += [ "//components/nacl/loader:nacl_helper", -@@ -353,6 +359,9 @@ group("installer_deps") { +@@ -359,6 +365,9 @@ group("installer_deps") { template("linux_package") { assert(defined(invoker.channel)) channel = invoker.channel @@ -47,7 +47,7 @@ index 35f01d0a423f5c395df3539d65df18670f63ed9e..a639677008f17a27cd9d1ec72b7dbba6 if (is_chrome_branded) { package = "google-chrome" -@@ -516,3 +525,6 @@ linux_package("beta") { +@@ -522,3 +531,6 @@ linux_package("beta") { linux_package("unstable") { channel = "unstable" } diff --git a/patches/chrome-installer-linux-common-installer.include.patch b/patches/chrome-installer-linux-common-installer.include.patch index 6196de59c9f9..c651226fafe3 100644 --- a/patches/chrome-installer-linux-common-installer.include.patch +++ b/patches/chrome-installer-linux-common-installer.include.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include -index 7c517f3d014890bb120b3bf4509891363990d56b..04f96212719290b3e790490273f0335ccf6ed985 100644 +index 64f7e3b68b1ce58ed9f104f88362be9946a3f3b5..8a0f61d23693660bd40de9355e2a71bddfad7e05 100644 --- a/chrome/installer/linux/common/installer.include +++ b/chrome/installer/linux/common/installer.include @@ -75,6 +75,7 @@ process_template() ( @@ -19,7 +19,7 @@ index 7c517f3d014890bb120b3bf4509891363990d56b..04f96212719290b3e790490273f0335c # ICU data file; Necessary when the GN icu_use_data_file flag is true. install -m 644 "${OUTPUTDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/" -@@ -294,11 +297,13 @@ stage_install_common() { +@@ -307,11 +310,13 @@ stage_install_common() { # app icons local icon_regex=".*product_logo_[0-9]\+\." diff --git a/patches/chrome-installer-mini_installer-chrome.release.patch b/patches/chrome-installer-mini_installer-chrome.release.patch index 4d2593b7cc07..3a7d9a2583d0 100644 --- a/patches/chrome-installer-mini_installer-chrome.release.patch +++ b/patches/chrome-installer-mini_installer-chrome.release.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release -index abfb1fab34d6fc6e531c456337969dafb18d5395..f5a8f6b9aa0938bce7ae3fb970e746362c5c7943 100644 +index 76c93f844b5e43e91e744e7b24ddf7b5d1cc3b15..7ca0f9c030bd7a061d7f28e053c954c819deaec7 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -6,7 +6,7 @@ @@ -26,7 +26,7 @@ index abfb1fab34d6fc6e531c456337969dafb18d5395..f5a8f6b9aa0938bce7ae3fb970e74636 chrome_elf.dll: %(VersionDir)s\ chrome_pwa_launcher.exe: %(VersionDir)s\ d3dcompiler_47.dll: %(VersionDir)s\ -@@ -64,6 +69,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\ +@@ -66,6 +71,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\ [HIDPI] chrome_200_percent.pak: %(VersionDir)s\ diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index c44d0529a443..27dfb6e644e7 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index f2e3a3d75f53bc06f6a5dfdc2e91dc319da3227d..0165611b194efce8e67fa8a96a1a20ca3f2f8c94 100644 +index 296477503059b1ca9f89ea6968c58ffc95315c06..9e75e97e186450f8558de4868cb02310cb971cf0 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -904,6 +904,7 @@ if (!is_android) { diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch index fd857a77b041..7afe8eddeab0 100644 --- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch +++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml -index 0aaaed50058c592d4dd5289160cbc3ce48fdcad3..d179a22007bfab63835bf24317a82f77f3c7a7ad 100644 +index ed3f0ef85c209a02d8e8cb4d41d41300b1df8346..2c18d8887b3a48fcbc61b569b560e0fe24604390 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml @@ -63,7 +63,7 @@ diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index 8b1a6dd716c4..65e6e6d124cc 100644 --- a/patches/components-permissions-permission_uma_util.cc.patch +++ b/patches/components-permissions-permission_uma_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc -index b36499c10b9f6e87e592a9f246a2410c551c43ee..fd9aabaf8198520660f613115f422f6d20955842 100644 +index e7f4572d2992fce8f72e23ce89c22bdaea49cf59..1ad45ad5c0949add8f817b1eead6a6d742745117 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc @@ -107,6 +107,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) { diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 387caf2906bb..039fea782887 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 86ddb8ebaf4556e6804bfb477e5f7afe0b49447e..eaba344b597b4010525bf61a0823a6f429eb055c 100644 +index bd3a898a230c90aaf6bfd82601ad5279f7b7673e..c708ec8123a2afafea82c48f7996e49b0ffe4a3d 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc @@ -2219,6 +2219,7 @@ void NavigationRequest::OnRequestRedirected( @@ -10,7 +10,7 @@ index 86ddb8ebaf4556e6804bfb477e5f7afe0b49447e..eaba344b597b4010525bf61a0823a6f4 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -3387,6 +3388,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -3403,6 +3404,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index dc95b3ead12e..8c4ce99b7fbe 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index b031e69e4fe094efa8ca96cc7bc278c991e841f0..4bc70bcd6a3a6bc49178441247cb55aef8bab808 100644 +index aac67f9733e5a5f1adba22268337d2cc3319d386..b1fd438f1037077c56cf977d1551a7d0c710fcba 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -1845,6 +1845,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1861,6 +1861,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/extensions-common-api-_api_features.json.patch b/patches/extensions-common-api-_api_features.json.patch index e345584a4bf3..3d0cdf77d76f 100644 --- a/patches/extensions-common-api-_api_features.json.patch +++ b/patches/extensions-common-api-_api_features.json.patch @@ -1,8 +1,8 @@ diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json -index 5ec0cd8fa44b930a341ee13e543b6479302676a9..ae0ecb069e1ff0873870d1c13ea65b23239e6f72 100644 +index 9db0bbe8e75b00b632ebe73fddf5a3066bf596cc..2d4ed75263518a2142dd24f0b2e53a8a2bba9ad0 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json -@@ -523,6 +523,7 @@ +@@ -525,6 +525,7 @@ "matches": [ "chrome://password-change/*", "chrome://file-manager/*" diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index e13a62d6d710..f3265803704c 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 06a5b98a1ec11fa5f3efb2d54b70e308d4f4e6bc..c02fb2da93638c905dcaaf27566fa273f1e679f2 100644 +index 95402a4dbae0e6ed2f2af51c00768971f1041ceb..bf1de5744508ae162da8c64096ddd499e9185fa5 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -945,6 +945,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -941,6 +941,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch index 0c8b8280c1b7..ffea7068944c 100644 --- a/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch +++ b/patches/tools-metrics-histograms-histograms_xml-histogram_suffixes_list.xml.patch @@ -1,8 +1,8 @@ diff --git a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -index 577a28feeee332be95e1059cfe2dfafb60553120..4d47230d8c60179daab416873129c00fe3f03514 100644 +index 04bd3a4b33b11b0a7a938e9b3dc32b498402eca0..bf054b819c4e2d8a0000482708461215fad3778d 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -14262,6 +14262,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -14268,6 +14268,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. diff --git a/patches/ui-gl-gl_implementation.cc.patch b/patches/ui-gl-gl_implementation.cc.patch deleted file mode 100644 index f30a0d3b7450..000000000000 --- a/patches/ui-gl-gl_implementation.cc.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/ui/gl/gl_implementation.cc b/ui/gl/gl_implementation.cc -index b12af225f1dde84c25791d0f4badb0fcb9541add..5acbd036bd8ff8ea34c39fea79507b3199f3ffad 100644 ---- a/ui/gl/gl_implementation.cc -+++ b/ui/gl/gl_implementation.cc -@@ -182,11 +182,7 @@ GLImplementationParts GetSoftwareGLImplementation() { - } - - GLImplementationParts GetSoftwareGLForTestsImplementation() { --#if defined(OS_WIN) -- return GetSoftwareGLImplementation(); --#else - return GetLegacySoftwareGLImplementation(); --#endif - } - - bool IsSoftwareGLImplementation(GLImplementationParts implementation) {