From 145fb0e598e4aa67be67560f5145ceee74e66489 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 9 Dec 2020 19:55:10 +0100 Subject: [PATCH 01/66] Updated patches from Chromium 88.0.4315.7 to Chromium 88.0.4324.11. --- patches/base-BUILD.gn.patch | 4 +- patches/build-config-android-config.gni.patch | 6 +- ...ld-config-android-internal_rules.gni.patch | 4 +- patches/build-config-android-rules.gni.patch | 6 +- patches/build-config-compiler-BUILD.gn.patch | 4 +- ...ild-toolchain-win-setup_toolchain.py.patch | 2 +- patches/chrome-BUILD.gn.patch | 10 +-- patches/chrome-android-BUILD.gn.patch | 12 +-- ...rome-android-chrome_java_sources.gni.patch | 4 +- ...e-android-chrome_public_apk_tmpl.gni.patch | 6 +- ...d-expectations-lint-suppressions.xml.patch | 4 +- ...ome-android-java-AndroidManifest.xml.patch | 17 ++--- ...hromium-chrome-browser-AppHooks.java.patch | 4 +- ...er-TabbedModeTabDelegateFactory.java.patch | 2 +- ...rome-browser-app-ChromeActivity.java.patch | 2 +- ...nager-settings-PasswordSettings.java.patch | 4 +- ...ettings-SyncAndServicesSettings.java.patch | 2 +- ...-browser-toolbar-ToolbarManager.java.patch | 6 +- ...ottom-BottomControlsCoordinator.java.patch | 4 +- ...rowser-toolbar-top-ToolbarPhone.java.patch | 12 +-- patches/chrome-app-BUILD.gn.patch | 6 +- patches/chrome-browser-BUILD.gn.patch | 4 +- patches/chrome-browser-about_flags.cc.patch | 6 +- ...wser-chrome_content_browser_client.h.patch | 4 +- ...host_content_settings_map_factory.cc.patch | 4 +- .../chrome-browser-extensions-BUILD.gn.patch | 4 +- ...ponent_extension_resource_manager.cc.patch | 4 +- ...r-extensions-extension_management.cc.patch | 2 +- ...flags-android-chrome_feature_list.cc.patch | 4 +- ...-browser-net-net_error_tab_helper.cc.patch | 4 +- ...et-system_network_context_manager.cc.patch | 4 +- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 +- .../chrome-browser-profiles-profile.cc.patch | 2 +- ...profiles-profile_avatar_icon_util.cc.patch | 8 +- ...ome-browser-profiles-profile_impl.cc.patch | 2 +- ...-browser-profiles-profile_io_data.cc.patch | 2 +- ...ext_menu-render_view_context_menu.cc.patch | 4 +- ...owser-resources-downloads-toolbar.js.patch | 2 +- ...rowser-resources-extensions-BUILD.gn.patch | 2 +- ...browser-resources-optimize_webui.gni.patch | 4 +- ...-browser-resources-settings-BUILD.gn.patch | 2 +- ...settings-category_default_setting.js.patch | 2 +- ...-settings-site_settings-constants.js.patch | 4 +- ...browsing-client_side_model_loader.cc.patch | 2 +- ...sync-profile_sync_service_factory.cc.patch | 4 +- patches/chrome-browser-ui-BUILD.gn.patch | 4 +- ...rome-browser-ui-appmenu-AppMenu.java.patch | 4 +- patches/chrome-browser-ui-browser.cc.patch | 4 +- patches/chrome-browser-ui-browser.h.patch | 4 +- ...rome-browser-ui-browser_navigator.cc.patch | 2 +- .../chrome-browser-ui-chrome_pages.cc.patch | 4 +- ...owser-ui-cocoa-accelerators_cocoa.mm.patch | 4 +- ...rowser-ui-cocoa-main_menu_builder.mm.patch | 6 +- ...rtup-startup_browser_creator_impl.cc.patch | 4 +- .../chrome-browser-ui-tab_helpers.cc.patch | 4 +- ...me-browser-ui-tabs-tab_strip_model.h.patch | 4 +- ...views-bookmarks-bookmark_bar_view.cc.patch | 4 +- ...-views-extensions-extension_popup.cc.patch | 4 +- ...ble-permission_prompt_bubble_view.cc.patch | 4 +- ...s-toolbar-browser_app_menu_button.cc.patch | 2 +- ...s-translate-translate_bubble_view.cc.patch | 4 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...ui-webui-extensions-extensions_ui.cc.patch | 2 +- ...owser-ui-webui-history-history_ui.cc.patch | 2 +- ...ebui-settings-import_data_handler.cc.patch | 2 +- ...-ui-webui-settings-people_handler.cc.patch | 2 +- ...ttings_localized_strings_provider.cc.patch | 4 +- ...bui-settings-site_settings_helper.cc.patch | 2 +- ...s-components-web_app_shortcut_mac.mm.patch | 2 +- patches/chrome-common-BUILD.gn.patch | 6 +- patches/chrome-installer-mac-BUILD.gn.patch | 4 +- ...me-installer-mini_installer-BUILD.gn.patch | 6 +- patches/chrome-renderer-BUILD.gn.patch | 4 +- ...er-chrome_content_renderer_client.cc.patch | 4 +- ...rer-chrome_content_renderer_client.h.patch | 2 +- patches/chrome-test-BUILD.gn.patch | 4 +- .../chrome-test-base-testing_profile.cc.patch | 4 +- patches/chrome-utility-BUILD.gn.patch | 2 +- patches/chrome-utility-services.cc.patch | 4 +- ...s-bookmarks-browser-bookmark_model.h.patch | 4 +- ..._updater-component_updater_service.h.patch | 2 +- ...er-page_specific_content_settings.cc.patch | 2 +- ...ntent_settings-core-browser-BUILD.gn.patch | 4 +- ...ser-content_settings_pref_provider.h.patch | 4 +- ...re-browser-content_settings_utils.cc.patch | 6 +- ...ings-core-common-content_settings.cc.patch | 2 +- ...tings-core-common-content_settings.h.patch | 4 +- patches/components-feed-features.gni.patch | 4 +- .../components-omnibox-browser-BUILD.gn.patch | 4 +- ...mnibox-browser-omnibox_edit_model.cc.patch | 4 +- .../components-page_info-page_info.cc.patch | 4 +- ...components-page_info-page_info_ui.cc.patch | 4 +- ...nager-core-browser-login_database.cc.patch | 4 +- ...ore-browser-password_form_filling.cc.patch | 4 +- ...nts-permissions-permission_request.h.patch | 75 +++++++++++++++++-- ...s-permissions-permission_uma_util.cc.patch | 2 +- .../components-search_engines-BUILD.gn.patch | 4 +- patches/components-sync-BUILD.gn.patch | 4 +- patches/components-sync-driver-BUILD.gn.patch | 4 +- ...s-sync-driver-profile_sync_service.h.patch | 4 +- ...nents-sync-protocol-proto_visitors.h.patch | 6 +- ...s-sync-protocol-protocol_sources.gni.patch | 4 +- ...vice_info-device_info_sync_bridge.cc.patch | 2 +- ...-device_info_sync_bridge_unittest.cc.patch | 4 +- ...-variations-variations_seed_store.cc.patch | 2 +- ...-renderer_host-navigation_request.cc.patch | 6 +- ...content-browser-webui-web_ui_impl.cc.patch | 6 +- patches/content-common-BUILD.gn.patch | 2 +- ...lic-browser-content_browser_client.h.patch | 4 +- ...ontent-renderer-render_frame_impl.cc.patch | 4 +- ...ntent-renderer-render_thread_impl.cc.patch | 4 +- ...r-api-web_request-web_request_api.cc.patch | 4 +- ...nsions-browser-sandboxed_unpacker.cc.patch | 4 +- ...-blink-key_system_config_selector.cc.patch | 2 +- patches/net-BUILD.gn.patch | 4 +- patches/net-cookies-canonical_cookie.cc.patch | 4 +- ...nfigured_proxy_resolution_service.cc.patch | 2 +- ...services-network-public-cpp-BUILD.gn.patch | 4 +- ...er-bindings-generated_in_modules.gni.patch | 4 +- ...renderer-bindings-idl_in_modules.gni.patch | 4 +- ...d_party-blink-renderer-core-BUILD.gn.patch | 2 +- ...-canvas-canvas_async_blob_creator.cc.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 4 +- ...r-core-html-media-autoplay_policy.cc.patch | 4 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 4 +- ...anvas2d-base_rendering_context_2d.cc.patch | 6 +- ...canvas2d-base_rendering_context_2d.h.patch | 4 +- ...vas2d-canvas_rendering_context_2d.cc.patch | 4 +- ...as2d-canvas_rendering_context_2d.idl.patch | 2 +- ...reen_canvas_rendering_context_2d.idl.patch | 2 +- ...modules-mediastream-media_devices.cc.patch | 4 +- ...nderer-modules-modules_idl_files.gni.patch | 4 +- ...rer-modules-webaudio-audio_buffer.cc.patch | 2 +- ...odules-webaudio-realtime_analyser.cc.patch | 2 +- ...bgl-webgl2_rendering_context_base.cc.patch | 8 +- ...ebgl-webgl_rendering_context_base.cc.patch | 48 ++++++------ ...tools-gritsettings-resource_ids.spec.patch | 4 +- ...rams_xml-histogram_suffixes_list.xml.patch | 4 +- patches/ui-base-BUILD.gn.patch | 4 +- .../ui-native_theme-native_theme_win.cc.patch | 2 +- ...ews-controls-button-md_text_button.h.patch | 4 +- 141 files changed, 366 insertions(+), 308 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index f269c5638ffe..1332b9db12b7 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 5bc48a734b4b85a0e30a2570aa4ff6f776f40a69..e63c1286eef96edc30d7e25e2b5afc1abe9a5400 100644 +index 9d0250c77571fad6db362953fdddafe009f3bddb..a0844728a99d3fd591d8643833fe9e73fb78cb06 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3746,6 +3746,7 @@ if (is_android) { +@@ -3750,6 +3750,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 30f4aef1c068..3c6c7a54069f 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,9 +1,9 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 4c363465c3c7a153c7934ba99b665435d8fdaf12..25e1033577f9821d0e6fce4d87d49aac2aea57d9 100644 +index 19b5ab7d5b77d284db95b101e7a0240975c75297..f209de065c8c983758d13ce9ed9ba72dc000f0b5 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni -@@ -7,6 +7,7 @@ - import("//build/config/chromeos/ui_mode.gni") +@@ -10,6 +10,7 @@ import("//build/config/chromeos/ui_mode.gni") + import("//build/config/android/channel.gni") # This file contains common system config stuff for the Android build. +import("//brave/build/android/config.gni") diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index d41683b4bf2f..3dc24219401b 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index c01294f793e85040bc3d258c277cb82869609eb8..a91d163dafe8c60c41b20ad9601542b364c4c664 100644 +index f79f26ef501ed326c56b070dbe2cc993d2f858b0..0a2da0edc7823bdf036b57f98e24e1aa7904d70d 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -2023,6 +2023,7 @@ if (enable_java_templates) { +@@ -2072,6 +2072,7 @@ if (enable_java_templates) { _deps = [ ":$_desugar_target" ] _previous_output_jar = _desugar_output_jar } diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 188d77e49ac0..986cebc1d64d 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index 588b619121a62905a0b056b1a4640f3d62446c4b..d68609ee34a09075d3b48eb36dadccab63e9d644 100644 +index fe47adf0b62e92eaf22bed9476e28567880c396f..8f0a33372d7d191d03422b49735da56849eff2ba 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -658,6 +658,7 @@ if (enable_java_templates) { @@ -8,5 +8,5 @@ index 588b619121a62905a0b056b1a4640f3d62446c4b..d68609ee34a09075d3b48eb36dadccab template("jinja_template") { + if (defined(invoker.includes)) { invoker.includes += brave_android_manifest_includes } else { invoker.includes = brave_android_manifest_includes } action_with_pydeps(target_name) { - forward_variables_from(invoker, - [ + # TODO(crbug.com/1112471): Get this to run cleanly under Python 3. + run_under_python2 = true diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index d448011ac9f7..8e116c6baa68 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 ed3d81786b0dd16f998ece213f7cd66723bed5fb..84b1e1aac1b113688f4b6bd527be846db2a8aee1 100644 +index 9d66490cdb555a6114d71b156a32b2fd7a32591f..ca637f0f50bb5b750f82c3a9507ccf6e6a74f186 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1670,6 +1670,7 @@ config("chromium_code") { +@@ -1645,6 +1645,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } diff --git a/patches/build-toolchain-win-setup_toolchain.py.patch b/patches/build-toolchain-win-setup_toolchain.py.patch index a4a4e54fd411..1956e8b933ee 100644 --- a/patches/build-toolchain-win-setup_toolchain.py.patch +++ b/patches/build-toolchain-win-setup_toolchain.py.patch @@ -1,5 +1,5 @@ diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py -index 58bf3e8caf4e0a0fdcba03c5b8bf72b30ea8f075..b504e562355cc2468a1c661a4daec983e68dfb6a 100644 +index 47309866ca790e6753d20cdd097cce9ee2b3f57b..99e676117f6f60ef06fb84162ecea7d0efdf614b 100644 --- a/build/toolchain/win/setup_toolchain.py +++ b/build/toolchain/win/setup_toolchain.py @@ -277,6 +277,7 @@ def main(): diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 88e9041a697d..fd9500427b12 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 a1f8f46f3055f412aff2a883b5e8ca3d609468cf..3ffae4dcc3fb330c75b80ede23b26721c31746c4 100644 +index f721f1aff4781fa5936010dfb5b0c97587e81c05..8476c12cd97d3f01974b574a1ff137fdcc11969e 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -150,6 +150,10 @@ if (!is_android && !is_mac) { @@ -73,7 +73,7 @@ index a1f8f46f3055f412aff2a883b5e8ca3d609468cf..3ffae4dcc3fb330c75b80ede23b26721 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -1019,6 +1028,10 @@ if (is_win) { +@@ -1033,6 +1042,10 @@ if (is_win) { if (is_chrome_branded) { deps += [ ":default_apps" ] } @@ -84,7 +84,7 @@ index a1f8f46f3055f412aff2a883b5e8ca3d609468cf..3ffae4dcc3fb330c75b80ede23b26721 ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ] -@@ -1176,6 +1189,7 @@ if (is_win) { +@@ -1190,6 +1203,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -92,7 +92,7 @@ index a1f8f46f3055f412aff2a883b5e8ca3d609468cf..3ffae4dcc3fb330c75b80ede23b26721 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/app:shutdown_signal_handlers", -@@ -1276,12 +1290,13 @@ group("child_dependencies") { +@@ -1290,12 +1304,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -107,7 +107,7 @@ index a1f8f46f3055f412aff2a883b5e8ca3d609468cf..3ffae4dcc3fb330c75b80ede23b26721 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1335,6 +1350,7 @@ group("resources") { +@@ -1349,6 +1364,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 8bd9470ee014..c1d545e425cd 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 e6f1f636018d937841567678bc90c1b77e48e0ef..1ffcce76316faf5f842549828f5d42018e7dac5b 100644 +index cb60323b4b9a3d49882297d037e319ca622ac4b1..5989ec44e88f3f82ab2ba704b16453cab9b7dc9a 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -231,6 +231,7 @@ android_resources("chrome_app_java_resources") { @@ -10,7 +10,7 @@ index e6f1f636018d937841567678bc90c1b77e48e0ef..1ffcce76316faf5f842549828f5d4201 } if (enable_vr) { -@@ -530,6 +531,7 @@ android_library("chrome_java") { +@@ -531,6 +532,7 @@ android_library("chrome_java") { ] deps += feed_deps @@ -18,7 +18,7 @@ index e6f1f636018d937841567678bc90c1b77e48e0ef..1ffcce76316faf5f842549828f5d4201 srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -560,6 +562,7 @@ android_library("chrome_java") { +@@ -561,6 +563,7 @@ android_library("chrome_java") { "//components/ui_metrics:ui_metrics_enums_java", "//net:effective_connection_type_java", ] @@ -26,15 +26,15 @@ index e6f1f636018d937841567678bc90c1b77e48e0ef..1ffcce76316faf5f842549828f5d4201 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -683,6 +686,7 @@ group("jni_headers") { +@@ -678,6 +681,7 @@ group("jni_headers") { "//chrome/browser/webauthn/android:jni_headers", "//components/media_router/browser/android:jni_headers", ] + public_deps += ["//brave/build/android:jni_headers"] } - action("chrome_android_java_google_api_keys_srcjar") { -@@ -1799,6 +1803,7 @@ if (current_toolchain == default_toolchain) { + # TODO(crbug.com/1112471): Get this to run cleanly under Python 3. +@@ -1798,6 +1802,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 777159fb7164..d59021c528ea 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 f8040f5bf4374f5eb81bc264282fb56562b2cc80..984762215631a61efadf6b0094cfb957fbc9068b 100644 +index 70110a8d91ddec05e760a1029b12905f5f421961..513abb2f10f7655b869ce91868ca952d1c3ca9fd 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1682,3 +1682,4 @@ chrome_java_sources = [ +@@ -1687,3 +1687,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-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index 890f27558338..3439a43bcafd 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 45b925f5df82cb1ed624ca357a49b8d044df1c6f..fd06f89a8ff95f6c96601de59a6762ac58b04bc6 100644 +index 5bd971071b54553b992bc359576a2a08eb431ae9..4682a9dc22af4e00c106f127a4d1c364b066ef6d 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni -@@ -207,6 +207,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -210,6 +210,7 @@ template("chrome_public_common_apk_or_module_tmpl") { "${_material_package}:[Ss]lider", "${_material_package}:[Tt]oolbarLayout", ] @@ -10,7 +10,7 @@ index 45b925f5df82cb1ed624ca357a49b8d044df1c6f..fd06f89a8ff95f6c96601de59a6762ac if (!_is_monochrome) { product_config_java_packages = [ "org.chromium.chrome.browser" ] -@@ -316,6 +317,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -319,6 +320,7 @@ template("chrome_public_common_apk_or_module_tmpl") { if (!defined(proguard_configs)) { proguard_configs = [] } diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch index f7c533924861..ade6422a935a 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 b7143fd76a6114e222cabdb2e298d424622cde1d..7a28c11c2be01a03cc56d5bc6c6a394d2acc1811 100644 +index dd0775a711d40c7a2336e724d9530b01d24c0b92..113ecb70a6d10e7116709dab1daea3066bbff32c 100644 --- a/chrome/android/expectations/lint-suppressions.xml +++ b/chrome/android/expectations/lint-suppressions.xml -@@ -342,4 +342,5 @@ Still reading? +@@ -344,4 +344,5 @@ Still reading? diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index f0623b209ab7..fad5c82c4628 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 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88d8d6e0ab 100644 +index 4f73e753eb851db0c3547a5ee636b94ded5350fd..5939198b6c899268128985999d3348b9e4e0c6d7 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. @@ -12,7 +12,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88 -@@ -48,17 +50,24 @@ by a child template that "extends" this file. +@@ -48,9 +50,13 @@ by a child template that "extends" this file. {% if target_sdk_version|int > 27 or target_sdk_version == "Q" %} {% endif %} @@ -25,9 +25,8 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88 +--> -+ - - + +@@ -59,7 +65,9 @@ by a child template that "extends" this file. @@ -37,7 +36,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88 -@@ -107,7 +116,9 @@ by a child template that "extends" this file. +@@ -107,7 +115,9 @@ by a child template that "extends" this file. @@ -47,7 +46,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88 {% block extra_uses_permissions %} {% endblock %} -@@ -160,6 +171,7 @@ by a child template that "extends" this file. +@@ -160,6 +170,7 @@ by a child template that "extends" this file. org.chromium.chrome.browser.ChromeApplication {%- endif -%} {% endblock %}" @@ -55,7 +54,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88 android:icon="@drawable/ic_launcher" android:roundIcon="@drawable/ic_launcher_round" android:label="{% block application_label %}@string/app_name{% endblock %}" -@@ -1166,6 +1178,7 @@ by a child template that "extends" this file. +@@ -1171,6 +1182,7 @@ by a child template that "extends" this file. {% endif %} @@ -63,7 +62,7 @@ index 2948f6a58cafde782ca2a7860d352ed56cf3cd20..c1cad83439f8da614abbd8c69db13e88 {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1248,6 +1261,7 @@ by a child template that "extends" this file. +@@ -1253,6 +1265,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch index 49aa30483b4b..345b976bd545 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-AppHooks.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java -index 7463c1449dae81fc33d1518c4a95d71b16072a5b..283cb6c535f16e5914305565862a6c789f2711d2 100644 +index ed15b5d777ae94b92e8dc36e138416243cdc7d39..e342cb1a60367f67ee99661bc55fee5bd92da372 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java -@@ -77,7 +77,7 @@ public abstract class AppHooks { +@@ -78,7 +78,7 @@ public abstract class AppHooks { @CalledByNative public static AppHooks get() { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch index d7a565c3cdce..c99623e5ef0f 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-TabbedModeTabDelegateFactory.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java -index 8d2a47311ce2f686cc343fc16c775008bffe855a..c05e6c020335951b421dcfd4c3918415ffe6bf79 100644 +index 882fc599e5542cd97ae1c4a157aacf60e9ad0c4f..9934e0594254921ed3692dfbfed889b410f6aa0e 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/TabbedModeTabDelegateFactory.java @@ -56,7 +56,7 @@ public class TabbedModeTabDelegateFactory implements TabDelegateFactory { 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 bebb65bc80c8..743f3e7c8480 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 bcefc55f69ce1810cb7e70a15613aba5d6c96a80..595817c9826f6a1d89da0125f758301d2896e17c 100644 +index 0de599b3e2c0a22da7de31b432c1bd6619459247..53b0cf35737bbb1a7f52851e2449c83a7850d03a 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 @@ -331,7 +331,7 @@ public abstract class ChromeActivity diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch index cee5809cdab1..4dfd3a6adf80 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-password_manager-settings-PasswordSettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java -index e857d81ad38bdcf73b3b75607b3d6144f1588e91..88dd035856cc0c0f060a3c1eaae4eb849f95ed63 100644 +index 2470d6bae98c5c0ba059b72f59608adfede06681..cb4a2acc687c5c4865004452b6b92be784294d4d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordSettings.java -@@ -58,7 +58,7 @@ import java.util.Locale; +@@ -57,7 +57,7 @@ import java.util.Locale; * to view saved passwords (just the username and URL), and to delete saved passwords. */ public class PasswordSettings diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch index f3316c580276..a5d1b2aad856 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-SyncAndServicesSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java -index e29316630cceb054aef4ab270f3aa325dc62a075..1ae510a0255511d65d4292711aa2115c0f0af128 100644 +index a1101ceecf751b9914ba4bff7a91c8cac241879d..3aba3e417b2e006488676db7a62d90e02a8aab88 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/SyncAndServicesSettings.java @@ -76,7 +76,7 @@ import org.chromium.ui.widget.ButtonCompat; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch index 22ad8de936a1..33079bc13978 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -index ec684d7d473d0c8d96acbacdb25ec0b349361f3a..3cfa37bd82493689b7cbfdb1de6d7f6eb918aa9d 100644 +index 867575d317a6961d1a85bdb2dd1bf302f5ce703b..94e8ac7c040ae2bebfeeec2cfbfb17cda4585969 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java -@@ -379,14 +379,14 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -391,14 +391,14 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve ThemeColorProvider overviewModeThemeColorProvider = mAppThemeColorProvider; Runnable requestFocusRunnable = compositorViewHolder::requestFocus; @@ -19,7 +19,7 @@ index ec684d7d473d0c8d96acbacdb25ec0b349361f3a..3cfa37bd82493689b7cbfdb1de6d7f6e appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mActivity, (focus, type) -> setUrlBarFocus(focus, type), -@@ -735,7 +735,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -757,7 +757,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve IdentityDiscController identityDiscController, OneshotSupplier startSurfaceSupplier) { // clang-format off diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch index b80b0aaf18ff..73086533564b 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java -index e3b12ac8f13bc16a55b244d25075bb944ff7de6d..9be68e7dc5641bc5bbec56e3fc4c76b050d42a9f 100644 +index dd58bc81f065e0434d28f8ec665a3ae8e0ddd29b..8b8f3de73df0dc977bddc719a9805ff2353a2ef2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java -@@ -98,7 +98,7 @@ public class BottomControlsCoordinator { +@@ -94,7 +94,7 @@ public class BottomControlsCoordinator { View container = root.findViewById(R.id.bottom_container_slot); ViewGroup.LayoutParams params = container.getLayoutParams(); params.height = root.getResources().getDimensionPixelOffset(bottomControlsHeightId); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index c1a44d38c4f5..4d3ad4e23cbd 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index 9170c4523a4208a074e8530393b53854dbed672b..fdbec35de197cbfd4ebd5daa2f907ad601409273 100644 +index b39668dd8f239b5867a97a98419e67590a46e3fe..ea588d4f64a3a20459b731c6d645e181c4b9e857 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -@@ -86,7 +86,7 @@ import java.util.List; +@@ -85,7 +85,7 @@ import java.util.List; /** * Phone specific toolbar implementation. */ @@ -11,7 +11,7 @@ index 9170c4523a4208a074e8530393b53854dbed672b..fdbec35de197cbfd4ebd5daa2f907ad6 /** The amount of time transitioning from one theme color to another should take in ms. */ public static final long THEME_COLOR_TRANSITION_DURATION = 250; -@@ -399,10 +399,12 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -398,10 +398,12 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC /** * Set the background color of the location bar to appropriately match the theme color. */ @@ -25,7 +25,7 @@ index 9170c4523a4208a074e8530393b53854dbed672b..fdbec35de197cbfd4ebd5daa2f907ad6 } /** -@@ -512,6 +514,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -511,6 +513,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED); } } @@ -33,7 +33,7 @@ index 9170c4523a4208a074e8530393b53854dbed672b..fdbec35de197cbfd4ebd5daa2f907ad6 } @Override -@@ -681,7 +684,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -680,7 +683,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC * @return The right bounds of the location bar after accounting for any visible left buttons. */ private int getBoundsAfterAccountingForRightButtons() { @@ -42,7 +42,7 @@ index 9170c4523a4208a074e8530393b53854dbed672b..fdbec35de197cbfd4ebd5daa2f907ad6 } private void updateToolbarBackground(int color) { -@@ -2087,6 +2090,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -2086,6 +2089,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC } else { populateUrlClearFocusingAnimatorSet(animators); } diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index 1238d6ac4d3c..c74f07131e48 100644 --- a/patches/chrome-app-BUILD.gn.patch +++ b/patches/chrome-app-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn -index d85c8180793d59dd22d4aafbfb95ac0b746908ca..1eed0b7c4fa3fce7c7a6d80b0a006cc19d78bf4d 100644 +index bc9b9495ad18b5b2e2980e975a06f5691b65a71f..06423a2741497c46b9ce11618043950dd306044d 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn -@@ -74,6 +74,8 @@ grit("generated_resources") { +@@ -77,6 +77,8 @@ grit("generated_resources") { if (is_android) { outputs += android_generated_java_resources } @@ -11,7 +11,7 @@ index d85c8180793d59dd22d4aafbfb95ac0b746908ca..1eed0b7c4fa3fce7c7a6d80b0a006cc1 } if (is_android) { -@@ -96,7 +98,7 @@ grit("google_chrome_strings") { +@@ -99,7 +101,7 @@ grit("google_chrome_strings") { } grit("chromium_strings") { diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 160fbb7716ba..ab9d580d4eb5 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 535d65e656797dcb397e944d7d1ca5102ad5f9c6..93723bb09b79a6b58f4675f9a760fa3c55973ee0 100644 +index 53ce992f043cda690807b65a7a19b3c820e862dd..eb88a20ce5ac772d9ee709c6c3c6d32b6dbfa372 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2385,6 +2385,7 @@ static_library("browser") { +@@ -2423,6 +2423,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index f3a49f0893e8..fd2d46ad3684 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 4747a7d3424672f8cc79debf00a5633ed8eba044..76cb61eaa3c4716eb2cdd2322ddd1ff371034384 100644 +index 2d0ef2748a473149a9e6bf454cc8e0a91cf9e712..e194807caf853ddd26d6786266f3786b6528dac2 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -297,14 +297,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -298,14 +298,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -21,7 +21,7 @@ index 4747a7d3424672f8cc79debf00a5633ed8eba044..76cb61eaa3c4716eb2cdd2322ddd1ff3 const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -6682,6 +6682,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -6721,6 +6721,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 3fcf45270bfd..2ebbbc22c283 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 fb5ec1857ec97a887562420e284cb99e63e61e8f..97f39d0d4847a89df6af52226f430b62ec7cc203 100644 +index c6f87c148d166b498cbdc635142cce72ad9a3870..97908ee5529d21faad39190cfa07582c6f75ee3f 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -722,6 +722,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -727,6 +727,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch b/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch index 1b73a7833cf4..27590b3195ea 100644 --- a/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch +++ b/patches/chrome-browser-content_settings-host_content_settings_map_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/content_settings/host_content_settings_map_factory.cc b/chrome/browser/content_settings/host_content_settings_map_factory.cc -index f3b51e20cb9c84719947b6fbf779d8429e924570..27d78b367a8fb8505ee49c51fa17a033aca2b66a 100644 +index cf62b79358e14c90dab5a1e68cec7055c0cce39f..3a6f8c0ea0368b627fc5477163858f028a45ebc1 100644 --- a/chrome/browser/content_settings/host_content_settings_map_factory.cc +++ b/chrome/browser/content_settings/host_content_settings_map_factory.cc -@@ -86,6 +86,7 @@ scoped_refptr +@@ -87,6 +87,7 @@ scoped_refptr scoped_refptr settings_map(new HostContentSettingsMap( profile->GetPrefs(), diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index 36d78a51cf56..caab3074ac79 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index 142b6699f13a779c783d93a25f1c5e3452183a83..a3f199a67c6e026865903f80a403b8394a68787f 100644 +index 0b3b0372d42a7f2c78d404125351ab54e6e258bd..ad8fa0ed5d4d23c87ae7cb31472b7e65a9173ad7 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1266,6 +1266,7 @@ static_library("extensions") { +@@ -1271,6 +1271,7 @@ static_library("extensions") { } else { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } diff --git a/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch b/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch index f4311ba9772c..c429b0538427 100644 --- a/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch +++ b/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc -index 81202cee9f5a9a31cf0097ff549ff002376514bf..3f1de5233e55770106187d93049af175f249efcc 100644 +index 18045b809f9cd6e7fccf49e5f7172fec0559c677..1e806c4c4b28c4931d8f2f03b8d06c6dd0e2eabf 100644 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc -@@ -129,6 +129,7 @@ ChromeComponentExtensionResourceManager::Data::Data() { +@@ -128,6 +128,7 @@ ChromeComponentExtensionResourceManager::Data::Data() { std::move(pdf_viewer_replacements); } #endif diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 0c0cc3558664..1efd4ebea296 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index aecef847f26608a9a3f18a5479621a88c2c41465..545d662b5764fd0934f843add4a0a3d19f91f9ee 100644 +index 6368e26a6bf97ffef4cebeb390d2aab9de22bbe0..4e3bd0b62666c6188250235f2de352373d52bd82 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc @@ -17,6 +17,7 @@ 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 a8f32578690e..c80b54ffbc20 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 e0482c79a4f176381376285e8b93c3c5abc65db3..e063a10394852b0c9cbb2acce0772ecf2b97b51e 100644 +index e8c50f50be776cdc056fdcfec42b4a91c5145eae..24738818b2643ff2b1bd25398aa67b2e767a4032 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -276,6 +276,7 @@ const base::Feature* kFeaturesExposedToJava[] = { +@@ -280,6 +280,7 @@ const base::Feature* kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-net-net_error_tab_helper.cc.patch b/patches/chrome-browser-net-net_error_tab_helper.cc.patch index 60e462b88309..ca7e7120b2d9 100644 --- a/patches/chrome-browser-net-net_error_tab_helper.cc.patch +++ b/patches/chrome-browser-net-net_error_tab_helper.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/net_error_tab_helper.cc b/chrome/browser/net/net_error_tab_helper.cc -index 3477bb6fbeceb2ab3d9a00332bc0146f22793450..faf701cc8342ed7eed0679a6da93c136e2e6cfb6 100644 +index 313758372e0fcb842ee6a5b5cd69a64b8a95b2ac..cc920fb9459462075a1a9c123ae7af34ea5c8ac8 100644 --- a/chrome/browser/net/net_error_tab_helper.cc +++ b/chrome/browser/net/net_error_tab_helper.cc -@@ -201,6 +201,9 @@ void NetErrorTabHelper::InitializePref(WebContents* contents) { +@@ -200,6 +200,9 @@ void NetErrorTabHelper::InitializePref(WebContents* contents) { } bool NetErrorTabHelper::ProbesAllowed() const { diff --git a/patches/chrome-browser-net-system_network_context_manager.cc.patch b/patches/chrome-browser-net-system_network_context_manager.cc.patch index 73ba681580b2..f0387a7f3475 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index 7f58187215cb94be47e38f6be9de32012332d9fd..72d0d7bd243e3fa373f00396d5af8843551aa5cc 100644 +index c45a5a758d91d87d03791ceba1e3befca6768cdf..e610453c4f2ad9662fd7d89f856a5992e70ddc60 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -218,7 +218,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem +@@ -220,7 +220,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem if (!manager_) return; manager_->GetURLLoaderFactory()->CreateLoaderAndStart( diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 088810972f8b..ece59e2668ea 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 9c81ffe93ae903e045c07b578c89083b6675a935..418ade6c5662779666b78290556d4d233ff87b22 100644 +index 7e31648f1a8cde7b84a3764c80930309138b9ec2..d7d925a3de64aa8574dc099b74638503477734d1 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -742,6 +742,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -764,6 +764,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 9c81ffe93ae903e045c07b578c89083b6675a935..418ade6c5662779666b78290556d4d23 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1008,6 +1009,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1029,6 +1030,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index 55aac863d087..82d139d1498b 100644 --- a/patches/chrome-browser-profiles-profile.cc.patch +++ b/patches/chrome-browser-profiles-profile.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile.cc b/chrome/browser/profiles/profile.cc -index 039035dce20878b29523ad7ebce2bf189eadfa0c..c08083fd5cef809ddff0e97f7c87df4c5a00b48d 100644 +index 103c8c04b728e35b3ac1a5b8461acbc8616dcf47..6820c83d5b14012e879587c96273375f9178dcd5 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -131,6 +131,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const { diff --git a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch index 33dbbd2e3744..6f4a6141a72b 100644 --- a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch +++ b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc -index d2214a75fdf2045c471386ac1b43385100c671a9..174601e2a0346452cd983942f21680fcf3a4e71f 100644 +index 103ec9874ad51926189a20c53f129183b38cd7c3..f03aed0dc8022453eb549c5226d36c6e937f1c7a 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc -@@ -335,7 +335,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; +@@ -343,7 +343,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; #elif defined(OS_CHROMEOS) constexpr size_t kDefaultAvatarIconsCount = 27; #else @@ -11,7 +11,7 @@ index d2214a75fdf2045c471386ac1b43385100c671a9..174601e2a0346452cd983942f21680fc #endif #if !defined(OS_ANDROID) -@@ -470,6 +470,7 @@ size_t GetPlaceholderAvatarIndex() { +@@ -474,6 +474,7 @@ size_t GetPlaceholderAvatarIndex() { size_t GetModernAvatarIconStartIndex() { #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) @@ -19,7 +19,7 @@ index d2214a75fdf2045c471386ac1b43385100c671a9..174601e2a0346452cd983942f21680fc return GetPlaceholderAvatarIndex() + 1; #else // Only use the placeholder avatar on ChromeOS and Android. -@@ -503,6 +504,7 @@ std::string GetPlaceholderAvatarIconUrl() { +@@ -507,6 +508,7 @@ std::string GetPlaceholderAvatarIconUrl() { const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) { CHECK_LT(index, kDefaultAvatarIconsCount); diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index 7372e4e2bbec..e6b5f351fd9b 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index 1c6cb0b66b46a958ad57f3f8c31ad225558d5c71..9ad82d26e2760cb0e06d95fedaed9c4f26986b49 100644 +index 03953cd006a5e6717d78a5f878a8ff065c520318..2eb4f00844c0acf3e98918cbbbdd55535cbc7dc6 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -356,7 +356,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, diff --git a/patches/chrome-browser-profiles-profile_io_data.cc.patch b/patches/chrome-browser-profiles-profile_io_data.cc.patch index 4be5e1990aae..171776dc4b4a 100644 --- a/patches/chrome-browser-profiles-profile_io_data.cc.patch +++ b/patches/chrome-browser-profiles-profile_io_data.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc -index 7c91474fa32ce1780b2a9ceb8924a848a01187e1..0ecefb79f1c19fea87457b30323aec6cd21d4d8d 100644 +index 16c5e6132537cd576fdb6832d291f9413c578344..f2147c203b23b8ffd5a1437b643befa539c69766 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -255,6 +255,9 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index ec9638933e3b..e93defe8536d 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 6043ab9230474f36fb901ddfeee456615ed30183..d6651c5f599d814ea9ee93df239c1e13f4a389b2 100644 +index 35806cc9646da03b306d7e059b87405be2984fc9..1bd6ace6d63c816ab8b5bec52f523eddf73ee787 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1631,6 +1631,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -1630,6 +1630,7 @@ void RenderViewContextMenu::AppendSearchProvider() { selection_navigation_url_ = match.destination_url; if (!selection_navigation_url_.is_valid()) return; diff --git a/patches/chrome-browser-resources-downloads-toolbar.js.patch b/patches/chrome-browser-resources-downloads-toolbar.js.patch index 91024a61229a..9492143c8206 100644 --- a/patches/chrome-browser-resources-downloads-toolbar.js.patch +++ b/patches/chrome-browser-resources-downloads-toolbar.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/downloads/toolbar.js b/chrome/browser/resources/downloads/toolbar.js -index a14fbf89bfe7eb925e9a9febdd280454d573c90b..8caf240db979c09d30a36a71ab74d31e582b8b8c 100644 +index 9d6413739b71440ad88eb3bd57b0f415d425299c..8aecba85bed4c7d3461f2ec7f04734c1eeab0ff9 100644 --- a/chrome/browser/resources/downloads/toolbar.js +++ b/chrome/browser/resources/downloads/toolbar.js @@ -4,7 +4,7 @@ diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch index 025c6cfdb41b..9c348b7ee4e7 100644 --- a/patches/chrome-browser-resources-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-resources-extensions-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn -index 41882a90448cee3778522c1c1abdd0d5ef675bca..fcfcacabd41712c874d08be461022f38b1e6ff5e 100644 +index cfed148d68be8d0880823b391b55936f942c22cc..2b2989f4ce45b6b74d25d3537865d7d09c54c19e 100644 --- a/chrome/browser/resources/extensions/BUILD.gn +++ b/chrome/browser/resources/extensions/BUILD.gn @@ -57,6 +57,7 @@ generate_grd("build_grd") { diff --git a/patches/chrome-browser-resources-optimize_webui.gni.patch b/patches/chrome-browser-resources-optimize_webui.gni.patch index 30ddc078d71a..744ee1f2066b 100644 --- a/patches/chrome-browser-resources-optimize_webui.gni.patch +++ b/patches/chrome-browser-resources-optimize_webui.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/optimize_webui.gni b/chrome/browser/resources/optimize_webui.gni -index f4c1ca5ad559e285b1bfff925c4098b27c0d5888..9fc33e3b38f78cf500a293837e303b0db78890a8 100644 +index 3aaf5b333c1fcc0c2133af8ec8342925836ba772..fae4b6e64f337d8959446745217a0f8960f81d79 100644 --- a/chrome/browser/resources/optimize_webui.gni +++ b/chrome/browser/resources/optimize_webui.gni -@@ -44,6 +44,7 @@ template("optimize_webui") { +@@ -47,6 +47,7 @@ template("optimize_webui") { } deps = invoker.deps diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 9cfd0da583a2..5fa4e5e65c5e 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index 3a364142fc0b49a183a2fd046956b530aa900569..d2a2db08cb93baac1b87b1627960f8a75a27edff 100644 +index 11a8c2b06277288e35925866e6a7387d59c6faca..952034904b01f5b9bfbfbf99a76a8729b8ad1bf3 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn @@ -85,6 +85,7 @@ generate_grd("build_grd") { diff --git a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch index 7ae4b6ba3c94..fdd20ed2e333 100644 --- a/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch +++ b/patches/chrome-browser-resources-settings-site_settings-category_default_setting.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/category_default_setting.js b/chrome/browser/resources/settings/site_settings/category_default_setting.js -index 0a9d21082eedb5802c5a9f54847cb559658cd903..af7ffc904254dd6ede455d5b2a4d227ba2730001 100644 +index f1aeec3e53c7c7d196111d4260b6ae6a85b02895..396dae1f7a26bb2582d19d58d37030d1dcab53c7 100644 --- a/chrome/browser/resources/settings/site_settings/category_default_setting.js +++ b/chrome/browser/resources/settings/site_settings/category_default_setting.js @@ -165,6 +165,7 @@ Polymer({ diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.js.patch b/patches/chrome-browser-resources-settings-site_settings-constants.js.patch index a5f50bd44d0f..0794e9b999ce 100644 --- a/patches/chrome-browser-resources-settings-site_settings-constants.js.patch +++ b/patches/chrome-browser-resources-settings-site_settings-constants.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/site_settings/constants.js b/chrome/browser/resources/settings/site_settings/constants.js -index a0870deecdd923cbeac4fa5cc3a073cf42093de5..218fc1da1f7d0dd478a55763b08145f638c1512d 100644 +index 1679cc0ddb9eab2879bc8260143c022b70c702c1..9a502ed2d44b1b8bd69670006beff8a473a09c63 100644 --- a/chrome/browser/resources/settings/site_settings/constants.js +++ b/chrome/browser/resources/settings/site_settings/constants.js -@@ -43,6 +43,7 @@ export const ContentSettingsTypes = { +@@ -42,6 +42,7 @@ export const ContentSettingsTypes = { VR: 'vr', WINDOW_PLACEMENT: 'window-placement', ZOOM_LEVELS: 'zoom-levels', diff --git a/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch b/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch index 1de657fff324..0d56799b151a 100644 --- a/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch +++ b/patches/chrome-browser-safe_browsing-client_side_model_loader.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/safe_browsing/client_side_model_loader.cc b/chrome/browser/safe_browsing/client_side_model_loader.cc -index 99a163ccbde4258ab0794213ceb8d592b38f7a3a..55116d5a0df8cd1de469ac53f3b1c639c16c21ff 100644 +index ddf7337ca74fabe4a1cd4f083e27fb64bed629d6..7ecabf340de6fa32316815f948f4ab7361d66a95 100644 --- a/chrome/browser/safe_browsing/client_side_model_loader.cc +++ b/chrome/browser/safe_browsing/client_side_model_loader.cc @@ -60,7 +60,7 @@ std::string ReadFileIntoString(base::FilePath path) { diff --git a/patches/chrome-browser-sync-profile_sync_service_factory.cc.patch b/patches/chrome-browser-sync-profile_sync_service_factory.cc.patch index 2ab80850a4f8..80590df05268 100644 --- a/patches/chrome-browser-sync-profile_sync_service_factory.cc.patch +++ b/patches/chrome-browser-sync-profile_sync_service_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc -index e1dc8ce5ae095eed5bbaf42ee8106ad4b07b12d6..29355416e5f391e5a644e5bf1ba11d100c007990 100644 +index 3f95a01c4f13fbae02a00e18135e316c7833e6f4..0a0793faa475221bbfb45f252c91b471701589aa 100644 --- a/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chrome/browser/sync/profile_sync_service_factory.cc -@@ -257,7 +257,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor( +@@ -260,7 +260,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor( } auto pss = diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 5a98e0a08eab..81711ae54ad8 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 2df4783a2e4ab3fe527e384540120626d5d0f90e..4392bf24b4074149c4f473433da1a187ff4ce655 100644 +index 91bb3832b7efdc317875db18ec4b8a8965458ba6..9a2c00f9886b0a9bbce8fc8ca93394a4c63f77f0 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -580,6 +580,7 @@ static_library("ui") { @@ -10,7 +10,7 @@ index 2df4783a2e4ab3fe527e384540120626d5d0f90e..4392bf24b4074149c4f473433da1a187 allow_circular_includes_from += [ "//chrome/browser/ui/webui/bluetooth_internals" ] -@@ -3202,10 +3203,13 @@ static_library("ui") { +@@ -3214,10 +3215,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch index 28f2622035d3..23df5fb4032d 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -index 85660451f742d274d16b8354c18829108f3220d0..7986427e332ab60d75d986c3c0a0ea54128d2f7b 100644 +index 6fad28ee0ed0a12d2d57d076b65025b7aeb2f1bf..7c9546fc1c3d724c4c642464238e2508ba0974ca 100644 --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -@@ -219,6 +219,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -217,6 +217,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler mPopup.setBackgroundDrawable(ApiCompatibilityUtils.getDrawable( context.getResources(), R.drawable.popup_bg_tinted)); if (!isByPermanentButton) mPopup.setAnimationStyle(R.style.OverflowMenuAnim); diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index f59334ab0bd3..4fc680414d1d 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index e2e505a71e51224364085f9c9556ed02f4d8cd70..0d3c8d6aa4d3c63aac4a001bdf89646255e42255 100644 +index 2c9d816e1aff340615061e888cbbcd69300befcd..76f9bc4537210c08f0d696f6f41ec7b9a08a943e 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -449,7 +449,7 @@ Browser::Browser(const CreateParams& params) +@@ -445,7 +445,7 @@ Browser::Browser(const CreateParams& params) tab_strip_model_delegate_( std::make_unique(this)), tab_strip_model_( diff --git a/patches/chrome-browser-ui-browser.h.patch b/patches/chrome-browser-ui-browser.h.patch index 933abe70ee7c..4f13d73d4ff5 100644 --- a/patches/chrome-browser-ui-browser.h.patch +++ b/patches/chrome-browser-ui-browser.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h -index 764429a330c130871c2310b564481b03b8175840..e6abcbf6a2e0bdeefdf351c1c45a75522994c14e 100644 +index afd852999cd7716d246a31aa407fc262bb5dc128..e5d64b5d71718f1def54c0e4bf63560cee7064c6 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h -@@ -689,6 +689,7 @@ class Browser : public TabStripModelObserver, +@@ -682,6 +682,7 @@ class Browser : public TabStripModelObserver, // Sets the browser's user title. Setting it to an empty string clears it. void SetWindowUserTitle(const std::string& user_title); diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch index b92a23da321c..f7493f845eb8 100644 --- a/patches/chrome-browser-ui-browser_navigator.cc.patch +++ b/patches/chrome-browser-ui-browser_navigator.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc -index 237ee2d0a68aa631d6356b07c6baba71ac6d746d..b818005c81c3f93e8fa76667213d49df7173f04c 100644 +index 9e33691853229c2104b1a14a34971eb947fbc06f..3b22c194cad838756a5f32f0d36ca33906ad748c 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -469,6 +469,7 @@ void Navigate(NavigateParams* params) { diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index 62861cd4609a..a55699fbf1fb 100644 --- a/patches/chrome-browser-ui-chrome_pages.cc.patch +++ b/patches/chrome-browser-ui-chrome_pages.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc -index 6683c0e666062755776097522a012fa10611a35b..bb2f44b52282640e3d29542b63aecfceefa56b7c 100644 +index 2e479cf5d944b11956b9908531eca758d9bac1df..6b10fdda40f30b1768b93be37268df784e000f2e 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -299,7 +299,7 @@ void ShowSlow(Browser* browser) { +@@ -300,7 +300,7 @@ void ShowSlow(Browser* browser) { #endif } diff --git a/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch b/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch index f0ec65dc923a..99af9f5f49a5 100644 --- a/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch +++ b/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/cocoa/accelerators_cocoa.mm -index c7ef438a98109198d0b12f0e3ae3146588fe7547..54e6fcccffde04146cdcb15f9e82b4a7f8962efd 100644 +index 1667c1fa640089f88709ca919ca6475622b84383..5ab1db8c781dda9aaafcd3011c4366523029d7c8 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm -@@ -39,6 +39,8 @@ const struct AcceleratorMapping { +@@ -40,6 +40,8 @@ const struct AcceleratorMapping { ui::VKEY_N}, {IDC_NEW_TAB, ui::EF_COMMAND_DOWN, ui::VKEY_T}, {IDC_NEW_WINDOW, ui::EF_COMMAND_DOWN, ui::VKEY_N}, diff --git a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch index fb7a8e6308e1..2948d40db179 100644 --- a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch +++ b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/cocoa/main_menu_builder.mm -index 9659d68c224c83f8c258fa7b2a89cb627149eb1f..2e05ef22deeade7b57efc2240224531af7b3f307 100644 +index ceb7da90363cbf5b5cde7442fd7ae43f95ddf21b..3b7180e3cdfe810a40e7f8f7e76e2000b1ef017c 100644 --- a/chrome/browser/ui/cocoa/main_menu_builder.mm +++ b/chrome/browser/ui/cocoa/main_menu_builder.mm -@@ -104,6 +104,7 @@ base::scoped_nsobject BuildFileMenu( +@@ -106,6 +106,7 @@ base::scoped_nsobject BuildFileMenu( Item(IDS_NEW_INCOGNITO_WINDOW_MAC) .command_id(IDC_NEW_INCOGNITO_WINDOW) .remove_if(is_pwa), @@ -10,7 +10,7 @@ index 9659d68c224c83f8c258fa7b2a89cb627149eb1f..2e05ef22deeade7b57efc2240224531a Item(IDS_REOPEN_CLOSED_TABS_MAC) .command_id(IDC_RESTORE_TAB) .remove_if(is_pwa), -@@ -468,6 +469,7 @@ base::scoped_nsobject BuildHelpMenu( +@@ -473,6 +474,7 @@ base::scoped_nsobject BuildHelpMenu( #if BUILDFLAG(GOOGLE_CHROME_BRANDING) Item(IDS_FEEDBACK_MAC).command_id(IDC_FEEDBACK), #endif diff --git a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch index 70db84729f3c..0a9db663a0bd 100644 --- a/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_browser_creator_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index 87756b3052dab230e18d82386101d31b3c5178e1..94f446d6080e54c19ca4ebe966674955a717ea27 100644 +index b3ee8bf0344880efcfeee9e6b65216dd253ff1e6..2430a1f7aa75473508463f557a73bde5275532db 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -444,6 +444,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -447,6 +447,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); #endif // !defined(OS_CHROMEOS) diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index 4382a6a3c386..af2257bd2231 100644 --- a/patches/chrome-browser-ui-tab_helpers.cc.patch +++ b/patches/chrome-browser-ui-tab_helpers.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc -index 95f73b57ff8650b233d4f09790ee62f6db9d97c3..a62d1850ec3295dbf2e35461c6dbf157d8fbde2b 100644 +index 4fb7af3b12fb837a8b0c64cd6dddec4cc561eb22..b14cca336cb000a42c72bb268b1d1ba5f0f16920 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -472,4 +472,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -483,4 +483,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and // organized. diff --git a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch index 002ac9a20d88..65ef110bf205 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h -index bbce058e630d638ce6bb732bda439fef7c3b8f42..100027486c4cccfba0d9900068ab3db639098116 100644 +index 70e8a233c4b80d7f6c16e2a7828b90a6c6145528..c213bb8030896d8d7cb80d0ba63694d2fb7628c9 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -577,6 +577,7 @@ class TabStripModel : public TabGroupController { +@@ -579,6 +579,7 @@ class TabStripModel : public TabGroupController { // current tree of openers). bool ShouldResetOpenerOnActiveTabChange(content::WebContents* contents) const; diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index ffd36fe30e91..277d4dbf6135 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index f2815225febb0e97b2cd3a5ac019ca5c3c7cef87..4b7b5dbc4e4cdc4ee96ce7894bc249154592288a 100644 +index 5c81512d1538b526c5836e7d85a9f8aea34cba4b..1c2029df77176d55d2136a2c4912059a76e7b372 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -828,6 +828,7 @@ void BookmarkBarView::Layout() { +@@ -827,6 +827,7 @@ void BookmarkBarView::Layout() { x = next_x; } } diff --git a/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch b/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch index 88982394d2d4..7c890114584b 100644 --- a/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch +++ b/patches/chrome-browser-ui-views-extensions-extension_popup.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc -index 7201633f3fbbd584709d2775c50fc2b68734a06a..e5ddaf7e3f216b8bfd3858b44e64c67016bf875b 100644 +index fccee1c56910a5f0d93e239774924c91303ffdc2..8ee2bfd4e507370ac9254b4bebb430bc31fc1790 100644 --- a/chrome/browser/ui/views/extensions/extension_popup.cc +++ b/chrome/browser/ui/views/extensions/extension_popup.cc -@@ -68,7 +68,7 @@ gfx::Size ExtensionPopup::CalculatePreferredSize() const { +@@ -77,7 +77,7 @@ gfx::Size ExtensionPopup::CalculatePreferredSize() const { void ExtensionPopup::AddedToWidget() { BubbleDialogDelegateView::AddedToWidget(); 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 78577d15e867..712531d812cd 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 8289da805fe46573242a430f14b76e257500b1fb..3d211b91081a46d15a0eb6ade75a895771500269 100644 +index 8de3e4300f760a7c5a9c82a27939eb3217342e4c..6a8ab7da6a5a95c74fc33cbdb4aad8292ac21e63 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 -@@ -87,6 +87,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView( +@@ -117,6 +117,7 @@ PermissionPromptBubbleView::PermissionPromptBubbleView( for (permissions::PermissionRequest* request : visible_requests_) AddPermissionRequestLine(request); diff --git a/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch b/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch index 2d0fe6a52471..44001cf0325a 100644 --- a/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-browser_app_menu_button.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc -index 918580305b81f03571a46e4b4e30119239cc4c57..3c0234eb65600d0f264b0bba993290c8b4600c52 100644 +index 2afb7ccd34ac790f16c30d188796ae24af77427c..62e89de11d7bf99445b4ddd67ec08616fc9879ed 100644 --- a/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc +++ b/chrome/browser/ui/views/toolbar/browser_app_menu_button.cc @@ -11,6 +11,7 @@ diff --git a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch index 6f0fd4554798..c96b470a575c 100644 --- a/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-translate-translate_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc -index 402433a52145e2c6de72f2365860c80674a3643b..9b27ff35cc977334ecd4d84a1bdb1e4b9e3505ac 100644 +index 5b3767480871dee708eee1731be5358f64039a4b..201025b5d3a20cf41455bdca192af1e84d7b54f0 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc -@@ -175,7 +175,7 @@ views::Widget* TranslateBubbleView::ShowBubble( +@@ -176,7 +176,7 @@ views::Widget* TranslateBubbleView::ShowBubble( source_language, target_language)); std::unique_ptr model( new TranslateBubbleModelImpl(step, std::move(ui_delegate))); diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index c2c68a5d49ae..79b27e6215e0 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index 481d67a923fceae3eb4be5356ea189756e0b15af..0e2a5df31118064c89b1dfb21684bba75fadf925 100644 +index 36103b6f487ead53d487a2056a4a7be46b0c18e2..e0eec060e4af91e84864a9dd96a6bdf51af04db5 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -12,6 +12,7 @@ @@ -10,7 +10,7 @@ index 481d67a923fceae3eb4be5356ea189756e0b15af..0e2a5df31118064c89b1dfb21684bba7 #include "build/build_config.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/accessibility/accessibility_ui.h" -@@ -1089,7 +1090,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1084,7 +1085,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch index 1a90a3a15056..e009205b787d 100644 --- a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc -index 94b8e4d0ebefc130fe9eca0bd850d509eddcc689..c99b797e1801c9202e2162f97ac7c84d6cea2c0a 100644 +index 41c46b82e26ea5b42c6f7c7437a0cdc27d6f6562..70b29b7d93cdae18db35d8a6ddb3a3868a98107f 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc @@ -341,6 +341,8 @@ content::WebUIDataSource* CreateMdExtensionsSource(Profile* profile, diff --git a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch index 1262a01f607e..da1962738bef 100644 --- a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc -index 413bd276f132a879db7647008ab87a85702bffdf..25ba06e5563a5e306dcc2ad287750ba46d8274a6 100644 +index 4f7e554e9f4e766a9803bf3b09f44655a9bdf1a4..3b4b68e594cfdbfee91534fc80a90d030a3ed6cf 100644 --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc @@ -54,6 +54,7 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) { diff --git a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch index 420223a34e43..243df7049954 100644 --- a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/import_data_handler.cc b/chrome/browser/ui/webui/settings/import_data_handler.cc -index 1637dc014a75986cab0ec4abd327034f975a102b..1a53fdc6fb3850d502d43e62f5d3f2231950ada9 100644 +index aa57ad77c5308704a850521a59cff7d1eecf5064..235d1cb2766190df8588982efe295a47bd80c74b 100644 --- a/chrome/browser/ui/webui/settings/import_data_handler.cc +++ b/chrome/browser/ui/webui/settings/import_data_handler.cc @@ -126,6 +126,7 @@ void ImportDataHandler::HandleImportData(const base::ListValue* args) { diff --git a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch index 58b9cc2016fb..8453f6fcac66 100644 --- a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc -index 69e0de500fa796a39774607d3b5378f8141a2846..dc8cd5a73342ede683c39ea6d47b79cc5ea06f10 100644 +index e326ae815ea7fe2bd8b867868f1752b648c6c01f..1633aaa85878915e0468f44ef8b98d52d75b1dc0 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc @@ -855,7 +855,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync) { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index e5d8795b1a08..1533b5de4142 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index 4419c80e874b26a4e36ec6e07c6d54638062a831..1ade38d17b75870ed6fd70453d5cc8c1c9c6441c 100644 +index d9f3037dbda7cf2add6dd0ec3946d7ff9bcaaf0b..036e2a8ffd6cf2592cf03f740122e848497e4a4c 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2484,6 +2484,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2441,6 +2441,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index c434f929f507..c562b4569f02 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index 0b2ebbd8c1f33bccc3723157243c1cf6fc78c76b..17c90ea4d1b4a2c79ebda253e286fc5cd7d67039 100644 +index 0f5493f32679e17705f9b5d12346e83a36acfe01..da2913db54ad17d919844ab82b48987b578347f6 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc @@ -375,6 +375,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { diff --git a/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch b/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch index 2bc994c1cea3..1b4d882f0e00 100644 --- a/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch +++ b/patches/chrome-browser-web_applications-components-web_app_shortcut_mac.mm.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm -index 8bba0ceb4ced4a2874210f0fe8d4271163096c51..1dbcc3bf4b8b244d303581c70f5cadd019e96c2d 100644 +index 2fc0d6b3f182096aef2800fa493cc9cd71c354f7..f78073b1177d88592eb2ba63a56749a797e3f3d2 100644 --- a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm +++ b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm @@ -761,6 +761,7 @@ base::FilePath GetChromeAppsFolder() { diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index 21fc67499e20..ec5105e6ec53 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index afac5d9d5cc93ac563d093bf8dd3d3e122a27a29..5767e573193bea8fa502b3275d3fb4bd1bfa5103 100644 +index 4d104f4a9d4da9388c3ef4f7fbb618c00b4c0298..972cecd40c348e5e319e228daa4bd4ec12f7d298 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -61,6 +61,7 @@ source_set("channel_info") { @@ -10,7 +10,7 @@ index afac5d9d5cc93ac563d093bf8dd3d3e122a27a29..5767e573193bea8fa502b3275d3fb4bd public_deps = [ "//base", "//components/version_info", -@@ -147,6 +148,7 @@ static_library("common") { +@@ -143,6 +144,7 @@ static_library("common") { ] public_deps = [ @@ -18,7 +18,7 @@ index afac5d9d5cc93ac563d093bf8dd3d3e122a27a29..5767e573193bea8fa502b3275d3fb4bd ":available_offline_content_mojom", ":buildflags", ":channel_info", -@@ -544,6 +546,7 @@ static_library("non_code_constants") { +@@ -540,6 +542,7 @@ static_library("non_code_constants") { "//printing/buildflags", "//ui/base:buildflags", ] diff --git a/patches/chrome-installer-mac-BUILD.gn.patch b/patches/chrome-installer-mac-BUILD.gn.patch index 0b86759040a7..96d22a697255 100644 --- a/patches/chrome-installer-mac-BUILD.gn.patch +++ b/patches/chrome-installer-mac-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/mac/BUILD.gn b/chrome/installer/mac/BUILD.gn -index 2e1d52fd96771467f303936e042a8fda21fbe725..9af235bb7bd3fe460d14b4584f8be5d7fb3d34b8 100644 +index b3fc448575b68fbde67a57040896f88fb77cf54c..7be27ac9fd258c15f14d8805b1b3fee2134374af 100644 --- a/chrome/installer/mac/BUILD.gn +++ b/chrome/installer/mac/BUILD.gn -@@ -14,6 +14,7 @@ group("mac") { +@@ -18,6 +18,7 @@ group("mac") { } _packaging_dir = "$root_out_dir/$chrome_product_full_name Packaging" diff --git a/patches/chrome-installer-mini_installer-BUILD.gn.patch b/patches/chrome-installer-mini_installer-BUILD.gn.patch index 430caa162606..cd6d0d876357 100644 --- a/patches/chrome-installer-mini_installer-BUILD.gn.patch +++ b/patches/chrome-installer-mini_installer-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn -index 890f971dd2651a17e4c07bacd22950477c8e8405..5877960c9cadf45b5586920ff76557aa51e99ae9 100644 +index a75484da690fc22614e4a5615aec727b6d763fd5..11086c2d5c5339e12ca4a67a543f48a1c295e799 100644 --- a/chrome/installer/mini_installer/BUILD.gn +++ b/chrome/installer/mini_installer/BUILD.gn -@@ -12,6 +12,7 @@ import("//third_party/icu/config.gni") +@@ -13,6 +13,7 @@ import("//third_party/icu/config.gni") import("//tools/v8_context_snapshot/v8_context_snapshot.gni") import("//ui/base/ui_features.gni") import("//v8/gni/v8.gni") @@ -10,7 +10,7 @@ index 890f971dd2651a17e4c07bacd22950477c8e8405..5877960c9cadf45b5586920ff76557aa declare_args() { # The Chrome archive is compressed in official builds to reduce the size of -@@ -192,6 +193,9 @@ template("generate_mini_installer") { +@@ -194,6 +195,9 @@ template("generate_mini_installer") { "//third_party/icu:icudata", chrome_dll_target, ] diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 1275c2741c66..a78a02484b6b 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index 8921aee102cba12388edeb7f29ab1edf1b40115d..28fecdc2967bc0d377bcdea053264be3ace4bff1 100644 +index fb7fa9ff4ed24743bd57a5617167525ebcf03890..a7d64f6e41bee490f0f7410278b56edf4eb2f100 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -193,6 +193,7 @@ static_library("renderer") { +@@ -214,6 +214,7 @@ static_library("renderer") { "//v8", ] diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index 889d891f6b20..18560eb4c499 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index 8d6c5b93ec076efecd900883c9012ab0c9e79398..8e87a1647d3f13eb164b88c2231f1315a17dcd9b 100644 +index 7dbbe8742ca4f680ac99b5e286f7522e2b91dc14..64a0ac991d6a534c594b49d8f0beed529c12d985 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -479,7 +479,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -480,7 +480,7 @@ void ChromeContentRendererClient::RenderFrameCreated( ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = diff --git a/patches/chrome-renderer-chrome_content_renderer_client.h.patch b/patches/chrome-renderer-chrome_content_renderer_client.h.patch index 8f78e96bde85..14263d7fef92 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.h.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h -index ebc067f99c6f1dc036e687088dfff4bf50b05e4e..10e38f11d6fde74f7b3a5902585c190a2b243e4f 100644 +index b76ed96d41c174aaf225e35b72d03b9f870b3d70..6adea12808104134ac67275716b0c1e22b99238d 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h @@ -230,6 +230,7 @@ class ChromeContentRendererClient diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 1d67b277e011..0ea5e6c50077 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index fb795ad06ee72129d0acb713c2cc707b86c87184..c3b2e0d8dfc7890349add3fa8e8827df5eba4184 100644 +index 95fd449c6d532adf5231540ea4bd2be519ad6040..7512356b1e71f2a587aa764e7fb68eb2cb3153a5 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -866,6 +866,7 @@ if (!is_android) { +@@ -868,6 +868,7 @@ if (!is_android) { "//v8", ] diff --git a/patches/chrome-test-base-testing_profile.cc.patch b/patches/chrome-test-base-testing_profile.cc.patch index c8acd04eca38..9725112fc9f9 100644 --- a/patches/chrome-test-base-testing_profile.cc.patch +++ b/patches/chrome-test-base-testing_profile.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc -index d160f84e5e4a0a89e3aba47b9b75bff9fc418115..907d7c6f6805d7a699ef1d3d60730ab37b84751e 100644 +index 011c8898386fff3bc433759286fe94f3d53c4800..1f5b8e034a53edd29605e621f8755bbee0026020 100644 --- a/chrome/test/base/testing_profile.cc +++ b/chrome/test/base/testing_profile.cc -@@ -350,6 +350,7 @@ void TestingProfile::Init() { +@@ -354,6 +354,7 @@ void TestingProfile::Init() { EnsureBrowserContextKeyedServiceFactoriesBuilt(); #if BUILDFLAG(ENABLE_SUPERVISED_USERS) diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch index 47056ec91b2f..926fea018953 100644 --- a/patches/chrome-utility-BUILD.gn.patch +++ b/patches/chrome-utility-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn -index 1d6b82c8761cb0cc2dd4cb49f49c18f920e95fe0..41bbe8bb7c1872bf319ed769f839cc52a3f51c0f 100644 +index 77c61d9546adb6bff55723c3d193c54099f8af94..f3e264d73f753235a7594864327c22ad996ecd7d 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -28,6 +28,7 @@ static_library("utility") { diff --git a/patches/chrome-utility-services.cc.patch b/patches/chrome-utility-services.cc.patch index 13af62d4f8db..88b6d7b0dccb 100644 --- a/patches/chrome-utility-services.cc.patch +++ b/patches/chrome-utility-services.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/utility/services.cc b/chrome/utility/services.cc -index 9660f26b0af22ac72c2b2533449a073dd9588c6c..e4084402c62a9d643ec9df1cfa2446361ab675da 100644 +index 99be30f27435b19fb512f0fc68440545f97c5227..1774d17abb03741cbb5c9bd55bc9af1c78541bf9 100644 --- a/chrome/utility/services.cc +++ b/chrome/utility/services.cc -@@ -338,6 +338,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { +@@ -345,6 +345,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services) { services.Add(RunAssistantAudioDecoder); #endif #endif diff --git a/patches/components-bookmarks-browser-bookmark_model.h.patch b/patches/components-bookmarks-browser-bookmark_model.h.patch index bb3982c8977e..42c3e5454d5b 100644 --- a/patches/components-bookmarks-browser-bookmark_model.h.patch +++ b/patches/components-bookmarks-browser-bookmark_model.h.patch @@ -1,8 +1,8 @@ diff --git a/components/bookmarks/browser/bookmark_model.h b/components/bookmarks/browser/bookmark_model.h -index c1bb12707ee01e92a35442198e520d6c4ff0a316..b84741bffbe00aa538d7d581798ea76329f22c53 100644 +index 317ef338f58763cd53a344731236e2a2a5b8a375..a6d9f97e484b656581858932a43d7d3905c70336 100644 --- a/components/bookmarks/browser/bookmark_model.h +++ b/components/bookmarks/browser/bookmark_model.h -@@ -302,6 +302,7 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -304,6 +304,7 @@ class BookmarkModel : public BookmarkUndoProvider, return weak_factory_.GetWeakPtr(); } diff --git a/patches/components-component_updater-component_updater_service.h.patch b/patches/components-component_updater-component_updater_service.h.patch index d1c511966dfb..8623ed266069 100644 --- a/patches/components-component_updater-component_updater_service.h.patch +++ b/patches/components-component_updater-component_updater_service.h.patch @@ -1,5 +1,5 @@ diff --git a/components/component_updater/component_updater_service.h b/components/component_updater/component_updater_service.h -index a9f9307c804e9af0353c16ac37ff28f5bc9759e8..297e151497040d3f79d058107491f373a27b6ce0 100644 +index 5a5f0d32ea458a33e5588ef99e45c2409508a555..4c71a4e0422a213929fd6085e5e0230b70fbf064 100644 --- a/components/component_updater/component_updater_service.h +++ b/components/component_updater/component_updater_service.h @@ -162,6 +162,7 @@ class OnDemandUpdater { diff --git a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch index c6ad749d53ae..f99004a36062 100644 --- a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch +++ b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index ce7fb3005d4fbd377855b0cd060a4b66f2efa495..bf522128a13727e33b836262571688c63a97568c 100644 +index 5bf15c19254e1b63c85d8cd8cd01d8a71c0cd31d..ef97bd22f353a1bcd95db9f44618152a67a1962d 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc @@ -481,6 +481,7 @@ bool PageSpecificContentSettings::IsContentBlocked( diff --git a/patches/components-content_settings-core-browser-BUILD.gn.patch b/patches/components-content_settings-core-browser-BUILD.gn.patch index 7e76bc60c4cd..f1454de6a3b9 100644 --- a/patches/components-content_settings-core-browser-BUILD.gn.patch +++ b/patches/components-content_settings-core-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn -index 5ce9ad00c2c570c8d5c93cee2f3c9036749c4ebe..29deabeacaf6d7c8cb03d8c69ea85acb03b5b585 100644 +index 2ce3bb2ed29a1149d2495f1f12f33fb7805d30cb..8f50f601cafecf15692a63caa57ef1995b8255ae 100644 --- a/components/content_settings/core/browser/BUILD.gn +++ b/components/content_settings/core/browser/BUILD.gn -@@ -65,6 +65,7 @@ static_library("browser") { +@@ -64,6 +64,7 @@ static_library("browser") { "//services/preferences/public/cpp", "//url", ] diff --git a/patches/components-content_settings-core-browser-content_settings_pref_provider.h.patch b/patches/components-content_settings-core-browser-content_settings_pref_provider.h.patch index cbbcf8e948a9..30325c597328 100644 --- a/patches/components-content_settings-core-browser-content_settings_pref_provider.h.patch +++ b/patches/components-content_settings-core-browser-content_settings_pref_provider.h.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_pref_provider.h b/components/content_settings/core/browser/content_settings_pref_provider.h -index 4a9ce3a8eb9e5dcfe2b19a336b34f6cfdf68b8d8..97910be49844fc16bf758ff729d22ce2ee3df6af 100644 +index 7c16ebc5e335a73395eaba96166e5e351e4302da..222f3cc1d8591fca626362d3aad99b93f94c9e46 100644 --- a/components/content_settings/core/browser/content_settings_pref_provider.h +++ b/components/content_settings/core/browser/content_settings_pref_provider.h -@@ -67,6 +67,7 @@ class PrefProvider : public UserModifiableProvider { +@@ -64,6 +64,7 @@ class PrefProvider : public UserModifiableProvider { ContentSettingsPref* GetPref(ContentSettingsType type) const; private: diff --git a/patches/components-content_settings-core-browser-content_settings_utils.cc.patch b/patches/components-content_settings-core-browser-content_settings_utils.cc.patch index a8fa4cc8d7e1..70adbbc556cf 100644 --- a/patches/components-content_settings-core-browser-content_settings_utils.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_utils.cc.patch @@ -1,10 +1,10 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc -index a7a88cf7c4503fa6a2ae8881a2f7ebc5cb401d4d..a3b991193680ad07fbee955db8fcbadea30c8e56 100644 +index b462833a618434afb05e4bdbbf4163f7079e5adb..5f702e3c0472446dbf7dfda4290466553324020a 100644 --- a/components/content_settings/core/browser/content_settings_utils.cc +++ b/components/content_settings/core/browser/content_settings_utils.cc @@ -145,6 +145,7 @@ void GetRendererContentSettingRules(const HostContentSettingsMap* map, - ResourceIdentifier(), &(rules->script_rules)); - map->GetSettingsForOneType(ContentSettingsType::POPUPS, ResourceIdentifier(), + &(rules->script_rules)); + map->GetSettingsForOneType(ContentSettingsType::POPUPS, &(rules->popup_redirect_rules)); + BRAVE_GET_RENDER_CONTENT_SETTING_RULES } diff --git a/patches/components-content_settings-core-common-content_settings.cc.patch b/patches/components-content_settings-core-common-content_settings.cc.patch index 9086ec54ed30..a6b37091ef8d 100644 --- a/patches/components-content_settings-core-common-content_settings.cc.patch +++ b/patches/components-content_settings-core-common-content_settings.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc -index c6f6ff7ca3714e9f13f6694d446a34b9d8e65ea3..74b4f7b1bbcdf1573e1269cadebc0d5c61fd936c 100644 +index 4de6d5608a08863a7948111394758d692af0c0d5..ccfd01c0ecfb789b441d045ebf3fbe581278f087 100644 --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc @@ -179,6 +179,7 @@ bool RendererContentSettingRules::IsRendererContentSetting( diff --git a/patches/components-content_settings-core-common-content_settings.h.patch b/patches/components-content_settings-core-common-content_settings.h.patch index e978ddb598b4..a7b2178398d5 100644 --- a/patches/components-content_settings-core-common-content_settings.h.patch +++ b/patches/components-content_settings-core-common-content_settings.h.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/common/content_settings.h b/components/content_settings/core/common/content_settings.h -index 66254566b4860caeeb0f6bb209ca3b03ee8e30ff..bcef4b570894d9089b9b64a1534b0c7b27679149 100644 +index 5d2109d96d9ec6daf2a1dcd30c94d9431ee02254..febcb4fd9af7764254e94082e91a8448d906893f 100644 --- a/components/content_settings/core/common/content_settings.h +++ b/components/content_settings/core/common/content_settings.h -@@ -78,6 +78,7 @@ struct RendererContentSettingRules { +@@ -79,6 +79,7 @@ struct RendererContentSettingRules { ContentSettingsForOneType script_rules; ContentSettingsForOneType popup_redirect_rules; ContentSettingsForOneType mixed_content_rules; diff --git a/patches/components-feed-features.gni.patch b/patches/components-feed-features.gni.patch index bd27bc7aee23..15eea4a715d2 100644 --- a/patches/components-feed-features.gni.patch +++ b/patches/components-feed-features.gni.patch @@ -1,8 +1,8 @@ diff --git a/components/feed/features.gni b/components/feed/features.gni -index b5325898a2e5fbf74cf987a3cd5266c54334a35a..feea62505af710ea62e68f49f71a50d3fae16f70 100644 +index a6d7cc641b74c980003ba38a5d0bc5ea6a6ee284..a015729d2b3d8aa6ec6d434a53035f35549f0985 100644 --- a/components/feed/features.gni +++ b/components/feed/features.gni -@@ -25,5 +25,5 @@ declare_args() { +@@ -26,5 +26,5 @@ declare_args() { if (is_android && android_channel != "default") { # You probably don't want to build without either version in a Clank release. diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index cec0dec12814..7bb8e791cb55 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index 701a48d40a94269ccdb2a461604c5eddc36d22ba..80c63fdb6a9a309279f91795d69639718b2e3640 100644 +index 40ee7e58f1662ddd451b057a45ba3a309a826250..af0faa80885ce18931c91ba3e5d63f9d4f6e8106 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -259,6 +259,7 @@ static_library("browser") { +@@ -261,6 +261,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index b1dd8ccf069e..4789d302e2bd 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index 16a7ad1e5bb6ac4ac5e0336ebf719e3a1b847a95..bf522fd05adc418d1db5f0b54a9daeeb0ca51567 100644 +index afd567adb77b36ad4fde802174463856a689e72c..9cc59437254ef6b276aa40ba2a0b97817c68ded0 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc -@@ -371,6 +371,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, +@@ -374,6 +374,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, (*text == display_text_ || *text == url_for_editing_)) { *url_from_text = controller()->GetLocationBarModel()->GetURL(); *write_url = true; diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index 6aba9e94a01c..7e6f98725bbe 100644 --- a/patches/components-page_info-page_info.cc.patch +++ b/patches/components-page_info-page_info.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc -index 94c8320c48f4f167dce9ba4dd2d3da8b67a27042..131037ab519cfd597605ea32c48aa9ff12479496 100644 +index 3de10082bfaa65366a1a4a05af3fd42b63e27f50..bed8f85f57d47c0339760555a661f3953c06e86c 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -964,6 +964,7 @@ void PageInfo::PresentSitePermissions() { +@@ -966,6 +966,7 @@ void PageInfo::PresentSitePermissions() { } } diff --git a/patches/components-page_info-page_info_ui.cc.patch b/patches/components-page_info-page_info_ui.cc.patch index 30b58eb88357..489b254d8fd9 100644 --- a/patches/components-page_info-page_info_ui.cc.patch +++ b/patches/components-page_info-page_info_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_info_ui.cc -index 8af82087dbb790e78a905dd3888c1db79d15511d..c2ec077204d8d7a56e833b2360e35d8c29a17b6e 100644 +index a3c71cbd3012ecff8bcc88719c36ae13742394e3..79a63acd7b4b6084e1f26c65ed692cbdb2e1a4c8 100644 --- a/components/page_info/page_info_ui.cc +++ b/components/page_info/page_info_ui.cc -@@ -642,6 +642,7 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon( +@@ -657,6 +657,7 @@ const gfx::ImageSkia PageInfoUI::GetPermissionIcon( SkColor related_text_color) { const gfx::VectorIcon* icon = &gfx::kNoneIcon; switch (info.type) { diff --git a/patches/components-password_manager-core-browser-login_database.cc.patch b/patches/components-password_manager-core-browser-login_database.cc.patch index acc8513e966f..577c8d3e8eb8 100644 --- a/patches/components-password_manager-core-browser-login_database.cc.patch +++ b/patches/components-password_manager-core-browser-login_database.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc -index 84f1561c00b7983cef8f91345d9ab4366cdd8671..3b332ab3cda0bf6582fc9814194d02986d39a14c 100644 +index c8b258c0ca3de8a4277804c167def8174df03a7b..b59250f74f78a785e6f580f6a1fba55b6ac6d02b 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc -@@ -1978,6 +1978,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( +@@ -1977,6 +1977,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( EncryptionResult result = InitPasswordFormFromStatement( *statement, /*decrypt_and_fill_password_value=*/true, &primary_key, new_form.get()); diff --git a/patches/components-password_manager-core-browser-password_form_filling.cc.patch b/patches/components-password_manager-core-browser-password_form_filling.cc.patch index 9656a75ce709..d8f1ef2c0a04 100644 --- a/patches/components-password_manager-core-browser-password_form_filling.cc.patch +++ b/patches/components-password_manager-core-browser-password_form_filling.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/password_form_filling.cc b/components/password_manager/core/browser/password_form_filling.cc -index 7f6c5f760f5f7aa777da0689d91da4bd1416a0da..0d795a9d16eb5cd62d797bf5f39737c14a0dd917 100644 +index a3237754374bad111ac0dced25c9018718c8a2cb..56c303c4a72045c3e294166d8b3fdd09e7ca3bac 100644 --- a/components/password_manager/core/browser/password_form_filling.cc +++ b/components/password_manager/core/browser/password_form_filling.cc -@@ -202,6 +202,9 @@ LikelyFormFilling SendFillInformationToRenderer( +@@ -215,6 +215,9 @@ LikelyFormFilling SendFillInformationToRenderer( bool wait_for_username = wait_for_username_reason != WaitForUsernameReason::kDontWait; diff --git a/patches/components-permissions-permission_request.h.patch b/patches/components-permissions-permission_request.h.patch index ef7e39a121fb..ae44353bb7d7 100644 --- a/patches/components-permissions-permission_request.h.patch +++ b/patches/components-permissions-permission_request.h.patch @@ -1,12 +1,71 @@ diff --git a/components/permissions/permission_request.h b/components/permissions/permission_request.h -index 64358a516f01b2049e0228220ac19535ea5cab8b..c2a23a9d09d2855103ae866fe7e7f35e6ff10386 100644 +index a6fcca9147f97de0952d88931bc84c0c1cea77fa..a8b63bdf4266e7ea55c7815be4b71d43993b9c1b 100644 --- a/components/permissions/permission_request.h +++ b/components/permissions/permission_request.h -@@ -59,6 +59,7 @@ enum class PermissionRequestType { - PERMISSION_WINDOW_PLACEMENT = 25, - PERMISSION_FONT_ACCESS = 26, - PERMISSION_IDLE_DETECTION = 27, +@@ -19,6 +19,66 @@ struct VectorIcon; + + namespace permissions { + ++<<<<<<< ours ++======= ++// Used for UMA to record the types of permission prompts shown. ++// When updating, you also need to update: ++// 1) The PermissionRequestType enum in tools/metrics/histograms/enums.xml. ++// 2) The PermissionRequestTypes suffix list in ++// tools/metrics/histograms/histograms.xml. ++// 3) GetPermissionRequestString in ++// chrome/browser/permissions/permission_uma_util.cc. ++// ++// The usual rules of updating UMA values applies to this enum: ++// - don't remove values ++// - only ever add values at the end ++enum class PermissionRequestType { ++ UNKNOWN = 0, ++ MULTIPLE = 1, ++ // UNUSED_PERMISSION = 2, ++ QUOTA = 3, ++ DOWNLOAD = 4, ++ // MEDIA_STREAM = 5, ++ REGISTER_PROTOCOL_HANDLER = 6, ++ PERMISSION_GEOLOCATION = 7, ++ PERMISSION_MIDI_SYSEX = 8, ++ PERMISSION_NOTIFICATIONS = 9, ++ PERMISSION_PROTECTED_MEDIA_IDENTIFIER = 10, ++ // PERMISSION_PUSH_MESSAGING = 11, ++ PERMISSION_FLASH = 12, ++ PERMISSION_MEDIASTREAM_MIC = 13, ++ PERMISSION_MEDIASTREAM_CAMERA = 14, ++ PERMISSION_ACCESSIBILITY_EVENTS = 15, ++ // PERMISSION_CLIPBOARD_READ = 16, // Replaced by ++ // PERMISSION_CLIPBOARD_READ_WRITE in M81. ++ PERMISSION_SECURITY_KEY_ATTESTATION = 17, ++ PERMISSION_PAYMENT_HANDLER = 18, ++ PERMISSION_NFC = 19, ++ PERMISSION_CLIPBOARD_READ_WRITE = 20, ++ PERMISSION_VR = 21, ++ PERMISSION_AR = 22, ++ PERMISSION_STORAGE_ACCESS = 23, ++ PERMISSION_CAMERA_PAN_TILT_ZOOM = 24, ++ PERMISSION_WINDOW_PLACEMENT = 25, ++ PERMISSION_FONT_ACCESS = 26, ++ PERMISSION_IDLE_DETECTION = 27, + BRAVE_PERMISSION_REQUEST_TYPES - // NUM must be the last value in the enum. - NUM - }; ++ // NUM must be the last value in the enum. ++ NUM ++}; ++ ++// Used for UMA to record whether a gesture was associated with the request. For ++// simplicity not all request types track whether a gesture is associated with ++// it or not, for these types of requests metrics are not recorded. ++enum class PermissionRequestGestureType { ++ UNKNOWN, ++ GESTURE, ++ NO_GESTURE, ++ // NUM must be the last value in the enum. ++ NUM ++}; ++ ++>>>>>>> theirs + // Describes the interface a feature making permission requests should + // implement. A class of this type is registered with the permission request + // manager to receive updates about the result of the permissions request diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index b8af819130d5..2e511db73d00 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 1d64d3ccd60b7aa9e5b0cc6eb6bb37801846f133..7881c45ca26c9a05b0f569d34fb98678763f7cbf 100644 +index a2d9c47f7e91830e7b71627f89928b54ad6897da..a312b3cbf996631e8c721f21604bd8046e10665f 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc @@ -50,7 +50,7 @@ namespace { diff --git a/patches/components-search_engines-BUILD.gn.patch b/patches/components-search_engines-BUILD.gn.patch index 6e86c37234d4..ebcd79979186 100644 --- a/patches/components-search_engines-BUILD.gn.patch +++ b/patches/components-search_engines-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn -index eb66a2d945650a81c3a3248975fb9deda036e51e..f11f019049297b7dd777a27b3a5bd4cd6a692784 100644 +index d95854ac6098e7b8b721575900f44e549bab9fc3..b87a60a2a7e926009265cd94d197e540036c017a 100644 --- a/components/search_engines/BUILD.gn +++ b/components/search_engines/BUILD.gn -@@ -194,6 +194,7 @@ json_to_struct("prepopulated_engines") { +@@ -195,6 +195,7 @@ json_to_struct("prepopulated_engines") { schema_file = "prepopulated_engines_schema.json" namespace = "TemplateURLPrepopulateData" deps = [ ":search_engine_type" ] diff --git a/patches/components-sync-BUILD.gn.patch b/patches/components-sync-BUILD.gn.patch index 0d2700814310..9d4eb2eecff8 100644 --- a/patches/components-sync-BUILD.gn.patch +++ b/patches/components-sync-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/BUILD.gn b/components/sync/BUILD.gn -index c368f1cc5549dbfcf24230fc3858e0b066c35fa2..fb1ff87368b1738b16973ad4e91f3384d3cb310f 100644 +index e07af0706b0b02ed55bbfb1b42b2c3254eec0bbd..ebc7d9e827c2413cba9c96d2a81f5fc9f29f67e4 100644 --- a/components/sync/BUILD.gn +++ b/components/sync/BUILD.gn -@@ -274,6 +274,7 @@ static_library("rest_of_sync") { +@@ -273,6 +273,7 @@ static_library("rest_of_sync") { "nigori/pending_local_nigori_commit.cc", "nigori/pending_local_nigori_commit.h", ] diff --git a/patches/components-sync-driver-BUILD.gn.patch b/patches/components-sync-driver-BUILD.gn.patch index 83b357b12c68..66d28765e16d 100644 --- a/patches/components-sync-driver-BUILD.gn.patch +++ b/patches/components-sync-driver-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/driver/BUILD.gn b/components/sync/driver/BUILD.gn -index 4f8b54f717d114a16016308f52dba788818203ed..ae2e42997cdf1a192febe8c4bd497558ff1ae79c 100644 +index 584158fe8c69e383a8faa94a01f660e25d50fca5..d739d9e18eb9bdba5fa3265995f84868bc445fb8 100644 --- a/components/sync/driver/BUILD.gn +++ b/components/sync/driver/BUILD.gn -@@ -113,6 +113,7 @@ static_library("driver") { +@@ -112,6 +112,7 @@ static_library("driver") { } configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/patches/components-sync-driver-profile_sync_service.h.patch b/patches/components-sync-driver-profile_sync_service.h.patch index 06fd214dd74d..ca70665d49f9 100644 --- a/patches/components-sync-driver-profile_sync_service.h.patch +++ b/patches/components-sync-driver-profile_sync_service.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/driver/profile_sync_service.h b/components/sync/driver/profile_sync_service.h -index 6115b3a8b3353cd2fee3dd63493c2c570415f902..f443515149d5faf7f97a80c4c8e68dcdd57a9552 100644 +index 36f3d4bedc9e7ecbc2a350ab6c9c5dafa04de11b..127c3cc3e930a99d024d4bf952a9963bc46d06e6 100644 --- a/components/sync/driver/profile_sync_service.h +++ b/components/sync/driver/profile_sync_service.h -@@ -247,6 +247,7 @@ class ProfileSyncService : public SyncService, +@@ -253,6 +253,7 @@ class ProfileSyncService : public SyncService, static std::string GenerateCacheGUIDForTest(); diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index ba3135d81d67..a71ebc373129 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 6d462ff2097bc827bc3c6c5acb6b530fb299739f..d825b67c2a95f28f537bed4ad34e4d6bcaec7e66 100644 +index 707ae79b30c4d936977f2b89c17b6f6c2c4c1671..5960fc6bd298419921dec6f32496c0400c926021 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h -@@ -377,6 +377,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -378,6 +378,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT(manufacturer); VISIT(last_updated_timestamp); VISIT(feature_fields); @@ -10,7 +10,7 @@ index 6d462ff2097bc827bc3c6c5acb6b530fb299739f..d825b67c2a95f28f537bed4ad34e4d6b VISIT(sharing_fields); VISIT(invalidation_fields); } -@@ -384,7 +385,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -385,7 +386,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { VISIT(send_tab_to_self_receiving_enabled); } diff --git a/patches/components-sync-protocol-protocol_sources.gni.patch b/patches/components-sync-protocol-protocol_sources.gni.patch index 1dbcac24f4a0..a20ebe7b8e43 100644 --- a/patches/components-sync-protocol-protocol_sources.gni.patch +++ b/patches/components-sync-protocol-protocol_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/protocol_sources.gni b/components/sync/protocol/protocol_sources.gni -index 1db5c64365e3c31c594096e8c08863a86040f553..01e6b3a01232de7a2120c432df41811da769ac23 100644 +index 39de476ba9db51cb656a87520f279773b5518fb1..8a2ea37bf05b8594e5454d9837983e822dbac3df 100644 --- a/components/sync/protocol/protocol_sources.gni +++ b/components/sync/protocol/protocol_sources.gni -@@ -74,3 +74,4 @@ foreach(base, sync_protocol_bases) { +@@ -75,3 +75,4 @@ foreach(base, sync_protocol_bases) { sync_protocol_pyprotos += [ "$root_out_dir/pyproto/components/sync/protocol/${base}_pb2.py" ] } diff --git a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch index ce5d69d08b8d..ec0dd17d565b 100644 --- a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch +++ b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/sync_device_info/device_info_sync_bridge.cc b/components/sync_device_info/device_info_sync_bridge.cc -index 378c2895c6095940cf169183628eb38e6fad4f64..301c655b52ae73a2bafe2ab220b471b84d8349af 100644 +index be551b72676b6232ab73b2ae01199ad59c6a8a30..46fe5662666e3a83196c190bc2c18decd432dd5f 100644 --- a/components/sync_device_info/device_info_sync_bridge.cc +++ b/components/sync_device_info/device_info_sync_bridge.cc @@ -173,6 +173,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( diff --git a/patches/components-sync_device_info-device_info_sync_bridge_unittest.cc.patch b/patches/components-sync_device_info-device_info_sync_bridge_unittest.cc.patch index 92ec8d8d8b77..17ad84138686 100644 --- a/patches/components-sync_device_info-device_info_sync_bridge_unittest.cc.patch +++ b/patches/components-sync_device_info-device_info_sync_bridge_unittest.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/sync_device_info/device_info_sync_bridge_unittest.cc b/components/sync_device_info/device_info_sync_bridge_unittest.cc -index 9274b84a823f93930a6f2da8e07bc82d01dc61eb..7b4cd8f5d3768eba55b887a2f60f2c65e64638dd 100644 +index dca1bd7509ddb7ef28a08905d2ba39fb5e12e936..85adc5b67ce70b2ccc94d5544e3e04a79b281067 100644 --- a/components/sync_device_info/device_info_sync_bridge_unittest.cc +++ b/components/sync_device_info/device_info_sync_bridge_unittest.cc -@@ -827,7 +827,7 @@ TEST_F(DeviceInfoSyncBridgeTest, ApplySyncChangesWithLocalGuid) { +@@ -828,7 +828,7 @@ TEST_F(DeviceInfoSyncBridgeTest, ApplySyncChangesWithLocalGuid) { auto error_on_delete = bridge()->ApplySyncChanges( bridge()->CreateMetadataChangeList(), std::move(entity_change_list)); EXPECT_FALSE(error_on_delete); diff --git a/patches/components-variations-variations_seed_store.cc.patch b/patches/components-variations-variations_seed_store.cc.patch index cbbe96167bb0..bcdaf28c0eb0 100644 --- a/patches/components-variations-variations_seed_store.cc.patch +++ b/patches/components-variations-variations_seed_store.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/variations/variations_seed_store.cc b/components/variations/variations_seed_store.cc -index c3567148f8abfb40537d3ca834cb9b5164e3a664..57154461360609eacaac88e1f5511ad6881f886e 100644 +index 7b6ee96b13a31d55373f506d67eccb0ae2c8fbfa..0772d7d399bae55e4dac636542c8a04d55dbe9b4 100644 --- a/components/variations/variations_seed_store.cc +++ b/components/variations/variations_seed_store.cc @@ -35,6 +35,7 @@ namespace { diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 5a6178d6903c..e14d3d164ae6 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index f16c5bcbeb10445d331609a359e1fab841e653c8..fe151b9f39eb2131ff7b202bbb5c47a9fc6d5baa 100644 +index ba52e78d28d4198ca028ff678ef58c0121c665e9..315fc6a43b0a6f7375fee4b1e8a6c3c84cac3836 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -1822,6 +1822,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -1888,6 +1888,7 @@ void NavigationRequest::OnRequestRedirected( common_params_->url = redirect_info.new_url; common_params_->method = redirect_info.new_method; common_params_->referrer->url = GURL(redirect_info.new_referrer); @@ -10,7 +10,7 @@ index f16c5bcbeb10445d331609a359e1fab841e653c8..fe151b9f39eb2131ff7b202bbb5c47a9 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -2795,6 +2796,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -2866,6 +2867,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-browser-webui-web_ui_impl.cc.patch b/patches/content-browser-webui-web_ui_impl.cc.patch index 7b5c6997733e..abca81e15c3f 100644 --- a/patches/content-browser-webui-web_ui_impl.cc.patch +++ b/patches/content-browser-webui-web_ui_impl.cc.patch @@ -1,10 +1,10 @@ diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc -index a4f08bc2f83c6bce669cf1a6e694d98a1aac9a4e..e97c17130ffb3e691f53cab548ebdad47f71d445 100644 +index f4778bcdd287d51a163a73f371bb356125c6cff9..1f279a10a6402074f2c070be031be35ef6d9ff89 100644 --- a/content/browser/webui/web_ui_impl.cc +++ b/content/browser/webui/web_ui_impl.cc -@@ -89,6 +89,7 @@ WebUIImpl::WebUIImpl(WebContentsImpl* contents, RenderFrameHost* frame_host) +@@ -69,6 +69,7 @@ WebUIImpl::WebUIImpl(WebContentsImpl* contents, RenderFrameHost* frame_host) web_contents_(contents), - web_contents_observer_(new MainFrameNavigationObserver(this, contents)) { + web_contents_observer_(new WebUIMainFrameObserver(this, contents)) { DCHECK(contents); + BRAVE_WEB_UI_IMPL } diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index 408970e1730b..012f7b1b154d 100644 --- a/patches/content-common-BUILD.gn.patch +++ b/patches/content-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index c652c7e71d39384c4161e6eaa35792baf192107a..660480139fe39d228ffe2a0f46a7a69667d49d20 100644 +index b4fd171feb48b08defb8946f7f2fb87c78fca881..d4d2614fae09375fd7d35e61a8bf8d60238d8639 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -37,6 +37,7 @@ source_set("common") { diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index 1d9c0034bd78..31a5357deb79 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 ecb18e8130f2b2297f8b1b978791e552e36da8d5..57218551e1633f90df03f5d78802bae3a0851791 100644 +index ce69e43769b267ba0e96a7006fa4352639b49a1e..20843bac0b47ceff80c329207c5c9c49f034b559 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -1771,6 +1771,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1774,6 +1774,7 @@ class CONTENT_EXPORT ContentBrowserClient { virtual ui::AXMode GetAXModeForBrowserContext( BrowserContext* browser_context); diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index f5eb20db46d0..9c03b4bd7fdc 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 030e3aa7d4f85389c5a20ec874b473fd7d02cb03..e38197435cf7e4e87ddbc34fd43649f4ad8ebe95 100644 +index 1ad0de94d7f726cc158b65451f7bad537a48acaf..011565838c24cbcc04bd3fd3218222071d9bd57c 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4880,7 +4880,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4866,7 +4866,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (render_view_->GetWebView()->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index f364c2060374..70dec8674022 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 53b3182ae3151a451d9e0eb7a642c42e1e24e2fa..08bbc4d947e71f85be6fe08c49b7993945532144 100644 +index a4240c7c75a3fabc1472bd0cebc6b5a5f0eb3b24..bbe67a0120e6a12be6d4a7e1762e2e9c28918239 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -1001,6 +1001,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { +@@ -1009,6 +1009,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/extensions-browser-api-web_request-web_request_api.cc.patch b/patches/extensions-browser-api-web_request-web_request_api.cc.patch index 7a8112dac7b7..063a1ad911e4 100644 --- a/patches/extensions-browser-api-web_request-web_request_api.cc.patch +++ b/patches/extensions-browser-api-web_request-web_request_api.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc -index c258ed52d8d1cdf9c520ebe5e39cc6f93544df13..1db91a308b91d0d8014ce82e9eaccfd19c456522 100644 +index 360441ec9fa6e87c5d2ff177b29033c16cc084b7..e021791bfb34c747e7747f7e549465d8403d5afb 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc -@@ -1303,6 +1303,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( +@@ -1304,6 +1304,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( const net::AuthChallengeInfo& auth_info, AuthCallback callback, net::AuthCredentials* credentials) { diff --git a/patches/extensions-browser-sandboxed_unpacker.cc.patch b/patches/extensions-browser-sandboxed_unpacker.cc.patch index cb9773b452c9..8a63ca776be2 100644 --- a/patches/extensions-browser-sandboxed_unpacker.cc.patch +++ b/patches/extensions-browser-sandboxed_unpacker.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/sandboxed_unpacker.cc b/extensions/browser/sandboxed_unpacker.cc -index b2082d56c5c8baf4d6ece8b4524121eea0db3544..485e941c7a987eb243b19dc74d80af04fb16bca7 100644 +index b5f2f115328657b97d8f83aee0ec29a7f47c1a92..373ad61f234a04f4fab10e89c92d77f56cd2d94b 100644 --- a/extensions/browser/sandboxed_unpacker.cc +++ b/extensions/browser/sandboxed_unpacker.cc -@@ -915,6 +915,7 @@ base::Optional SandboxedUnpacker::RewriteManifestFile( +@@ -916,6 +916,7 @@ base::Optional SandboxedUnpacker::RewriteManifestFile( DCHECK(!public_key_.empty()); base::Value final_manifest = manifest.Clone(); final_manifest.SetStringKey(manifest_keys::kPublicKey, public_key_); diff --git a/patches/media-blink-key_system_config_selector.cc.patch b/patches/media-blink-key_system_config_selector.cc.patch index 4bdd5fffa227..809f8c121fd2 100644 --- a/patches/media-blink-key_system_config_selector.cc.patch +++ b/patches/media-blink-key_system_config_selector.cc.patch @@ -1,5 +1,5 @@ diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc -index 1ce1cbe5525f49082380ec7809c77a1d59d15112..f75222426c3fd4cd3430df976dd99933d232033e 100644 +index 07d9b12b8436cb034003853f9a82a1eec78e9aa4..e1779ec62eb80e50f6359b3b0fd83cff697960b7 100644 --- a/media/blink/key_system_config_selector.cc +++ b/media/blink/key_system_config_selector.cc @@ -908,6 +908,7 @@ void KeySystemConfigSelector::SelectConfig( diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index f37654b6906a..833ed475e13b 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index 63d21c03b9e2fa4d1df0bbd57a59ddd00a3487aa..553f1db0669c8ca1d0f297ccd558ce0986d1f875 100644 +index 47cd72a16e2e5653e878317527f92a8913d774ab..775df3a2ad509087371003655bbd00b55b3e27f9 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1175,6 +1175,7 @@ component("net") { +@@ -1173,6 +1173,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch index 14d418dbae81..8f0e042755a2 100644 --- a/patches/net-cookies-canonical_cookie.cc.patch +++ b/patches/net-cookies-canonical_cookie.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc -index de20c240617f16a9e60b9dbc965e78ad9842d107..20338ee5207bebd8632a3e865913155f320f25f8 100644 +index fc870719857d7f88f8f9559ac26cd47c67158f00..64c832a9336da42106172c82fa7875e7d0797d9a 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc -@@ -428,6 +428,7 @@ std::unique_ptr CanonicalCookie::Create( +@@ -433,6 +433,7 @@ std::unique_ptr CanonicalCookie::Create( ? CookieSourceScheme::kSecure : CookieSourceScheme::kNonSecure; diff --git a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch index da2d0cc62cab..03390e563847 100644 --- a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch +++ b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc -index 854f98786c287497d0aea7f640e42ffb8a8d5eac..0e0d1d54f3c991bf1e005ca2cbf439e6a2478c22 100644 +index c4ef89aa46b01da3f934bdc7851db56a4f7385fe..5de945be64a2f0628ed0d5fd6495842f888352a9 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc @@ -1020,6 +1020,7 @@ int ConfiguredProxyResolutionService::TryToCompleteSynchronously( diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index 8d9882f3b372..f96a3988f55f 100644 --- a/patches/services-network-public-cpp-BUILD.gn.patch +++ b/patches/services-network-public-cpp-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn -index eda97aeb9618d3f6e3fb0bc1967109c43b97c251..032fb6568c5042568bd1ccf417496c7652f4e3eb 100644 +index 1ba78613e28ebb6dcd7fd0baf34fa03bb85a2bfb..a3aa63a42cdf01a39ce9284129e12c99a94a599e 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn -@@ -149,6 +149,7 @@ component("cpp") { +@@ -151,6 +151,7 @@ component("cpp") { "//services/proxy_resolver/public/mojom", ] diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch index ec0b9773feb4..18c8ed528f90 100644 --- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index 65b05252161b271d28c0d4fc1c7b34617681163e..06f7676511274ed1ce53f254953c92eda93372ed 100644 +index 60700b63fc73c0b42377e304731562098df9700a..da7a18746ed4df8ce96ad6bd608a133049659487 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2218,6 +2218,7 @@ generated_interface_sources_in_modules = [ +@@ -2224,6 +2224,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_world_tracking_state.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_world_tracking_state.h", ] diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch index dba76f51b00b..6c77a1e459b7 100644 --- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni -index abe734d3d7b4ce04d91eb5d424fc4f406def5b26..bc2563a973bdbdb650df2cc249e297c6354396d2 100644 +index de4b5adab47398d78f5e2b60a0703a765e327fd2..bb2f8c95ef427191867317edea9d2e2f6ab5b889 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1019,6 +1019,7 @@ static_idl_files_in_modules = get_path_info( +@@ -1029,6 +1029,7 @@ static_idl_files_in_modules = get_path_info( "//third_party/blink/renderer/modules/xr/xr_world_tracking_state.idl", ], "abspath") diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index b84aa2a13598..48952a7011ea 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index 30d6d56e0cc5666604acb340ee3901e2f0bb9b85..6eda920fa71673e06369817fc61b4ea90215a4a9 100644 +index c5254a498bb7b1f770e0bf481aa036844d7f35e3..cb247e1164b120d42756ff23404416e3f5fd8ceb 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -171,6 +171,7 @@ component("core") { diff --git a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch index 8625cc9aa97b..c23f917bb3e0 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -index ca17f562601b8fd8bf0c7a06a1af131ddb921e9d..df419f33fc623d7193345c5b58dfe3c87a2c8423 100644 +index 02462b60d63e7c4ceaf2a1476e7564f1706321d8..255fa0ccfd0d491b16853742857b86d1c96709be 100644 --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc @@ -195,6 +195,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( 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 d88b766faf1d..9cc739a3e77d 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 d884ef69c08e7d15a11fd15950480844685d440b..e52553174a87223694534689e00a98dbe3279e85 100644 +index 81b09be88854849dbbc610ae83f226ea8bd4589f..11c4d5584c03856d0049f0a6e58e1babb012df1d 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 -@@ -938,6 +938,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -936,6 +936,7 @@ String HTMLCanvasElement::ToDataURLInternal( scoped_refptr image_bitmap = Snapshot(source_buffer); if (image_bitmap) { diff --git a/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch b/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch index b02e01d957cc..35cf390ccdb2 100644 --- a/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch +++ b/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc -index 40a387347f75beaab990267e3768416d96046aec..25d959471e65ad6e69bd5163229a1db850a26b5e 100644 +index 98169739f2dbaf1684eb5c00f80da83e56867e68..98989ce5f72223c0aed218b14486674e35755a6d 100644 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc @@ -63,6 +63,7 @@ bool ComputeLockPendingUserGestureRequired(const Document& document) { @@ -10,7 +10,7 @@ index 40a387347f75beaab990267e3768416d96046aec..25d959471e65ad6e69bd5163229a1db8 if (!document.GetSettings()) return Type::kNoUserGestureRequired; -@@ -309,6 +310,7 @@ void AutoplayPolicy::TryUnlockingUserGesture() { +@@ -310,6 +311,7 @@ void AutoplayPolicy::TryUnlockingUserGesture() { bool AutoplayPolicy::IsGestureNeededForPlayback() const { if (!IsLockedPendingUserGesture()) return false; diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 4b5ca0076d45..14ba48815cd3 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index 5ec5105955c7261f940835d62244e4e818797c98..5438cb50a28058b22c99d9bc35335dfa5dc7cc4e 100644 +index 5f15c060e2d16f04c53717f4e85e6e3cd4dedb9f..916fc2b1c9a46364456b447daf6768ca6b457a08 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -16,6 +16,7 @@ if (is_android) { @@ -10,7 +10,7 @@ index 5ec5105955c7261f940835d62244e4e818797c98..5438cb50a28058b22c99d9bc35335dfa config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -165,6 +166,7 @@ component("modules") { +@@ -166,6 +167,7 @@ component("modules") { "//third_party/blink/renderer/modules/xr", ] diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch index 83e02901aa33..944db3ebbb84 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -index 30b24fd21acb783223b00cc877b6264c8febab4e..032b1b74a25ae104590c653f2c5dd466e51bb83a 100644 +index c12b280843456c2c81df2bf598b5edb427c345cc..b39b8b82f8683f8ce044a5b3175590c37e677928 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -1602,6 +1602,7 @@ ImageData* BaseRenderingContext2D::createImageData( +@@ -1609,6 +1609,7 @@ ImageData* BaseRenderingContext2D::createImageData( } ImageData* BaseRenderingContext2D::getImageData( @@ -10,7 +10,7 @@ index 30b24fd21acb783223b00cc877b6264c8febab4e..032b1b74a25ae104590c653f2c5dd466 int sx, int sy, int sw, -@@ -1689,6 +1690,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -1696,6 +1697,7 @@ ImageData* BaseRenderingContext2D::getImageData( return nullptr; } diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch index a89f2739aaa3..946a37e8978f 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.h.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h -index e5d4945582a99db64a41244afaf87db027ec6f68..b833b8e9762030ba8ae4ea9cc1449b1f8425a3bd 100644 +index 8b6f4e694150e7bc517c31c3cefe84ac2b519fae..107dd4e4ba3ca8cb2947bf7690fe23000bae638f 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h -@@ -325,6 +325,7 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin, +@@ -326,6 +326,7 @@ class MODULES_EXPORT BaseRenderingContext2D : public GarbageCollectedMixin, const UsageCounters& GetUsage(); diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch index fe585f0e8250..2222b6a77947 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -index ff860fd07cb501ef8c23ff49b25bb804b97b8b15..6c324f6a097712028756a58f3922a70f347257c4 100644 +index 22d3464e6e55bfc87d2a2be4285e061d4b44ad3a..c1323146f00a04b24054ece31b5398799b5c82de 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.cc -@@ -910,6 +910,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -936,6 +936,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { if (!canvas()->GetDocument().GetFrame()) return MakeGarbageCollected(); diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch index 755d10d88a3f..553b2c23bf0c 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-canvas_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl -index 38f60a678e559adfd87e280616cd200afe27d78d..4349d06f6002e7483cad4c155b61667a65b54225 100644 +index 78e1c791ef2ee035275c0797401f033025283a08..4ade6b9121b5bf118167362caa20634bac2828de 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/canvas2d/canvas_rendering_context_2d.idl @@ -106,9 +106,13 @@ interface CanvasRenderingContext2D { diff --git a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch index e91c26857cf1..4fff26ba1a07 100644 --- a/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-offscreencanvas2d-offscreen_canvas_rendering_context_2d.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl -index 7f26d96e69a6e272f964cd1c5ba343b6d2af02bb..393090bf6d11d15a6a5e9da4ed6b3ceb7df2c052 100644 +index 78d97b46178a06c36e2e6416dcb77dbcaacd78d9..e567f8333a4124d2bbc3e5de983a2556300cd858 100644 --- a/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/offscreencanvas2d/offscreen_canvas_rendering_context_2d.idl @@ -65,10 +65,10 @@ diff --git a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch index 506c572cab1b..3640e022db95 100644 --- a/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch +++ b/patches/third_party-blink-renderer-modules-mediastream-media_devices.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc -index e0545d185bb494050ce34c11ebec3a245e77a171..dd4e6c9e1d93165e2bc104566f495178f968f2e5 100644 +index eff3e1a5a2d1340fc295ab5ee2c1c0b72c962922..23ee6dfd3872a510b42f8f0bcb36fa5196d66ae7 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc -@@ -374,6 +374,8 @@ void MediaDevices::DevicesEnumerated( +@@ -388,6 +388,8 @@ void MediaDevices::DevicesEnumerated( } } diff --git a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch index 33e9ec1b4ef1..8994e48672af 100644 --- a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch +++ b/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/modules_idl_files.gni b/third_party/blink/renderer/modules/modules_idl_files.gni -index 6f5d4f17a1b9913af172eae5c3e89c6fde587b17..9b29224c7bc0a479b0fa4d35d7e5653cda0581fc 100644 +index 99696b69b908d271353927b48dcbde9ebe3268c2..dd51253a8368dfc786e54efc3efafa43a8acfc97 100644 --- a/third_party/blink/renderer/modules/modules_idl_files.gni +++ b/third_party/blink/renderer/modules/modules_idl_files.gni -@@ -144,6 +144,7 @@ if (!is_android) { +@@ -145,6 +145,7 @@ if (!is_android) { "//third_party/blink/renderer/modules/serial/idls.gni", ] } diff --git a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch index d5ce72b8f3c8..c88fc69fd1e4 100644 --- a/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch +++ b/patches/third_party-blink-renderer-modules-webaudio-audio_buffer.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc -index e587ec83a4728a02eb01ce58339e2cfad5a0c24d..3334dd95d7eb033a2d2ec360f0a3bd18606b2882 100644 +index 4356676b777f4695138e849d2905d286c6a106a3..c45a3b0030124bad1de34107a7a5e578a2736002 100644 --- a/third_party/blink/renderer/modules/webaudio/audio_buffer.cc +++ b/third_party/blink/renderer/modules/webaudio/audio_buffer.cc @@ -189,6 +189,7 @@ AudioBuffer::AudioBuffer(AudioBus* bus) diff --git a/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch index ec8a00ae7436..88b52160c300 100644 --- a/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch +++ b/patches/third_party-blink-renderer-modules-webaudio-realtime_analyser.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc -index 325f61e14ac97a257280cda40aa93d3469643b6f..8c75cda668699a1e4fa806ae11fb3a19dc0410fd 100644 +index b11a828870692b31a029231499c1bf3df4f3ef42..c8801853042e3f90a6032d8aa2c08e4e137a00c4 100644 --- a/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc +++ b/third_party/blink/renderer/modules/webaudio/realtime_analyser.cc @@ -197,6 +197,7 @@ void RealtimeAnalyser::ConvertFloatToDb(DOMFloat32Array* destination_array) { diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch index 914ee48c41aa..b5bd373d47a7 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -index 9a90b7a7576a7cf3ff7ce28e89c517d6836722d5..b235807f4c3c2ad97eaecc6cab1a9f7629d65e6c 100644 +index acbe6a4a05c9f068a35c27ea7e140129863f74f4..05128cc2af2f45dfa94c6147a3037f1aa625d150 100644 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -@@ -5105,6 +5105,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, +@@ -5100,6 +5100,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -10,7 +10,7 @@ index 9a90b7a7576a7cf3ff7ce28e89c517d6836722d5..b235807f4c3c2ad97eaecc6cab1a9f76 switch (pname) { case GL_SHADING_LANGUAGE_VERSION: { return WebGLAny( -@@ -5646,6 +5647,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( +@@ -5641,6 +5642,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( if (isContextLost() || !ValidateGetFramebufferAttachmentParameterFunc( kFunctionName, target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -18,7 +18,7 @@ index 9a90b7a7576a7cf3ff7ce28e89c517d6836722d5..b235807f4c3c2ad97eaecc6cab1a9f76 WebGLFramebuffer* framebuffer_binding = GetFramebufferBinding(target); DCHECK(!framebuffer_binding || framebuffer_binding->Object()); -@@ -5858,6 +5860,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( +@@ -5853,6 +5855,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost() || !ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index 2aed84aa0fe1..19caac5eee33 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df289b36ee 100644 +index cdd0db020ef8f249ff83212c96782397c17de5b6..9191cd966773d0cfbda41a95d972bb7304c4a17a 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -2922,6 +2922,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -2913,6 +2913,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -2953,6 +2954,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -2944,6 +2945,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,15 +18,15 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -2983,6 +2985,7 @@ base::Optional>> +@@ -2974,6 +2976,7 @@ base::Optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return base::nullopt; + BRAVE_WEBGL_RENDERING_CONTEXT_BASE_NULLOPT HeapVector> shader_objects; - const GLenum kShaderType[] = {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER, -@@ -2999,6 +3002,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, + for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { +@@ -2988,6 +2991,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3032,6 +3036,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3021,6 +3025,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df switch (pname) { case GL_BUFFER_USAGE: { -@@ -3168,6 +3173,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3157,6 +3162,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -50,7 +50,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3561,6 +3567,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3550,6 +3556,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: @@ -58,7 +58,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3576,6 +3583,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3565,6 +3572,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: @@ -66,7 +66,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3664,6 +3672,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3653,6 +3661,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( ScriptState* script_state, WebGLProgram* program, GLenum pname) { @@ -74,7 +74,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3725,6 +3734,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3708,6 +3717,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3735,6 +3745,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3718,6 +3728,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3782,6 +3793,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3765,6 +3776,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( ScriptState* script_state, WebGLShader* shader, GLenum pname) { @@ -98,7 +98,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3813,6 +3825,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3796,6 +3808,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3843,6 +3856,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3826,6 +3839,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSample( -@@ -3855,6 +3869,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3838,6 +3852,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df return EnsureNotNull(shader->Source()); } -@@ -3862,6 +3877,7 @@ base::Optional> +@@ -3845,6 +3860,7 @@ base::Optional> WebGLRenderingContextBase::getSupportedExtensions() { if (isContextLost()) return base::nullopt; @@ -130,7 +130,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df Vector result; -@@ -3884,6 +3900,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3867,6 +3883,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3918,6 +3935,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3901,6 +3918,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -146,7 +146,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4198,6 +4216,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4160,6 +4178,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -154,7 +154,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4222,6 +4241,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4184,6 +4203,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -162,7 +162,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4299,6 +4319,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4261,6 +4281,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -170,7 +170,7 @@ index a9066848c5fccbfccd27d9de64bd4def60a24954..bb3941047df1f9b41516d899df2c42df GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4656,6 +4677,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4618,6 +4639,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index b0cc3ee2f3db..f1e9ebc1bdd5 100644 --- a/patches/tools-gritsettings-resource_ids.spec.patch +++ b/patches/tools-gritsettings-resource_ids.spec.patch @@ -1,5 +1,5 @@ diff --git a/tools/gritsettings/resource_ids.spec b/tools/gritsettings/resource_ids.spec -index 882b0a1ae8e40a8687e731354886490e0657b2a6..c45ab20caae822f1aa40ef4d45b406551c76b209 100644 +index cb06259b198c2b3a2017be1e6607e48db7862fed..7038e2a70e631950f7597ca754fa689fe08cd3f6 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -47,6 +47,9 @@ @@ -12,7 +12,7 @@ index 882b0a1ae8e40a8687e731354886490e0657b2a6..c45ab20caae822f1aa40ef4d45b40655 "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -383,6 +386,9 @@ +@@ -382,6 +385,9 @@ "META": {"align": 100}, "messages": [2700], }, 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 c99208043d43..9754d4af4213 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 f7b3d5e6609bdca8e5fcc549ffee251a9bd1132f..c5c3f8b6c4ca393b159e7300de1df6e32de1e377 100644 +index ad0e490b8094bd0533f9669807132ee8012e4b8a..5d4dfcde913b1c110135432f6205c455ff1e8546 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -13687,6 +13687,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -13745,6 +13745,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index e8754ded7cec..6e8d2744d99e 100644 --- a/patches/ui-base-BUILD.gn.patch +++ b/patches/ui-base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index 5fec18e02fc45d2ab7d63831d6cd8719101ac33c..74517d0cf11ee28049f3b890ffe7c49fb8f3be89 100644 +index df0db2e2e26acd83223d687f69b6b328f06ef6c2..dcf250e8779b7a6cb13688dd903d252bdb10de67 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn -@@ -448,6 +448,7 @@ component("base") { +@@ -449,6 +449,7 @@ component("base") { "//ui/strings", "//url", ] diff --git a/patches/ui-native_theme-native_theme_win.cc.patch b/patches/ui-native_theme-native_theme_win.cc.patch index 37db5cc82a88..83f2e9453b5a 100644 --- a/patches/ui-native_theme-native_theme_win.cc.patch +++ b/patches/ui-native_theme-native_theme_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc -index 76c20dc6936253303c317f1be7423dfdac829b1a..bbe0b257735a86b0206d7379855939291e766108 100644 +index c45c48d9de73004ed89651920247f65fa3035aac..f505c1aefb778136813576a17f5c4fe6a743dc47 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc @@ -1681,6 +1681,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { diff --git a/patches/ui-views-controls-button-md_text_button.h.patch b/patches/ui-views-controls-button-md_text_button.h.patch index 4adf2c613043..9ec11a615efd 100644 --- a/patches/ui-views-controls-button-md_text_button.h.patch +++ b/patches/ui-views-controls-button-md_text_button.h.patch @@ -1,8 +1,8 @@ diff --git a/ui/views/controls/button/md_text_button.h b/ui/views/controls/button/md_text_button.h -index 995a00a46addc114b9a5fd5f1b2fdedde9873410..f133565673a52a9ab0d508502bd620fb4912a377 100644 +index b0772c1c1e42aa2763610d3c8f01277d49c83a79..2b3330dcc75c43ee164d4346a97457aade40dd97 100644 --- a/ui/views/controls/button/md_text_button.h +++ b/ui/views/controls/button/md_text_button.h -@@ -60,11 +60,13 @@ class VIEWS_EXPORT MdTextButton : public LabelButton { +@@ -57,11 +57,13 @@ class VIEWS_EXPORT MdTextButton : public LabelButton { void OnBlur() override; private: From 4c931e3edf52fdd3cc030ccb50bbc5d68b7e0910 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 9 Dec 2020 19:56:13 +0100 Subject: [PATCH 02/66] Conflict-resolved patches from Chromium 88.0.4315.7 to Chromium 88.0.4324.11. --- patches/chrome-VERSION.patch | 6 +++--- ...-chrome-browser-ui-RootUiCoordinator.java.patch | 10 +++++----- ...-browser-extensions-extension_tab_util.cc.patch | 14 +++++++------- ...s-settings-privacy_page-privacy_page.html.patch | 6 +++--- ...hrome-browser-resources-settings-route.js.patch | 12 +----------- ...-settings-site_settings-site_details.html.patch | 8 ++++---- ...upgrade_detector-upgrade_detector_impl.cc.patch | 10 +++++----- ...mponents-infobars-core-infobar_delegate.h.patch | 8 ++++---- patches/components-strings-BUILD.gn.patch | 8 ++++---- ...browser-extension_event_histogram_value.h.patch | 6 +++--- 10 files changed, 39 insertions(+), 49 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 29de6df21bac..9d986f8210d7 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index af426b76bedc2ec8bc50af7d76e78dcaaea67550..5bb5d44b5747c886fb2cb497f62d14b050a04fa6 100644 +index 6e0dd6cb256d9f0efa22cbb8fc0a13213cb1c3f5..b5fb9679838d70b99d2cbda5bfe1318f6285c401 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=88 -MINOR=0 --BUILD=4315 --PATCH=7 +-BUILD=4324 +-PATCH=11 +MINOR=1 +BUILD=20 +PATCH=61 diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch index 17c8e9a3d528..5242d95af21b 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ui-RootUiCoordinator.java.patch @@ -1,11 +1,11 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -index c14b33ba342b6875d87c790e491939b3355919b4..9bf5df2aa6b318bcf1cf7e574bda781aaa269d74 100644 +index 9b7797aa2d34c0c07d6dba304f619d7e499590e2..5f1121281a285d29d1489bc1fdf3d2b1c9a2908c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java -@@ -566,7 +566,7 @@ public class RootUiCoordinator - mActivity.getLifecycleDispatcher(), mActivity.getModalDialogManager(), - () -> mToolbarManager.setUrlBarFocus(false, OmniboxFocusReason.UNFOCUS)); - mButtonDataProviders = Arrays.asList(mIdentityDiscController, shareButtonController); +@@ -601,7 +601,7 @@ public class RootUiCoordinator + mActivity.getModalDialogManager(), voiceSearchDelegate); + mButtonDataProviders = Arrays.asList( + mIdentityDiscController, shareButtonController, voiceToolbarButtonController); - mToolbarManager = new ToolbarManager(mActivity, mActivity.getBrowserControlsManager(), + mToolbarManager = new org.chromium.chrome.browser.toolbar.BraveToolbarManager(mActivity, mActivity.getBrowserControlsManager(), mActivity.getFullscreenManager(), toolbarContainer, diff --git a/patches/chrome-browser-extensions-extension_tab_util.cc.patch b/patches/chrome-browser-extensions-extension_tab_util.cc.patch index 377039f737a3..74101c53f01d 100644 --- a/patches/chrome-browser-extensions-extension_tab_util.cc.patch +++ b/patches/chrome-browser-extensions-extension_tab_util.cc.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc -index 4260e615cf9bc4bcc0fbabfc8a5fb5b236b8bd0f..99a3ebb76e9cdae8bde9b03d5dcb2aee19fb8b2f 100644 +index bfd8c85fbb1057ab8326fd48175c120468f44c02..ade81449e5173b5a00faf4067e8a3f98a2d9366c 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc -@@ -779,6 +779,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) { - GURL fixed_url = - url_formatter::FixupURL(url.possibly_invalid_spec(), std::string()); - if (!fixed_url.SchemeIs(content::kChromeUIScheme)) -+ if (!fixed_url.SchemeIs(content::kBraveUIScheme)) +@@ -784,6 +784,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) { + }; + + if (!url.SchemeIs(content::kChromeUIScheme)) ++ if (!url.SchemeIs(content::kBraveUIScheme)) return false; - base::StringPiece fixed_host = fixed_url.host_piece(); + return base::Contains(kill_hosts, url.host_piece()); 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 f0f529328977..f19b19ad2a44 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 3fec124468af55207ba36d15dd81c6ff81179c65..cc807af537103feb502a9864e56c8dce22ae0247 100644 +index 5db3d9b229ccf62f754c3671ab7eeabcfe7eede4..cc5d2ab84daf4f376753ae22ecbc2773909a1f30 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 @@ @@ -59,6 +59,6 @@ index 3fec124468af55207ba36d15dd81c6ff81179c65..cc807af537103feb502a9864e56c8dce + + + -