From 9686dfaaaaf89916c6f08c61eebb69aa87bd32b3 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 28 Jul 2021 13:54:07 +0200 Subject: [PATCH] Updated patches from Chromium 94.0.4583.0 to Chromium 94.0.4589.2. --- patches/base-BUILD.gn.patch | 4 ++-- patches/build-config-android-config.gni.patch | 2 +- patches/build-config-compiler-BUILD.gn.patch | 4 ++-- .../build-util-android_chrome_version.py.patch | 4 ++-- patches/chrome-android-BUILD.gn.patch | 16 ++++++++-------- .../chrome-android-chrome_java_sources.gni.patch | 4 ++-- ...roid-expectations-lint-suppressions.xml.patch | 6 +++--- ...chrome-android-java-AndroidManifest.xml.patch | 4 ++-- ...hrome-browser-ChromeTabbedActivity.java.patch | 4 ++-- patches/chrome-browser-BUILD.gn.patch | 4 ++-- patches/chrome-browser-about_flags.cc.patch | 4 ++-- ...chrome_browsing_data_remover_delegate.h.patch | 6 +++--- ...browser-chrome_content_browser_client.h.patch | 4 ++-- patches/chrome-browser-extensions-BUILD.gn.patch | 4 ++-- ...-browser-extensions-extension_service.h.patch | 2 +- ...rowser-extensions-extension_tab_util.cc.patch | 2 +- ...er-flags-android-chrome_feature_list.cc.patch | 4 ++-- .../chrome-browser-prefs-browser_prefs.cc.patch | 6 +++--- ...ontext_menu-render_view_context_menu.cc.patch | 2 +- ...wser-resources-bookmarks-bookmarks.html.patch | 4 ++-- ...-resources-bookmarks-command_manager.ts.patch | 2 +- ...wser-resources-downloads-downloads.html.patch | 4 ++-- ...er-resources-extensions-extensions.html.patch | 2 +- ...wser-resources-extensions-extensions.ts.patch | 4 ++-- ...-browser-resources-history-history.html.patch | 4 ++-- ...s-settings-people_page-sync_controls.js.patch | 4 ++-- ...privacy_page-personalization_options.js.patch | 2 +- ...settings-privacy_page-privacy_page.html.patch | 4 ++-- ...ome-browser-resources-settings-route.js.patch | 2 +- .../chrome-browser-themes-theme_helper.h.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 +++--- ...ome-browser-ui-android-toolbar-BUILD.gn.patch | 4 ++-- ...ar-chrome_location_bar_model_delegate.h.patch | 4 ++-- ...views-bookmarks-bookmark_bubble_view.cc.patch | 2 +- ...-ui-views-download-download_item_view.h.patch | 4 ++-- ...e-browser-ui-views-frame-browser_view.h.patch | 4 ++-- ...views-location_bar-location_bar_view.cc.patch | 4 ++-- ...i-views-outdated_upgrade_bubble_view.cc.patch | 2 +- .../chrome-browser-ui-views-tabs-tab.cc.patch | 4 ++-- ...rowser-ui-views-tabs-tab_style_views.cc.patch | 2 +- ...rowser-ui-views-toolbar-toolbar_view.cc.patch | 4 ++-- ...iews-translate-translate_bubble_view.cc.patch | 4 ++-- ...views-translate-translate_bubble_view.h.patch | 4 ++-- ...bui-chrome_web_ui_controller_factory.cc.patch | 4 ++-- ...wser-ui-webui-downloads-downloads_ui.cc.patch | 4 ++-- ...er-ui-webui-extensions-extensions_ui.cc.patch | 4 ++-- ...-browser-ui-webui-history-history_ui.cc.patch | 4 ++-- ...-settings_localized_strings_provider.cc.patch | 4 ++-- ...chrome-browser-ui-webui-theme_source.cc.patch | 2 +- ...grade_detector-upgrade_detector_impl.cc.patch | 2 +- patches/chrome-common-BUILD.gn.patch | 14 +++++++------- ...-extensions-chrome_extensions_client.cc.patch | 2 +- ...nstaller-linux-common-installer.include.patch | 6 +++--- ...staller-linux-debian-changelog.template.patch | 4 ++-- patches/chrome-installer-setup-BUILD.gn.patch | 2 +- patches/chrome-installer-util-BUILD.gn.patch | 6 +++--- .../chrome-installer-util-shell_util.cc.patch | 4 ++-- patches/chrome-renderer-BUILD.gn.patch | 2 +- ...derer-chrome_content_renderer_client.cc.patch | 2 +- patches/chrome-test-BUILD.gn.patch | 4 ++-- patches/chrome-utility-BUILD.gn.patch | 2 +- ...gs-core-common-content_settings_types.h.patch | 4 ++-- patches/components-page_info-page_info.cc.patch | 4 ++-- ..._manager-core-browser-login_database.cc.patch | 4 ++-- patches/components-permissions-BUILD.gn.patch | 4 ++-- ...ponents-sync-driver-sync_service_impl.h.patch | 2 +- ...ponents-sync-engine-model_type_worker.h.patch | 2 +- ...mponents-sync-protocol-proto_visitors.h.patch | 6 +++--- ...ents-sync-protocol-protocol_sources.gni.patch | 4 ++-- ..._device_info-device_info_sync_bridge.cc.patch | 2 +- ...ponents-translate-core-browser-BUILD.gn.patch | 4 ++-- ...nts-variations-variations_seed_store.cc.patch | 2 +- ...erer_host-navigation_controller_impl.cc.patch | 2 +- ...ser-renderer_host-navigation_request.cc.patch | 6 +++--- .../content-renderer-render_frame_impl.cc.patch | 4 ++-- ...xtensions-browser-sandboxed_unpacker.cc.patch | 4 ++-- ...xtensions-common-api-_api_features.json.patch | 2 +- ...s-chrome-browser-prefs-browser_prefs.mm.patch | 4 ++-- patches/net-cookies-canonical_cookie.cc.patch | 2 +- patches/net-dns-BUILD.gn.patch | 4 ++-- patches/net-dns-host_cache.cc.patch | 4 ++-- .../net-http-transport_security_state.cc.patch | 2 +- .../services-network-public-cpp-BUILD.gn.patch | 2 +- ...derer-bindings-generated_in_modules.gni.patch | 4 ++-- ...nk-renderer-bindings-idl_in_modules.gni.patch | 4 ++-- ...d_party-blink-renderer-modules-BUILD.gn.patch | 2 +- ...s-canvas2d-base_rendering_context_2d.cc.patch | 6 +++--- ...canvas2d-canvas_rendering_context_2d.cc.patch | 4 ++-- ...er-modules-mediastream-media_devices.cc.patch | 4 ++-- ...-webgl-webgl2_rendering_context_base.cc.patch | 2 +- ...s-webgl-webgl_rendering_context_base.cc.patch | 2 +- .../tools-gritsettings-resource_ids.spec.patch | 4 ++-- ...tograms_xml-histogram_suffixes_list.xml.patch | 4 ++-- ...views-controls-button-md_text_button.cc.patch | 4 ++-- 94 files changed, 177 insertions(+), 177 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index b8e5a3cea2a..7463848904f 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 d82c87861fa7cf66c2849ae350d5823cf00db5e4..5d65d3d918851652ed1cdfd2cc08f37bb883c5cc 100644 +index 3a05279377caf15c3afaf5b722f10cebbdb8dbeb..24992b013a029d826441bc5832564ec837492658 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3960,6 +3960,7 @@ if (is_android) { +@@ -3989,6 +3989,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/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index 7841569f367..a0d084f9f1f 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 898d9e82f74bfd0986694da66bbc13db72aab1f9..6915e913794115ebb6eec4f9066031e00d984a41 100644 +index e7540e8be1e015b6902b333b3d4c2d157ef62733..a9ae163577d11eb0aede1cea9a171567b48c3605 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -3,6 +3,7 @@ diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 997c05f5341..7e21ab36e46 100644 --- a/patches/build-config-compiler-BUILD.gn.patch +++ b/patches/build-config-compiler-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index b77f1762153b9259c9b44b9ce2fbc7dc15df839f..e0b7a0a4701b8ca26df1199b1162a1371d1e3e22 100644 +index 6bfbd46d0c894e20484d807e8b324b00fa2bfded..2b7e49e6ecfc8fc79f66a470fdabb5ca6d56ae42 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1732,6 +1732,7 @@ config("chromium_code") { +@@ -1730,6 +1730,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } diff --git a/patches/build-util-android_chrome_version.py.patch b/patches/build-util-android_chrome_version.py.patch index bf841c5e961..e33f39da1e5 100644 --- a/patches/build-util-android_chrome_version.py.patch +++ b/patches/build-util-android_chrome_version.py.patch @@ -1,8 +1,8 @@ diff --git a/build/util/android_chrome_version.py b/build/util/android_chrome_version.py -index c06bb38b74b7f8c4e02186d7056ee4a05a2dae04..fcfaecf1f64a198a7a4e6e1e239a4f63e2767f98 100644 +index 5ec9e48d15e56116a4e9f8bdc202b1d30a5acc81..d7420843084accd5c04447f2485084a63e57f464 100644 --- a/build/util/android_chrome_version.py +++ b/build/util/android_chrome_version.py -@@ -191,7 +191,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build): +@@ -194,7 +194,7 @@ def GenerateVersionCodes(version_values, arch, is_next_build): """ base_version_code = int( diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 0f586579ef6..ebd99d25b7a 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6dfb8c0d94 100644 +index 65499c52e8357f9f91f88fff4bb8f1d5d8e280c3..a0f151a3a05da3f2c0a752b855c1c6ad9e36a8f4 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -247,6 +247,7 @@ android_resources("chrome_app_java_resources") { +@@ -252,6 +252,7 @@ android_resources("chrome_app_java_resources") { "//third_party/androidx:androidx_preference_preference_java", "//third_party/androidx:androidx_recyclerview_recyclerview_java", ] @@ -10,7 +10,7 @@ index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d } if (enable_vr) { -@@ -595,6 +596,7 @@ android_library("chrome_java") { +@@ -601,6 +602,7 @@ android_library("chrome_java") { deps += feed_deps deps += web_feed_deps @@ -18,7 +18,7 @@ index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d srcjar_deps = [ ":autofill_verification_status_generated_enum", -@@ -626,6 +628,7 @@ android_library("chrome_java") { +@@ -632,6 +634,7 @@ android_library("chrome_java") { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -26,7 +26,7 @@ index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -746,6 +749,7 @@ java_group("chrome_all_java") { +@@ -752,6 +755,7 @@ java_group("chrome_all_java") { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -34,7 +34,7 @@ index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d } # This is a list of all base module jni headers. New features should add their -@@ -788,6 +792,7 @@ group("jni_headers") { +@@ -794,6 +798,7 @@ group("jni_headers") { "//components/ukm/android:jni_headers", "//components/webauthn/android:jni_headers", ] @@ -42,7 +42,7 @@ index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2059,6 +2064,7 @@ if (current_toolchain == default_toolchain) { +@@ -2067,6 +2072,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -50,7 +50,7 @@ index 762b57773510c845af4ac365aa4f23c14c62f479..982fa2809f8cef439506cb3304f63a6d if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2452,6 +2458,7 @@ android_library("base_module_java") { +@@ -2463,6 +2469,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 4832a1c48f6..9ed4106a3f1 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 47fdb198525deb7089dc0b347a87c76cc68b89b1..3df29a1c54f2005c4be26ca5ff9abb42e76a3162 100644 +index dc6bf8fb941ca86fea063b743a3c92114157d2bc..0bfd82bfb225a6b3fa2d647c4f0ad33231deb415 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1263,3 +1263,4 @@ chrome_java_sources = [ +@@ -1262,3 +1262,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 609b8063128..0ed4a8a540b 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 57d9b134dbe5be0cac2369c335533d11f81405d5..79b806032507b9039789642eefc619f8c5e74aee 100644 +index 37462070671edf190b316b5201bd516c4e6b5a24..934a56781fc326a232e36e3de894adcd2decc5f6 100644 --- a/chrome/android/expectations/lint-suppressions.xml +++ b/chrome/android/expectations/lint-suppressions.xml -@@ -122,6 +122,7 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md +@@ -121,6 +121,7 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md @@ -10,7 +10,7 @@ index 57d9b134dbe5be0cac2369c335533d11f81405d5..79b806032507b9039789642eefc619f8 -@@ -277,4 +278,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md +@@ -276,4 +277,5 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 3a992089e37..899ce37b120 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 53e51641581b7bcc67493ebd168dfaad0288b197..def42c1b09b6dc589e6d874290935e65ac86bb0d 100644 +index e9c636360b3555da4e96cff484f1b7c786e38e17..a2eaaaba16a0a71fa90115d2c215f59a9d35acad 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -56,7 +56,9 @@ by a child template that "extends" this file. @@ -73,7 +73,7 @@ index 53e51641581b7bcc67493ebd168dfaad0288b197..def42c1b09b6dc589e6d874290935e65 {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1286,6 +1300,7 @@ by a child template that "extends" this file. +@@ -1298,6 +1312,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index 385f6ff8845..a8fc4d17bbb 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 8e68176000c87d417e4cbf9455b2ecbe54af2555..c01723beb2fc09abfa553602bdea2d99771242ae 100644 +index de7ec68edbbb8a484903c8799a002e6e1b7c3c7c..0fdd6aac99fddc4bf943b717c1ef44cf33f92ecb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2295,6 +2295,7 @@ public class ChromeTabbedActivity extends ChromeActivity diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch index 29bd21163e5..11ae3da8661 100644 --- a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts -index 52737b6cd6a7d7abeac7d852be61c07f369de4ce..9034d20174bbdb2741a58494fcb3f6adcddce879 100644 +index f31b09b3cffe7dc52ce8e15793b0532af7ee96ae..daa36d60a53354859149d51976dc4549f8f71bcd 100644 --- a/chrome/browser/resources/bookmarks/command_manager.ts +++ b/chrome/browser/resources/bookmarks/command_manager.ts @@ -437,7 +437,7 @@ export class BookmarksCommandManagerElement extends diff --git a/patches/chrome-browser-resources-downloads-downloads.html.patch b/patches/chrome-browser-resources-downloads-downloads.html.patch index 06db2f6d5f5..38f64ca8e67 100644 --- a/patches/chrome-browser-resources-downloads-downloads.html.patch +++ b/patches/chrome-browser-resources-downloads-downloads.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/downloads/downloads.html b/chrome/browser/resources/downloads/downloads.html -index a5bb15763aa3820bd3b0a72ec8234c0ba6567b68..0d6b3a42780a9a8bd82d03c33fdab978d051af2c 100644 +index e46eff0dab0be1614b4376fce59b8c0beef46142..4d7430498f052eb9d5c76e1e4010360d1a6ae735 100644 --- a/chrome/browser/resources/downloads/downloads.html +++ b/chrome/browser/resources/downloads/downloads.html -@@ -6,6 +6,7 @@ +@@ -7,6 +7,7 @@ $i18n{title} diff --git a/patches/chrome-browser-resources-extensions-extensions.html.patch b/patches/chrome-browser-resources-extensions-extensions.html.patch index 0b5afce2754..0e891c492b3 100644 --- a/patches/chrome-browser-resources-extensions-extensions.html.patch +++ b/patches/chrome-browser-resources-extensions-extensions.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/extensions.html b/chrome/browser/resources/extensions/extensions.html -index 3aa5c713503cdab793fff44c2d9a924cda3c168a..1d4b693b323fd68233decb43a5d6be5e56267c99 100644 +index ecc17a85b6ecba98c1bfeb97a88d739289d016c9..ee88b081e49a75bba9a34571ca12659d8ce656bf 100644 --- a/chrome/browser/resources/extensions/extensions.html +++ b/chrome/browser/resources/extensions/extensions.html @@ -54,6 +54,7 @@ diff --git a/patches/chrome-browser-resources-extensions-extensions.ts.patch b/patches/chrome-browser-resources-extensions-extensions.ts.patch index 6058778c3cd..d9b70b23186 100644 --- a/patches/chrome-browser-resources-extensions-extensions.ts.patch +++ b/patches/chrome-browser-resources-extensions-extensions.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/extensions.ts b/chrome/browser/resources/extensions/extensions.ts -index 5836804c9e488bb23869d05881bd55cd7ccd9f52..928974d8d5dc367276527ae521b26fc3bb7cb226 100644 +index 378090e6f4816577f578ac418c5b449e68240ee3..40ae9e27676a5b67b0cf5fcf7f07dffab875ce6b 100644 --- a/chrome/browser/resources/extensions/extensions.ts +++ b/chrome/browser/resources/extensions/extensions.ts @@ -2,6 +2,7 @@ @@ -9,4 +9,4 @@ index 5836804c9e488bb23869d05881bd55cd7ccd9f52..928974d8d5dc367276527ae521b26fc3 +import './brave_overrides/index.js'; import './manager.js'; - export {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.m.js'; + export {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.js'; diff --git a/patches/chrome-browser-resources-history-history.html.patch b/patches/chrome-browser-resources-history-history.html.patch index 04c0a56b23c..0e79d3e34b2 100644 --- a/patches/chrome-browser-resources-history-history.html.patch +++ b/patches/chrome-browser-resources-history-history.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/history/history.html b/chrome/browser/resources/history/history.html -index f89232013d3efc189400143cbcc2cf7badbe4a66..70293038b432ab4579eed6a0daa28dde324afe14 100644 +index 1d2d7cba4d8d60c945345eae172301d30e1ba38c..0249e8415a6cbadc44f7552f863e633572c2b389 100644 --- a/chrome/browser/resources/history/history.html +++ b/chrome/browser/resources/history/history.html -@@ -79,6 +79,7 @@ +@@ -80,6 +80,7 @@ justify-content: center; } diff --git a/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch b/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch index 442627403ad..c92321b0249 100644 --- a/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch +++ b/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/people_page/sync_controls.js b/chrome/browser/resources/settings/people_page/sync_controls.js -index b7f0e2c3c6c4fc26e25870bd5708f0eb16d7569f..7aaf03dc9916ce3af1581bd109f29824c0ea850b 100644 +index f9bc9cf75ace2d533478321e6cb067dd4a96846f..b1b03878812444f0949a759089d023ad6f947a7b 100644 --- a/chrome/browser/resources/settings/people_page/sync_controls.js +++ b/chrome/browser/resources/settings/people_page/sync_controls.js @@ -124,7 +124,7 @@ class SettingsSyncControlsElement extends SettingsSyncControlsElementBase { @@ -11,7 +11,7 @@ index b7f0e2c3c6c4fc26e25870bd5708f0eb16d7569f..7aaf03dc9916ce3af1581bd109f29824 this.browserProxy_.didNavigateToSyncPage(); } } -@@ -257,6 +257,7 @@ class SettingsSyncControlsElement extends SettingsSyncControlsElementBase { +@@ -268,6 +268,7 @@ class SettingsSyncControlsElement extends SettingsSyncControlsElementBase { * @private */ syncControlsHidden_() { diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch index c9ef9bd888b..6952bae742d 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.js b/chrome/browser/resources/settings/privacy_page/personalization_options.js -index 5a8630b3a7c10fce3b0f69a74c54e1c2a8a79f12..d031c337bd1c58a9bf7e49f0735c14d3d88afe1c 100644 +index 385bd9f2b4ad253d35c9c84acc0790435f3be11e..c9b8ac78b0abdfa1207c4c584e215840aef4c3d4 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.js +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.js @@ -69,7 +69,7 @@ export class SettingsPersonalizationOptionsElement extends 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 d3b20bb8a42..200a5966033 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 ed38a02b447498a52390c4418660d2574efde454..3d1b706c5120c94fa3edf736cd9beb3eff5b7110 100644 +index 04b020c902ab05f58bc28647e278b65f9c82da24..4eb2a7df0a57dee58026d933acfa430429fb8f07 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -35,6 +35,7 @@ @@ -26,7 +26,7 @@ index ed38a02b447498a52390c4418660d2574efde454..3d1b706c5120c94fa3edf736cd9beb3e