From c1461fbd8a095d099837414000c924e7d695ac81 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 10:41:35 +0200 Subject: [PATCH 001/205] Updated patches from Chromium 92.0.4515.159 to Chromium 93.0.4530.5. --- patches/base-BUILD.gn.patch | 4 +- ...ld-config-android-internal_rules.gni.patch | 4 +- patches/build-config-android-rules.gni.patch | 2 +- patches/chrome-BUILD.gn.patch | 24 +++++----- patches/chrome-android-BUILD.gn.patch | 14 +++--- ...rome-android-chrome_java_sources.gni.patch | 4 +- ...ome-android-java-AndroidManifest.xml.patch | 2 +- ...me-browser-ChromeTabbedActivity.java.patch | 6 +-- ...rome-browser-app-ChromeActivity.java.patch | 4 +- ...me-browser-ntp-NewTabPageLayout.java.patch | 4 +- ...ync-settings-ManageSyncSettings.java.patch | 4 +- ...-browser-toolbar-ToolbarManager.java.patch | 6 +-- patches/chrome-app-BUILD.gn.patch | 6 +-- patches/chrome-browser-BUILD.gn.patch | 6 +-- patches/chrome-browser-about_flags.cc.patch | 4 +- ...rowsing_data-browsing_data_bridge.cc.patch | 2 +- ...hrome-browser-browser_process_impl.h.patch | 2 +- ...wser-chrome_content_browser_client.h.patch | 4 +- .../chrome-browser-extensions-BUILD.gn.patch | 4 +- ...rowser-first_run-upgrade_util_win.cc.patch | 2 +- ...flags-android-chrome_feature_list.cc.patch | 6 +-- ...ser-global_keyboard_shortcuts_mac.mm.patch | 4 +- ...et-system_network_context_manager.cc.patch | 2 +- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 +-- ...resetter-brandcode_config_fetcher.cc.patch | 4 +- ...profiles-profile_avatar_icon_util.cc.patch | 6 +-- ...iles-profile_shortcut_manager_win.cc.patch | 4 +- ...rowser-resources-extensions-BUILD.gn.patch | 2 +- ...er-resources-extensions-item_list.js.patch | 8 ++-- ...wser-resources-extensions-manager.js.patch | 2 +- ...wser-resources-extensions-toolbar.js.patch | 2 +- ...-resources-history-history_item.html.patch | 2 +- ...tings-privacy_page-privacy_page.html.patch | 2 +- ...owser-resources-settings-settings.js.patch | 4 +- patches/chrome-browser-ui-BUILD.gn.patch | 4 +- ...rome-browser-ui-appmenu-AppMenu.java.patch | 4 +- ...rowser-ui-cocoa-main_menu_builder.mm.patch | 4 +- ...rtup-startup_browser_creator_impl.cc.patch | 2 +- ...r-ui-startup-startup_tab_provider.cc.patch | 2 +- ...me-browser-ui-tabs-tab_strip_model.h.patch | 4 +- ...chrome_location_bar_model_delegate.h.patch | 4 +- ...oolbar-recent_tabs_sub_menu_model.cc.patch | 4 +- ...toolbar-recent_tabs_sub_menu_model.h.patch | 2 +- ...cent_tabs_sub_menu_model_unittest.cc.patch | 4 +- ...views-bookmarks-bookmark_bar_view.cc.patch | 4 +- ...rowser-ui-views-frame-browser_view.h.patch | 4 +- ...cation_bar-icon_label_bubble_view.cc.patch | 4 +- ...i-views-profiles-profile_menu_view.h.patch | 2 +- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 4 +- .../chrome-browser-ui-webui-about_ui.cc.patch | 2 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...-ui-webui-settings-people_handler.cc.patch | 8 ++-- ...ttings_localized_strings_provider.cc.patch | 4 +- ...de_detector-upgrade_detector_impl.cc.patch | 2 +- patches/chrome-installer-gcapi-gcapi.cc.patch | 2 +- .../chrome-installer-util-shell_util.cc.patch | 2 +- patches/chrome-test-BUILD.gn.patch | 4 +- ...-test-views-accessibility_checker.cc.patch | 2 +- ...er-page_specific_content_settings.cc.patch | 6 +-- ...ore-browser-content_settings_pref.cc.patch | 2 +- ...re-browser-content_settings_utils.cc.patch | 2 +- ...ings-core-common-content_settings.cc.patch | 2 +- ...s-core-common-cookie_settings_base.h.patch | 4 +- ...nternal-common-download_item_impl.cc.patch | 4 +- .../components-omnibox-browser-BUILD.gn.patch | 4 +- ...x-browser-autocomplete_controller.cc.patch | 4 +- ...mnibox-browser-omnibox_edit_model.cc.patch | 4 +- ...onents-os_crypt-key_storage_linux.cc.patch | 2 +- .../components-page_info-page_info.cc.patch | 4 +- ...components-page_info-page_info_ui.cc.patch | 2 +- ...nager-core-browser-login_database.cc.patch | 4 +- patches/components-permissions-BUILD.gn.patch | 4 +- ...licy-tools-generate_policy_source.py.patch | 6 +-- patches/components-sync-driver-BUILD.gn.patch | 4 +- ...s-sync-driver-profile_sync_service.h.patch | 4 +- patches/components-sync-engine-BUILD.gn.patch | 4 +- ...nents-sync-protocol-proto_visitors.h.patch | 2 +- .../content-browser-browser_main_loop.h.patch | 4 +- ...r_host-navigation_controller_impl.cc.patch | 12 ++--- ...-renderer_host-navigation_request.cc.patch | 10 ++--- patches/content-common-user_agent.cc.patch | 4 +- ...lic-browser-content_browser_client.h.patch | 2 +- ...ontent-renderer-render_frame_impl.cc.patch | 4 +- ...ntent-renderer-render_thread_impl.cc.patch | 4 +- ...ons-browser-api-socket-tcp_socket.cc.patch | 2 +- ...r-api-web_request-web_request_api.cc.patch | 4 +- ...hrome-browser-prefs-browser_prefs.mm.patch | 4 +- ...-blink-key_system_config_selector.cc.patch | 4 +- ...o-public-tools-mojom-mojom_parser.py.patch | 2 +- patches/net-BUILD.gn.patch | 4 +- patches/net-dns-dns_transaction.cc.patch | 4 +- ...net-http-transport_security_state.cc.patch | 2 +- ...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 +- ...e-html-canvas-html_canvas_element.cc.patch | 2 +- ...re-html-canvas-html_canvas_element.h.patch | 4 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 4 +- ...anvas2d-base_rendering_context_2d.cc.patch | 6 +-- ...vas2d-canvas_rendering_context_2d.cc.patch | 4 +- ...modules-mediastream-media_devices.cc.patch | 4 +- ...nderer-modules-modules_idl_files.gni.patch | 4 +- ...ebgl-webgl_rendering_context_base.cc.patch | 44 +++++++++---------- ...tools-gritsettings-resource_ids.spec.patch | 4 +- patches/tools-licenses.py.patch | 2 +- ...rams_xml-histogram_suffixes_list.xml.patch | 4 +- patches/ui-base-BUILD.gn.patch | 4 +- .../ui-native_theme-native_theme_mac.mm.patch | 4 +- .../ui-native_theme-native_theme_win.cc.patch | 4 +- 109 files changed, 241 insertions(+), 241 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 1f3ae7ab0656..620f36f8139a 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 6f993be10f6921f999500becef77d22d5a1593d3..7f886e4ea534b156002ec3adf3c1eedfecc8e926 100644 +index fad1f1b0913556807affd2b24f34dfdea70ffc20..4d2693f7fef8da76b253fb4d017ea4c0032ba811 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4019,6 +4019,7 @@ if (is_android) { +@@ -3917,6 +3917,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-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index 667f1286e18c..a055c52c9dee 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 293c6d38ca7d2da991e321b400b65bf638cf811a..b936461b85ea4a18dc3c6430fa335cc3b3e5473d 100644 +index 5fd989b35e4618b13be4c2b2adb87ead62c6e6e7..eeb5075f44dca6bd8006dc3f334db9ee71410bb2 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -1947,6 +1947,7 @@ if (enable_java_templates) { +@@ -1949,6 +1949,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 c8a87b532c56..068b3151b0bb 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 b411f154af3bce93ec00d7deb12c8be9ea2f510b..59268075871a10a13169e34d633b49c804fb83b7 100644 +index c65ab979f7a43111e24799829a201da46ccf18ca..9aa137c0a532359bbc5f14f11f4b1c0590170990 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -476,6 +476,7 @@ if (enable_java_templates) { diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 5fc64fd1623a..79a88a8cdbf0 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index ec09d0836a976ff1c4c005a928e7feb51640a381..7e60fd7ea39dc9e6f37e95dc39ca0b7fc43a2327 100644 +index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b0386562ca9 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -170,6 +170,7 @@ if (!is_android && !is_mac) { +@@ -169,6 +169,7 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -10,7 +10,7 @@ index ec09d0836a976ff1c4c005a928e7feb51640a381..7e60fd7ea39dc9e6f37e95dc39ca0b7f deps += [ ":chrome_dll", -@@ -439,11 +440,12 @@ if (is_win) { +@@ -442,11 +443,12 @@ if (is_win) { args += [ "--keystone=0" ] } } @@ -24,7 +24,7 @@ index ec09d0836a976ff1c4c005a928e7feb51640a381..7e60fd7ea39dc9e6f37e95dc39ca0b7f extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -461,6 +463,7 @@ if (is_win) { +@@ -464,6 +466,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -32,7 +32,7 @@ index ec09d0836a976ff1c4c005a928e7feb51640a381..7e60fd7ea39dc9e6f37e95dc39ca0b7f if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -536,7 +539,7 @@ if (is_win) { +@@ -539,7 +542,7 @@ if (is_win) { args = [ "-b", @@ -41,7 +41,7 @@ index ec09d0836a976ff1c4c005a928e7feb51640a381..7e60fd7ea39dc9e6f37e95dc39ca0b7f "-v", chrome_version_full, "-g", -@@ -610,6 +613,7 @@ if (is_win) { +@@ -613,6 +616,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -49,7 +49,7 @@ index ec09d0836a976ff1c4c005a928e7feb51640a381..7e60fd7ea39dc9e6f37e95dc39ca0b7f } } -@@ -642,9 +646,11 @@ if (is_win) { +@@ -645,9 +649,11 @@ if (is_win) { "--scm=0", ] } @@ -61,7 +61,7 @@ index ec09d0836a976ff1c4c005a928e7feb51640a381..7e60fd7ea39dc9e6f37e95dc39ca0b7f if (is_chrome_branded) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -671,6 +677,7 @@ if (is_win) { +@@ -674,6 +680,7 @@ if (is_win) { info_plist_target = ":chrome_helper_plist" } @@ -69,7 +69,7 @@ index ec09d0836a976ff1c4c005a928e7feb51640a381..7e60fd7ea39dc9e6f37e95dc39ca0b7f extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -1146,6 +1153,7 @@ if (is_win) { +@@ -1149,6 +1156,7 @@ if (is_win) { if (is_chrome_branded) { bundle_deps += [ ":preinstalled_apps" ] } @@ -77,7 +77,7 @@ index ec09d0836a976ff1c4c005a928e7feb51640a381..7e60fd7ea39dc9e6f37e95dc39ca0b7f ldflags = [ "-compatibility_version", -@@ -1330,6 +1338,7 @@ if (is_win) { +@@ -1333,6 +1341,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -85,7 +85,7 @@ index ec09d0836a976ff1c4c005a928e7feb51640a381..7e60fd7ea39dc9e6f37e95dc39ca0b7f "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/app:shutdown_signal_handlers", -@@ -1432,12 +1441,13 @@ group("child_dependencies") { +@@ -1435,12 +1444,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -100,7 +100,7 @@ index ec09d0836a976ff1c4c005a928e7feb51640a381..7e60fd7ea39dc9e6f37e95dc39ca0b7f output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1491,6 +1501,7 @@ group("resources") { +@@ -1494,6 +1504,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 7e821f56f7fa..b97b3a3cef79 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 264c6a96f1a8e39a5d9ae7743537948c00ef7e47..545ec6f8c95a7d8388893064a08163624eeb04bc 100644 +index 93ac6234fd31a764c6e68cfc982fb63aaa68e955..6ce4b5f0cd6edb35016ac1a86666c5bdf8a886d4 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -244,6 +244,7 @@ android_resources("chrome_app_java_resources") { @@ -10,7 +10,7 @@ index 264c6a96f1a8e39a5d9ae7743537948c00ef7e47..545ec6f8c95a7d8388893064a0816362 } if (enable_vr) { -@@ -577,6 +578,7 @@ android_library("chrome_java") { +@@ -579,6 +580,7 @@ android_library("chrome_java") { deps += feed_deps deps += web_feed_deps @@ -18,7 +18,7 @@ index 264c6a96f1a8e39a5d9ae7743537948c00ef7e47..545ec6f8c95a7d8388893064a0816362 srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -607,6 +609,7 @@ android_library("chrome_java") { +@@ -609,6 +611,7 @@ android_library("chrome_java") { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -26,7 +26,7 @@ index 264c6a96f1a8e39a5d9ae7743537948c00ef7e47..545ec6f8c95a7d8388893064a0816362 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -726,6 +729,7 @@ java_group("chrome_all_java") { +@@ -728,6 +731,7 @@ java_group("chrome_all_java") { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -34,7 +34,7 @@ index 264c6a96f1a8e39a5d9ae7743537948c00ef7e47..545ec6f8c95a7d8388893064a0816362 } # This is a list of all base module jni headers. New features should add their -@@ -766,6 +770,7 @@ group("jni_headers") { +@@ -768,6 +772,7 @@ group("jni_headers") { "//components/ukm/android:jni_headers", "//components/webauthn/android:jni_headers", ] @@ -42,7 +42,7 @@ index 264c6a96f1a8e39a5d9ae7743537948c00ef7e47..545ec6f8c95a7d8388893064a0816362 } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2028,6 +2033,7 @@ if (current_toolchain == default_toolchain) { +@@ -2033,6 +2038,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -50,7 +50,7 @@ index 264c6a96f1a8e39a5d9ae7743537948c00ef7e47..545ec6f8c95a7d8388893064a0816362 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2420,6 +2426,7 @@ android_library("base_module_java") { +@@ -2426,6 +2432,7 @@ android_library("base_module_java") { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 32cdaa6ef08a..218cae638c1e 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 a834984480047eb96723b5805a370f84c9475bf2..42f3fe4c912a6b8e3d7d5622b792d6adf79c99a0 100644 +index 97a4f17fa8cd7d888b690a473f0e4178524dac62..b7a21df158b30c50d6586f72ff2c1a9d1f83ee63 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1407,3 +1407,4 @@ chrome_java_sources = [ +@@ -1400,3 +1400,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-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 21d356354463..a3794a49313f 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 538e955d96246db5718302649fc1e9ce15b52ccc..96b1df9eca7f86a48fe3b085980ec280bd945cca 100644 +index 9f21b4fbcd92d754324aa637c7991ed27f80fa08..5a0f003c4232238f0245ce7601ab9c618d4cb8cd 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -56,7 +56,9 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index c07b22c4d0ef..aa310bf8c6bc 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,10 +1,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index fc14d41c5c1a87d79ffb1cb65b21ed4c584ad457..b3b292962d5334c2ca8ed55b0d3e8f7cf41537b9 100644 +index b520750c6e3cf7b28a36ccdecb1debfe3bc67733..d57e224475f61e95bfe6218b54d415e309acd350 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2303,6 +2303,7 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -368,7 +368,7 @@ public abstract class ChromeActivity new ArrayList<>(); protected ChromeActivity() { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch index 7826f732bcda..92db18a1def1 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPageLayout.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -index 78e5b98aae6416eb28501ba3ddde1faa2c90ae5a..776fcabb3c05d510e7864e78f5728b3198c965ad 100644 +index 531d2931e21fc5dea43fb04ca63e72f41d94d16b..35e1185b79477c03cbd1e72e1a6d7a4df1607ea8 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPageLayout.java -@@ -245,6 +245,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer +@@ -253,6 +253,7 @@ public class NewTabPageLayout extends LinearLayout implements TileGroup.Observer /* observer = */ this, offlinePageBridge); int maxRows = 2; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch index 1d3ff3285020..54108b24a125 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -index 456770ed21d2d1f492218524709341c742496571..04c0192edd4b332e58c39caa619b0b04cf505cef 100644 +index 16bf72b806fedaf8f8ef99e2d37837f24a87f288..1854a7a2d33752d3ada8f5a535adf91747063eb4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java @@ -25,7 +25,7 @@ import androidx.appcompat.app.AppCompatActivity; @@ -11,7 +11,7 @@ index 456770ed21d2d1f492218524709341c742496571..04c0192edd4b332e58c39caa619b0b04 import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; -@@ -371,7 +371,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat +@@ -366,7 +366,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat IdentityServicesProvider.get() .getIdentityManager(Profile.getLastUsedRegularProfile()) .getPrimaryAccountInfo(ConsentLevel.SYNC)); 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 fb4e571434fb..edb69a707625 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 659cbfb5166c9db26af205559797adbefdda926e..6d6747e4d93fb3b42f8fcc5da1471254c10f76ac 100644 +index 61633ff533723fc64c2d510d1caa416c94a180ad..4d863d009ab4b94030aafdb6ea3f44a66bbee546 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 -@@ -492,13 +492,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -489,13 +489,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve boolean isCustomTab = toolbarLayout instanceof CustomTabToolbar; ThemeColorProvider menuButtonThemeColorProvider = isCustomTab ? mCustomTabThemeColorProvider : browsingModeThemeColorProvider; @@ -18,7 +18,7 @@ index 659cbfb5166c9db26af205559797adbefdda926e..6d6747e4d93fb3b42f8fcc5da1471254 appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mWindowAndroid, (focus, type) -> setUrlBarFocus(focus, type), -@@ -946,7 +946,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -923,7 +923,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled, boolean isTabGroupsAndroidContinuationEnabled) { // clang-format off diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index 86c14ae92274..650704fa8515 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 5bc230683589605cbcf52723e79cdf83b7db8a77..ba59861b4f9d1c08b7ced79ccc063e0a93a259b8 100644 +index ba75492c91e32506d359aa1f0d56d4cc35212402..4e783ba8533045dab1ed992b42b08bc21fc144a5 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn -@@ -78,6 +78,8 @@ grit("generated_resources") { +@@ -84,6 +84,8 @@ grit("generated_resources") { if (is_android) { outputs += android_generated_java_resources } @@ -11,7 +11,7 @@ index 5bc230683589605cbcf52723e79cdf83b7db8a77..ba59861b4f9d1c08b7ced79ccc063e0a } if (is_android) { -@@ -100,7 +102,7 @@ grit("google_chrome_strings") { +@@ -106,7 +108,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 1376ac0b3846..df70ab33d9d9 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index b9ccfc0cb1cda27a28f1700f5d033d8c7efa473b..e60554fea8bed4aa639c576845b9c18b55d32409 100644 +index b4acb5dd3862e8411bfb00a99168e69822be0d53..6feb47adc70873c7457e1ff5bb04bb4d6cdf0aea 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2484,6 +2484,7 @@ static_library("browser") { +@@ -2474,6 +2474,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } + import("//brave/browser/sources.gni") sources += brave_chrome_browser_sources deps += brave_chrome_browser_deps public_deps += brave_chrome_browser_public_deps defines += brave_chrome_browser_defines - + if (is_android) { sources += [ diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 7725009d68d4..598dad3e87aa 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index e047cf3275ccf0990c4a66d92f36edb20326a5f6..3bcc7eaab826fd36a8da43974ea9b2513d11470f 100644 +index 0bef22b4326fcf5a31e521017959764f191cd6a8..0a0a515206a50f5f4486a12396c1a111e2475fe7 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -309,14 +309,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { @@ -21,7 +21,7 @@ index e047cf3275ccf0990c4a66d92f36edb20326a5f6..3bcc7eaab826fd36a8da43974ea9b251 const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -7373,6 +7373,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7217,6 +7217,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-android-browsing_data-browsing_data_bridge.cc.patch b/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch index bfa404ef9943..10bf1b6d54c7 100644 --- a/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch +++ b/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc -index 89e6bed42cb0fe63e0fb39b3c207bbb61e7ff75b..24d8d9098b40546c21471b2d5ec9f8c1c967cae1 100644 +index 51357a0433ca95f709d51611d20e3bf2f408cf8e..c6c8725704761d89fe6da34568f7742968923c1d 100644 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc @@ -126,6 +126,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData( diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index 9125077037a8..72e7a1b82812 100644 --- a/patches/chrome-browser-browser_process_impl.h.patch +++ b/patches/chrome-browser-browser_process_impl.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h -index b4ceefbccd083c608dcc5543c186cd884c44a75f..a9e94670547bc8fbc5ac24be312b14e442d8c581 100644 +index 0ee317e90a2c7c92d74168b08f6cf4e9b5e6efcc..cc98c8b00eb19dbe2158dec98f44c61eb321e4e8 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h @@ -205,6 +205,7 @@ class BrowserProcessImpl : public BrowserProcess, diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index 10cd0699c33d..edabb8f9ca2d 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 758a9e09992d03b94e5273b8922220f439e53709..12592afc95983be35730816da2a977ac84fc6255 100644 +index b0d91a2678334921425ea526000dafa7c4fffd11..a4d50acccf8091ed9f7a79ebf6ed6ec7a64ad984 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -750,6 +750,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -747,6 +747,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index d7b8e66d7556..7155b1d9782c 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 370ea00c87c0b1864ff2b5c853c89d1b4199bbc8..f5311976910b70960a17a0d012091e9c7844a94a 100644 +index 0582dce1cf7d97cec4026c3e5005fc0248bac22c..2ed0c6ea19478161a744f0a28eb25cbe6a64184f 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1297,6 +1297,7 @@ static_library("extensions") { +@@ -1310,6 +1310,7 @@ static_library("extensions") { } else { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } diff --git a/patches/chrome-browser-first_run-upgrade_util_win.cc.patch b/patches/chrome-browser-first_run-upgrade_util_win.cc.patch index 8f71c0aa746a..1ecebd87486f 100644 --- a/patches/chrome-browser-first_run-upgrade_util_win.cc.patch +++ b/patches/chrome-browser-first_run-upgrade_util_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc -index 97cd4d1365eda7480c07c3b52c339515ca3acb40..3394103ade301445a5996f7cde7d97801a0258dd 100644 +index 4dc3f28cf30aa36ebb014fda8a4d48815cfa5c12..fb4e7d8a192f8b93a67c1b67f6504a850911ff0d 100644 --- a/chrome/browser/first_run/upgrade_util_win.cc +++ b/chrome/browser/first_run/upgrade_util_win.cc @@ -41,7 +41,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 0b74061ffc35..f6588a08a1ae 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index 9c57a64442999adcb2b36ec55855232c0f1e0d94..78001fe842bdb8eaf9c66b00249a36e0b67a039e 100644 +index 762e84bd405cacba08df2ebf724cd73d86035675..5cb274d7a2237f7661feaad16e0b06d4cf9ac12a 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -326,6 +326,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -320,6 +320,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { }; - + const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { + BRAVE_FIND_FEATURE_EXPOSED_TO_JAVA for (const auto* feature : kFeaturesExposedToJava) { diff --git a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch index fd9b54018e21..57dae7d4595a 100644 --- a/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch +++ b/patches/chrome-browser-global_keyboard_shortcuts_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/global_keyboard_shortcuts_mac.mm b/chrome/browser/global_keyboard_shortcuts_mac.mm -index 8945a21f55ddb4a793043633db7eefd614adfa56..d8c40f2b13747c99136b40ce9990ce804a00796b 100644 +index 13870261ecfe20c0f346be6b17faf88a254b5130..bc0e38992378ece71ff55c4c672fbf56449c53b5 100644 --- a/chrome/browser/global_keyboard_shortcuts_mac.mm +++ b/chrome/browser/global_keyboard_shortcuts_mac.mm -@@ -172,6 +172,7 @@ const std::vector& GetShortcutsNotPresentInMainMenu() { +@@ -171,6 +171,7 @@ const std::vector& GetShortcutsNotPresentInMainMenu() { {true, false, false, true, kVK_DownArrow, IDC_FOCUS_NEXT_PANE}, {true, false, false, true, kVK_UpArrow, IDC_FOCUS_PREVIOUS_PANE}, 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 078759a4ae0e..6ccfd36b70f5 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index ef9b742df0c07dc0100bf00b718a2a20dcbd3860..78fbbab3b0b8a32e6cedae786e19e9696443506a 100644 +index 9188fe30570113da715f4f8a9bba73216d67855f..e1f048d7523faf4e6b192a0a9f821898704599fb 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc @@ -224,7 +224,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index aaa55a6f8c70..61dbd73eab32 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 6a1866ce6d6b9983781cb49b51540ecb834b71d8..d60101cc4afb7668fea565a58bc8c7b08ebd9ff5 100644 +index e69c5fd1c25e5159532bcf4dd862771d7a646bfb..2086e442fc52ada6f2452c94a77cf4467799331e 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -927,6 +927,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -933,6 +933,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 6a1866ce6d6b9983781cb49b51540ecb834b71d8..d60101cc4afb7668fea565a58bc8c7b0 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1219,6 +1220,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1224,6 +1225,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-profile_resetter-brandcode_config_fetcher.cc.patch b/patches/chrome-browser-profile_resetter-brandcode_config_fetcher.cc.patch index b03b2840978a..cf5b30b09a55 100644 --- a/patches/chrome-browser-profile_resetter-brandcode_config_fetcher.cc.patch +++ b/patches/chrome-browser-profile_resetter-brandcode_config_fetcher.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc -index 9fc57181497917f6c5ce5a559f08d65cc7e6e55a..c8731b421332986a45944de1c8fffe2edc8a54ef 100644 +index e796db904dff91244acaecaed904b88c083fd136..5f10a5779a1195cf4b61f14e8011e161251d6aa3 100644 --- a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc +++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc -@@ -57,6 +57,8 @@ BrandcodeConfigFetcher::BrandcodeConfigFetcher( +@@ -56,6 +56,8 @@ BrandcodeConfigFetcher::BrandcodeConfigFetcher( const GURL& url, const std::string& brandcode) : fetch_callback_(std::move(callback)), weak_ptr_factory_(this) { 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 04463fae5b0c..d1ccf919f7f9 100644 --- a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch +++ b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc -index a9ddd43a1f9bb8b291251772251eee64e2c52af6..3eee13296f043c45e15c32e542d4de0b3be85dce 100644 +index 4c341c734d5111a5ddf35b9a967352d273b6214f..6edac57248ef73d14f945dda0c3618776e4e3449 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc @@ -345,7 +345,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; @@ -11,7 +11,7 @@ index a9ddd43a1f9bb8b291251772251eee64e2c52af6..3eee13296f043c45e15c32e542d4de0b #endif #if !defined(OS_ANDROID) -@@ -478,6 +478,7 @@ size_t GetPlaceholderAvatarIndex() { +@@ -458,6 +458,7 @@ size_t GetPlaceholderAvatarIndex() { size_t GetModernAvatarIconStartIndex() { #if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_ANDROID) @@ -19,7 +19,7 @@ index a9ddd43a1f9bb8b291251772251eee64e2c52af6..3eee13296f043c45e15c32e542d4de0b return GetPlaceholderAvatarIndex() + 1; #else // Only use the placeholder avatar on ChromeOS and Android. -@@ -511,6 +512,7 @@ std::string GetPlaceholderAvatarIconUrl() { +@@ -491,6 +492,7 @@ std::string GetPlaceholderAvatarIconUrl() { const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) { CHECK_LT(index, kDefaultAvatarIconsCount); diff --git a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch index d129ffe68963..8c5ffa0b8588 100644 --- a/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch +++ b/patches/chrome-browser-profiles-profile_shortcut_manager_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc -index df96472db33d00beae7ab7efd2bd676cf4b05291..1bb17bb37668a1360145a3d1411fe615257ce152 100644 +index 3d9fdea931f2c5f7e9a520e38e1ffa8a0e525edb..00896f4ec7b9f2c7926d113549a164a8032928fa 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc -@@ -743,7 +743,7 @@ bool ProfileShortcutManager::IsFeatureEnabled() { +@@ -742,7 +742,7 @@ bool ProfileShortcutManager::IsFeatureEnabled() { // static std::unique_ptr ProfileShortcutManager::Create( ProfileManager* manager) { diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch index 48dd87aa2791..3d719e4a4e33 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 7cd29898576691edd42f05fbd40b53d7fc1a056a..a8d3a214868586511708b1dc366036553b7f78aa 100644 +index d4cbf4e99d6f7770fb36c5669e0c80dbb1bd1740..6f1999325ac761ad40658c40bd78c09d986ba38d 100644 --- a/chrome/browser/resources/extensions/BUILD.gn +++ b/chrome/browser/resources/extensions/BUILD.gn @@ -34,6 +34,7 @@ if (optimize_webui) { diff --git a/patches/chrome-browser-resources-extensions-item_list.js.patch b/patches/chrome-browser-resources-extensions-item_list.js.patch index 3e8bc82b5632..8954a6a1861a 100644 --- a/patches/chrome-browser-resources-extensions-item_list.js.patch +++ b/patches/chrome-browser-resources-extensions-item_list.js.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/resources/extensions/item_list.js b/chrome/browser/resources/extensions/item_list.js -index 3573343a16388c40dfb0732fa7a15c27dfe58fb4..2363987ca097fa4380891e06252a56f18776aba0 100644 +index 7e990d486b94c9ffb1c2c08f55c0e14245e70370..d17f521761d5df71f9d671999a142825c48f94a8 100644 --- a/chrome/browser/resources/extensions/item_list.js +++ b/chrome/browser/resources/extensions/item_list.js @@ -13,6 +13,7 @@ import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-annou - import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; + import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {ItemDelegate} from './item.js'; +import './brave_item_list_more_items.js' - Polymer({ - is: 'extensions-item-list', + /** + * @constructor diff --git a/patches/chrome-browser-resources-extensions-manager.js.patch b/patches/chrome-browser-resources-extensions-manager.js.patch index f61e8d480f43..11ae12be97aa 100644 --- a/patches/chrome-browser-resources-extensions-manager.js.patch +++ b/patches/chrome-browser-resources-extensions-manager.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/manager.js b/chrome/browser/resources/extensions/manager.js -index fa2a492ab9cce4f22a64ef0a0b261b5fdeb7031e..76745b25ea760d77b41cbc80597e1c2c8ddf5244 100644 +index 3ef910e4fda823c05236ae2e807be178874d32c3..45ef27ff9aa429711a06f11fedc6fbadf36b494c 100644 --- a/chrome/browser/resources/extensions/manager.js +++ b/chrome/browser/resources/extensions/manager.js @@ -5,7 +5,6 @@ diff --git a/patches/chrome-browser-resources-extensions-toolbar.js.patch b/patches/chrome-browser-resources-extensions-toolbar.js.patch index 6a5c514b9bd5..7f6c7c6a5e82 100644 --- a/patches/chrome-browser-resources-extensions-toolbar.js.patch +++ b/patches/chrome-browser-resources-extensions-toolbar.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/toolbar.js b/chrome/browser/resources/extensions/toolbar.js -index e94afd0280a7fe1fc33e36109a707d2791ebfa58..c56ef089788e2ad05df46a72182220bb05b284e8 100644 +index 182a0927cb15c0c0575fe5dd43850b5b4674895f..bc01b71335b8bd50cc35fcc78302c446abf796b4 100644 --- a/chrome/browser/resources/extensions/toolbar.js +++ b/chrome/browser/resources/extensions/toolbar.js @@ -4,7 +4,7 @@ diff --git a/patches/chrome-browser-resources-history-history_item.html.patch b/patches/chrome-browser-resources-history-history_item.html.patch index 33e9d6568b39..1f8b50f3aaf8 100644 --- a/patches/chrome-browser-resources-history-history_item.html.patch +++ b/patches/chrome-browser-resources-history-history_item.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/history/history_item.html b/chrome/browser/resources/history/history_item.html -index 3f93cc2c17ea31016bb580ee3bceed3ad92c3bf8..5a65b819d3a6579a40c7e7f20eb2116508d577b5 100644 +index ff9a505a2840ae1029f910e1f7dd080e124e99ae..034d5088670f96f361091e1adc8f8dce69d42efe 100644 --- a/chrome/browser/resources/history/history_item.html +++ b/chrome/browser/resources/history/history_item.html @@ -1,4 +1,4 @@ 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 0f7d60ec8642..3ea665fb73f0 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 c9354b6fbce942aa0da316c939e5862f5c757319..4f3830d400e50ca972cf5f3e6aaaac2ddf8fc7b0 100644 +index 58796d8f4f0bd414dd265c66fdd3b20ad586bde0..50256eb76f0d25dc0ff0f58f18c299e77495297f 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -29,6 +29,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings.js.patch b/patches/chrome-browser-resources-settings-settings.js.patch index 50cd48a62f8f..eddb8589d346 100644 --- a/patches/chrome-browser-resources-settings-settings.js.patch +++ b/patches/chrome-browser-resources-settings-settings.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.js b/chrome/browser/resources/settings/settings.js -index 2c1b24970acaa2e8280744fcb72434119ac22c15..724867b34a92211b42cef2de7a03773011807597 100644 +index 58ae84de125800cf9c81d6aec2d7e77e4ef8a015..16f10da122c4d8944b604b3e24394fc08e301a42 100644 --- a/chrome/browser/resources/settings/settings.js +++ b/chrome/browser/resources/settings/settings.js @@ -2,6 +2,7 @@ @@ -9,4 +9,4 @@ index 2c1b24970acaa2e8280744fcb72434119ac22c15..724867b34a92211b42cef2de7a037730 +import './brave_overrides/index.js'; import './settings_ui/settings_ui.js'; - export {CrToolbarElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; + export {CrLinkRowElement} from 'chrome://resources/cr_elements/cr_link_row/cr_link_row.js'; diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 97738aed47d3..43b383166bb9 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 71810d671161b2ec457575e020f7357cb5af828f..9cf88f17ccd04ef9d0f98e1f882d38c9c44538f8 100644 +index e5f42e0b9d71f83dc0aaf524ce032b2f5240a0bb..ce0cfc9ea2768ceea51d5e1748097c536cfb27df 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -601,6 +601,7 @@ static_library("ui") { @@ -10,7 +10,7 @@ index 71810d671161b2ec457575e020f7357cb5af828f..9cf88f17ccd04ef9d0f98e1f882d38c9 # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -3406,10 +3407,13 @@ static_library("ui") { +@@ -3407,10 +3408,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 56ebfab466c9..99f5201f9062 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 466acaffe7fa5804c0c714d8a477584d2e0bfb4f..a2243d41248e59f6d11e66bc38cc345f654a5f0d 100644 +index 376435fd2937d24dbfa17cf6cd4cdaa4924f1791..eea23beefad3f5d2086013c670ca9b6147b78c7a 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 -@@ -216,6 +216,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -220,6 +220,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler mPopup.setOutsideTouchable(true); if (!isByPermanentButton) mPopup.setAnimationStyle(R.style.OverflowMenuAnim); 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 14c9539469a8..a173d2849226 100644 --- a/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch +++ b/patches/chrome-browser-ui-cocoa-main_menu_builder.mm.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/cocoa/main_menu_builder.mm b/chrome/browser/ui/cocoa/main_menu_builder.mm -index 87d359df2e143d302d682420b69179d1b97d50c6..2cbddec5e6ccd7b4c1d0893e3add7403f8b7b657 100644 +index 7270fa11ccf54f028c3dfbb39ad3c1f470ff42b3..316e9ce1967ec32383990ff023a183561061aa94 100644 --- a/chrome/browser/ui/cocoa/main_menu_builder.mm +++ b/chrome/browser/ui/cocoa/main_menu_builder.mm @@ -107,6 +107,7 @@ base::scoped_nsobject BuildFileMenu( @@ -10,7 +10,7 @@ index 87d359df2e143d302d682420b69179d1b97d50c6..2cbddec5e6ccd7b4c1d0893e3add7403 Item(IDS_REOPEN_CLOSED_TABS_MAC) .command_id(IDC_RESTORE_TAB) .remove_if(is_pwa), -@@ -485,6 +486,7 @@ base::scoped_nsobject BuildHelpMenu( +@@ -481,6 +482,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 6c0db0d4eeed..a2880b36bfdc 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,5 +1,5 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index 8af47d108ece8b14008ffb1e9fffbbf70c0db010..4df6e48007c956a01f15a09a2dbe9b3e231acf8e 100644 +index d813c2a698c7dd6f0ca2155b2a9c68e40c3844a3..0a64e6e8e615591e70e1044e64634a00bfd6debd 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -375,6 +375,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( diff --git a/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch b/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch index 6562fc8b382a..4388e3b6a573 100644 --- a/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/startup/startup_tab_provider.cc b/chrome/browser/ui/startup/startup_tab_provider.cc -index 30374a1f9611cf8a4875169cb77b43a6d377a1fe..79e81552bb82b0d439b16b28d38ef6fba247f0d8 100644 +index d3b1e2ee6275761ae93a96f0d07bce085e30b897..65a73b5c8c2f4ed85ff6be0b882fe4509d937f22 100644 --- a/chrome/browser/ui/startup/startup_tab_provider.cc +++ b/chrome/browser/ui/startup/startup_tab_provider.cc @@ -145,6 +145,7 @@ StartupTabs StartupTabProviderImpl::GetExtensionCheckupTabs( 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 365d57636a57..1fbdabe65e64 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 3ef161f18069651630cc4376392c5cfff3e9a503..3784244e23e9e604d4421643553fb0aefc191462 100644 +index 4e2a3e62cae96533853973ef059d3e42e90745b8..7ab4ee52ceb9c4cdc90c864e213d090cf4057e0d 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -588,6 +588,7 @@ class TabStripModel : public TabGroupController { +@@ -600,6 +600,7 @@ class TabStripModel : public TabGroupController { // Serialise this object into a trace. void WriteIntoTrace(perfetto::TracedValue context) const; diff --git a/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch b/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch index 5750d94aeb57..0fa8614fdc03 100644 --- a/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch +++ b/patches/chrome-browser-ui-toolbar-chrome_location_bar_model_delegate.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h -index 3071cb2cf4bb88f0f2ec1ef62dff9134d2d5eaba..25012166f5c42a31226d213c766cfaee65da177f 100644 +index 1fa9f791678d01f09fb96f535268deff947d9c22..24340c8f7436a19ee06272f195e21a0e481ec604 100644 --- a/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h +++ b/chrome/browser/ui/toolbar/chrome_location_bar_model_delegate.h -@@ -57,6 +57,7 @@ class ChromeLocationBarModelDelegate : public LocationBarModelDelegate { +@@ -58,6 +58,7 @@ class ChromeLocationBarModelDelegate : public LocationBarModelDelegate { // Helper method to get the navigation entry from the navigation controller. content::NavigationEntry* GetNavigationEntry() const; diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch index 8b0366605358..7a8ea9137d68 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc -index fc00e3a35a7f8ebc4f237963389aa104aab6d232..74f4a7fb2217f3f7c0fa5377d10f491d9bbda80c 100644 +index a6fe4b749442283b5d83ef257bd666a0550e6808..72ce3ea89d0af3241d20a1adfd44cd12e8469f01 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc -@@ -573,6 +573,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { +@@ -585,6 +585,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { BuildOtherDevicesTabItem(session_tag, *tabs_in_session[k]); } // for all tabs in one session diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch index 71ed3cfbfdc3..8ca8e46f812d 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h -index 041c8580a59e26714180b15a1dbc830a0296637f..5c85a6399d3412ba209d1d7e650ccfadc7b4c3dd 100644 +index 3d7bcc4cc03b5aca03c6069be3d675032cbf046e..15d3475091f5241958fc1f885a7c5445f41ea52e 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h @@ -75,6 +75,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel, diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch index 86621d5840b1..be818cb939a4 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model_unittest.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc -index 55816dfb47acfcae7384636f74f1232492b3f9ae..2350153284bab4c27f70f1a2eb7268d3165a0640 100644 +index 794177f32a6c25ac1fbf3908fb0dd08be2f8c446..cc5aaa1714e611257dd4d7974ab95ba9ced6d8e0 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc -@@ -741,6 +741,7 @@ TEST_F(RecentTabsSubMenuModelTest, MaxTabsPerSessionAndRecency) { +@@ -746,6 +746,7 @@ TEST_F(RecentTabsSubMenuModelTest, MaxTabsPerSessionAndRecency) { TestRecentTabsSubMenuModel model(nullptr, browser()); int num_items = model.GetItemCount(); 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 37ecc3608f74..70781660477b 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 b302e401b2b9eb91656afefc67d547c2f51c3b2f..81ba86b8c47b51a88732692ad3315a95cb61088f 100644 +index cbfa041bea8bfb1fae6c5037b057ce7822c02be0..f4b20f8bf20ce8480868ca1d4f6afe6f04e97003 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -839,6 +839,7 @@ void BookmarkBarView::Layout() { +@@ -833,6 +833,7 @@ void BookmarkBarView::Layout() { x = next_x; } } diff --git a/patches/chrome-browser-ui-views-frame-browser_view.h.patch b/patches/chrome-browser-ui-views-frame-browser_view.h.patch index 6ea8797e1739..47ec3644666a 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view.h.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h -index f6db8a692883165df991fa522d60a31ba627d3bd..85d286f21b0bb7ac173dd45a9df1e1a4be5ebee8 100644 +index 17968cd66f158e7cb6feffc467d171f89bd93164..fbabc97e79caae93eb1e6bbb2b285c5f1b64e1f8 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h -@@ -642,6 +642,7 @@ class BrowserView : public BrowserWindow, +@@ -650,6 +650,7 @@ class BrowserView : public BrowserWindow, return accessibility_focus_highlight_.get(); } diff --git a/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch index 7ad6e342447e..e557abf3cc54 100644 --- a/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc -index f08cd04d815b30bfc089d5a94a4928c3d627fffd..b15046ab3c16f896384ed201db405db5649c688d 100644 +index 06a0967a8e4bd1483d8be717d86ba537b0c8226f..c065a95fa53d4e0bb69bb4b4e0d4ca40840ce379 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc -@@ -568,6 +568,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const { +@@ -571,6 +571,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const { const float corner_radius = highlight_bounds.height() / 2.f; const SkRect rect = RectToSkRect(highlight_bounds); diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch index cffbddf39c16..1f0484c1c92e 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.h b/chrome/browser/ui/views/profiles/profile_menu_view.h -index a937d8faa15c8c4de6a9926865f42e412b56f98b..286bc371d2e28aca676197ff758d7ef500768a6c 100644 +index beb7d3d06a47ffb9facdbfe1f6f4d6d544f00739..2455e45596b329f5ed3899a7a373e4fbf3fe6c65 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view.h @@ -46,6 +46,7 @@ class ProfileMenuView : public ProfileMenuViewBase { diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 4375432bd528..42983b10a8c7 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index 650fb98f63b0bfe10db05e43389d1d80af14ee4e..b60894df474d4f104774beac8f3cd6c8e323fdb6 100644 +index b80a9dc170565dda1644e406abfae98e6b620992..ec30575c657768e56a09a7ec47b2e18a60b8598b 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -339,6 +339,7 @@ void ToolbarView::Init() { +@@ -342,6 +342,7 @@ void ToolbarView::Init() { } else { // TODO(crbug.com/932818): Remove this once the // |kAutofillEnableToolbarStatusChip| is fully launched. diff --git a/patches/chrome-browser-ui-webui-about_ui.cc.patch b/patches/chrome-browser-ui-webui-about_ui.cc.patch index dd064ca4dd1c..54dce3041537 100644 --- a/patches/chrome-browser-ui-webui-about_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-about_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc -index 5503490c72cfdb8a868645b1f234070e62641c46..eae2fe5a6e8d3caecda67419614cd498b471032e 100644 +index e04c83a8031397dd54088e1ea565227dc33a3a47..9f2bcc20dc12c34fbb0843d81724de04cb274ceb 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -579,6 +579,7 @@ std::string ChromeURLs() { 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 e75574cab795..af375a09ac44 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,8 +1,8 @@ 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 d16b8004494538f25624d616afd3100c6be96a03..8ebe5fdc060f81865b90ec776f54a4c86401d047 100644 +index 4a2a142a6b7de37f1a444875f926ac44d2b6bd62..d53cfc8faba45b13801386f9f60b18ed36c9611f 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1172,6 +1172,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1175,6 +1175,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { 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 adc9378cdee8..ce067511fa74 100644 --- a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc -index 95c22b6e7f854dcda3c6d40c44748b2afb70ecbb..2ea4e87f5f1194bb9b11e532d7ec4b1c7dccd6bf 100644 +index b22eecdc9aa8ead324f191e0c8289a31627a8aa0..b24f899a6e403c715185099e174c1bf9731f347d 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -896,6 +896,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync) { +@@ -865,6 +865,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { void PeopleHandler::BeforeUnloadDialogCancelled() { // The before unload dialog is only shown during the first sync setup. @@ -10,7 +10,7 @@ index 95c22b6e7f854dcda3c6d40c44748b2afb70ecbb..2ea4e87f5f1194bb9b11e532d7ec4b1c DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount( signin::ConsentLevel::kSync)); syncer::SyncService* service = GetSyncService(); -@@ -947,6 +948,7 @@ std::unique_ptr PeopleHandler::GetSyncStatusDictionary() +@@ -915,6 +916,7 @@ std::unique_ptr PeopleHandler::GetSyncStatusDictionary() service && !disallowed_by_policy && service->IsSetupInProgress() && !service->GetUserSettings()->IsFirstSetupComplete() && identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)); @@ -18,7 +18,7 @@ index 95c22b6e7f854dcda3c6d40c44748b2afb70ecbb..2ea4e87f5f1194bb9b11e532d7ec4b1c const sync_ui_util::StatusLabels status_labels = sync_ui_util::GetStatusLabels(profile_); -@@ -1099,6 +1101,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { +@@ -1067,6 +1069,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { } bool PeopleHandler::IsProfileAuthNeededOrHasErrors() { 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 04b24f5404f6..3023a045dbb2 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 b5ccfd5588164d701354cc5e179621ab528eaa39..c8bad512ff1abc66d1362d215208031b034afce1 100644 +index 373a81f6a619801f180987cf3cf576f79be625ed..eaa0eb30f75ecdbce8446e784a419fab94a8f3ac 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2692,6 +2692,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2678,6 +2678,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch index 02a74562fa51..14b64bee54ff 100644 --- a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch +++ b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -index 00ff379a6244f6f5379268f69103f1219eba4d09..2cb181a8cca503ab370286f721eab31c6113c521 100644 +index 34dafcc8609a4cbcbe4a3ee297296644d4550404..e126b9b14bc5c430e512afc1a369c062cab6d82d 100644 --- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc @@ -457,7 +457,7 @@ void UpgradeDetectorImpl::Init() { diff --git a/patches/chrome-installer-gcapi-gcapi.cc.patch b/patches/chrome-installer-gcapi-gcapi.cc.patch index 32068ef88587..db40fad80afd 100644 --- a/patches/chrome-installer-gcapi-gcapi.cc.patch +++ b/patches/chrome-installer-gcapi-gcapi.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc -index d115d6f43abbaee4b4142591d77a233f294fba58..82346778d92143a6a452987aa859da1cf5ef7117 100644 +index 3512501d3bf92db90fc7e3b5c20f2f63c14a8af7..2dc78bdb960d427ee99542559a93a31267418242 100644 --- a/chrome/installer/gcapi/gcapi.cc +++ b/chrome/installer/gcapi/gcapi.cc @@ -56,6 +56,16 @@ using Microsoft::WRL::ComPtr; diff --git a/patches/chrome-installer-util-shell_util.cc.patch b/patches/chrome-installer-util-shell_util.cc.patch index 4ed5abb58e72..0c4b957fdadf 100644 --- a/patches/chrome-installer-util-shell_util.cc.patch +++ b/patches/chrome-installer-util-shell_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc -index 600fa031c2d77f1fb451f9449a48412314cb393d..6d3f1d62d11d52e4bd67032853fe08ee9fe1eafa 100644 +index 4848567fa024a31236c02e87d06dac9c4666c26b..7489006e37a1fe699f5fcd9d713227f964d38f35 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -358,6 +358,7 @@ void GetChromeProgIdEntries( diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 4395118e4ef2..7898a47f3e0c 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 20eb220156efa37300a08ee31a5e3e15bccf3ecf..9949cd656c1c380e74d2a2c1db655b85d29a11ba 100644 +index 081cb42207daad824a12ea8b5c709387a3a0832a..591cf64b7e3a6d957e393c4441596b85c92f93a1 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1017,6 +1017,7 @@ if (!is_android) { +@@ -1207,6 +1207,7 @@ if (!is_android) { "//v8", ] diff --git a/patches/chrome-test-views-accessibility_checker.cc.patch b/patches/chrome-test-views-accessibility_checker.cc.patch index e7e18f9b020b..0d0bd02d15ee 100644 --- a/patches/chrome-test-views-accessibility_checker.cc.patch +++ b/patches/chrome-test-views-accessibility_checker.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/views/accessibility_checker.cc b/chrome/test/views/accessibility_checker.cc -index 486e3f53e623eef7a0f59a9244a578d533abf2ef..1d6181a94f7352112e17ab9d91ca4def1a42c6b0 100644 +index 58e149ba642ca43cbc5e1b6aa2cb0d60a8e84372..04320ff652e8950d97229a65e0a3cede723536ef 100644 --- a/chrome/test/views/accessibility_checker.cc +++ b/chrome/test/views/accessibility_checker.cc @@ -44,6 +44,7 @@ bool DoesViewHaveAccessibleNameOrLabelError(ui::AXNodeData* data) { 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 078a1605e9af..c9ef87b661e5 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,8 +1,8 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index 0a206ad47b3033ce3d3cbc6a30a57de74c72857f..7e770baa73b042472f2b40599db5d23ab47bdeeb 100644 +index 7d55a3442633ec45f57a41f5d236156ddfa359ba..eb0cbd02261e0b7685f86a22f912cdc0175091c3 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc -@@ -426,6 +426,7 @@ bool PageSpecificContentSettings::IsContentBlocked( +@@ -425,6 +425,7 @@ bool PageSpecificContentSettings::IsContentBlocked( content_type == ContentSettingsType::ADS || content_type == ContentSettingsType::SOUND || content_type == ContentSettingsType::CLIPBOARD_READ_WRITE || @@ -10,7 +10,7 @@ index 0a206ad47b3033ce3d3cbc6a30a57de74c72857f..7e770baa73b042472f2b40599db5d23a content_type == ContentSettingsType::SENSORS || content_type == ContentSettingsType::GEOLOCATION) { const auto& it = content_settings_status_.find(content_type); -@@ -449,6 +450,7 @@ bool PageSpecificContentSettings::IsContentAllowed( +@@ -448,6 +449,7 @@ bool PageSpecificContentSettings::IsContentAllowed( content_type != ContentSettingsType::PPAPI_BROKER && content_type != ContentSettingsType::MIDI_SYSEX && content_type != ContentSettingsType::CLIPBOARD_READ_WRITE && diff --git a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch index 57ca115e4ba9..d1623c7b44a4 100644 --- a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc -index f9189c9d34f74ab67a7b3915df0c8b812aa51160..8b52849a273c603f86e49cac99749d77b12d3b65 100644 +index df9136ae2c1fc442d927e3e582a9f3ce087ca647..35de016bac5ac6af07d058ad6a91113a77a46b22 100644 --- a/components/content_settings/core/browser/content_settings_pref.cc +++ b/components/content_settings/core/browser/content_settings_pref.cc @@ -160,6 +160,7 @@ bool ContentSettingsPref::SetWebsiteSetting( 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 70adbbc556cf..710c57cd4212 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,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_utils.cc b/components/content_settings/core/browser/content_settings_utils.cc -index b462833a618434afb05e4bdbbf4163f7079e5adb..5f702e3c0472446dbf7dfda4290466553324020a 100644 +index ccaf3a1af49c438c3cdc597c9c829c631c42b0e5..48595bb4adb7d8d9d4364dbaa8a3ed95ae95783a 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, 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 061c0a013188..c9e507cdaf46 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 edf31ba76eb0e2949aaa916d2f83fb55a8dc7b03..461bd7774178dc56cbe18e3503a6d49c47c422ef 100644 +index 807a39d67582b91b293056db4be50382f544b6e7..291264444ac9fd9703c066f73826e102ca3becb3 100644 --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc @@ -97,6 +97,7 @@ constexpr HistogramValue kHistogramValue[] = { diff --git a/patches/components-content_settings-core-common-cookie_settings_base.h.patch b/patches/components-content_settings-core-common-cookie_settings_base.h.patch index bf4ee5250eeb..471a800ef104 100644 --- a/patches/components-content_settings-core-common-cookie_settings_base.h.patch +++ b/patches/components-content_settings-core-common-cookie_settings_base.h.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.h b/components/content_settings/core/common/cookie_settings_base.h -index de17a2bc1972e2c80cee72eb934d8b64d547d94c..12dea0efe3308e69c4d3f9e58be6c462db8b06e8 100644 +index ed5dd8ba2016476ab5b1d564d5e5ed87f9ce47ef..a707e531a207a4df63c3056c0ad4412c3c845f21 100644 --- a/components/content_settings/core/common/cookie_settings_base.h +++ b/components/content_settings/core/common/cookie_settings_base.h -@@ -169,6 +169,7 @@ class CookieSettingsBase { +@@ -175,6 +175,7 @@ class CookieSettingsBase { // Determines whether |setting| is a valid content setting for legacy cookie // access. static bool IsValidSettingForLegacyAccess(ContentSetting setting); diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch index 49c7a4a1da1e..80646b7a0723 100644 --- a/patches/components-download-internal-common-download_item_impl.cc.patch +++ b/patches/components-download-internal-common-download_item_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc -index 2d56947d1493863ffdf987e1356403f9b99b84ca..77f537ff22fb7a1e19eb43550d7b29b6d6502c41 100644 +index 29db91f855e383b1414ead95bb78338bb3e5ccbd..4c433e5c447f134fa88ecfa7f36969a1a484dc7b 100644 --- a/components/download/internal/common/download_item_impl.cc +++ b/components/download/internal/common/download_item_impl.cc -@@ -1982,8 +1982,8 @@ void DownloadItemImpl::OnDownloadCompleting() { +@@ -1981,8 +1981,8 @@ void DownloadItemImpl::OnDownloadCompleting() { base::Unretained(download_file_.get()), GetTargetFilePath(), delegate_->GetApplicationClientIdForFileScanning(), diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index 3c9fa4ac72c4..f67ddef129e6 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 43035485af85c39467db103b1be6384e7b618089..b118532609528f2520edda7fb08f209b2bb15086 100644 +index f6dc97575d3efb03657b130dc7f57c15fbaf905c..f72d615fc2760ccf8667c50faa6acade880a2e0c 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -270,6 +270,7 @@ static_library("browser") { +@@ -272,6 +272,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index bb48787164d0..0662bb2659ee 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index 0ea891815b3c069bb4b1e7f828e0e33808a0bd14..62dd0290c80753140d6eebd4257592d7066816ae 100644 +index 82cf0320fe3c81d4c3b166b4f864a87e0d3ee765..d1a9ed87965d0bc07411bed0c36cc7910853b1e8 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc -@@ -288,6 +288,7 @@ AutocompleteController::AutocompleteController( +@@ -289,6 +289,7 @@ AutocompleteController::AutocompleteController( if (provider_types & AutocompleteProvider::TYPE_SEARCH) { search_provider_ = new SearchProvider(provider_client_.get(), this); providers_.push_back(search_provider_); diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index 3266365767d4..7441471e5ead 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 986753ed31bbaf844bf774b4ee6a9d6fd314ff70..755683020cb764dddb3f8a4d836c7a1493b30dd9 100644 +index 2d2836753c43bc7788fdf48045c824a48b298a4a..5a34b8618824ccfa7617f27eedec55c9d14e13b5 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc -@@ -358,6 +358,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, +@@ -359,6 +359,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-os_crypt-key_storage_linux.cc.patch b/patches/components-os_crypt-key_storage_linux.cc.patch index 61ac4d6455b0..20820316d8c6 100644 --- a/patches/components-os_crypt-key_storage_linux.cc.patch +++ b/patches/components-os_crypt-key_storage_linux.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/os_crypt/key_storage_linux.cc b/components/os_crypt/key_storage_linux.cc -index 53b1903ff04043e2d058deda086e116a0e00fdca..cfd0c68ccda2c3b148fae13d292459e4a3568801 100644 +index 7faca2d58fa595905056e1ffd32a5686003532db..ea0fd265f432a586f4b5172b135df17b1490bc97 100644 --- a/components/os_crypt/key_storage_linux.cc +++ b/components/os_crypt/key_storage_linux.cc @@ -33,8 +33,7 @@ diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index c09ceb3543a1..f53d039ae0f1 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 4d970f45ddc7eae734fac2f5b1efc5fbba7815d9..237b63de75b6b7b91a9473b206b58b5591b8c282 100644 +index 9eaadafce8208de8e3b98c3b95fafeeb3ad048e6..ff3827db9c0ff86042a69728bed66f6c1f7e2165 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -979,6 +979,7 @@ void PageInfo::PresentSitePermissions() { +@@ -978,6 +978,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 c9a7e58ecf67..304b0a7ed9d3 100644 --- a/patches/components-page_info-page_info_ui.cc.patch +++ b/patches/components-page_info-page_info_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_info_ui.cc -index f28a5deedae5663c9d23f17a4acd88ad9f632a84..109a08c9d04945d4064b92663ccbf6d681eb66de 100644 +index 96f6941c4b1b229d2511000421bd654fe25debc9..6e885627e1b9600a3b60d58502f22a25908444de 100644 --- a/components/page_info/page_info_ui.cc +++ b/components/page_info/page_info_ui.cc @@ -622,6 +622,7 @@ const ui::ImageModel PageInfoUI::GetPermissionIcon( 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 0f21d64164f5..bab1e7bf1a79 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 06dce4d0e8876b8fd2184a1d6ce43db276ba42ed..2efe98e64934a73c8424cc6ebff97e0b08289914 100644 +index b1840173d7351e18eaa9a4e1421c21ca7e07a559..5d9faf5fdbcbc8e672108a5fc119ebcc1959d6d9 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc -@@ -2038,6 +2038,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( +@@ -2037,6 +2037,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( EncryptionResult result = InitPasswordFormFromStatement( *statement, /*decrypt_and_fill_password_value=*/true, &primary_key, new_form.get()); diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index b28095bba954..21f29a9b366b 100644 --- a/patches/components-permissions-BUILD.gn.patch +++ b/patches/components-permissions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn -index 1f6a354712dff778901214292ca0578994dd700e..4b5c1bca7addb2414b751e519836a210d80b9363 100644 +index 3545bd19a5c45da16e3acb55405da4a99bbcb413..12e3fe8e8294a00496e954bf42688522c5f5b308 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn -@@ -106,6 +106,7 @@ source_set("permissions") { +@@ -108,6 +108,7 @@ source_set("permissions") { "//ui/base", "//url", ] diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch index 9dede7991db6..b61fc570833b 100644 --- a/patches/components-policy-tools-generate_policy_source.py.patch +++ b/patches/components-policy-tools-generate_policy_source.py.patch @@ -1,8 +1,8 @@ diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py -index 4d4bab954c95a90fc30314516d361392b078c2c9..3ca1b397bb83d1588e31c1907ead75cd58d62835 100755 +index db57ccfb60149631b8161be7bc76c2c2d703cc71..f4c2e7e4e7cc6425a10bbd569649a9701e795785 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py -@@ -42,6 +42,7 @@ PLATFORM_STRINGS = { +@@ -43,6 +43,7 @@ PLATFORM_STRINGS = { 'chrome.win7': ['win'] } @@ -10,7 +10,7 @@ index 4d4bab954c95a90fc30314516d361392b078c2c9..3ca1b397bb83d1588e31c1907ead75cd class PolicyDetails: """Parses a policy template and caches all its details.""" -@@ -353,6 +354,7 @@ def main(): +@@ -354,6 +355,7 @@ def main(): chrome_major_version = ParseVersionFile(version_path) template_file_contents = _LoadJSONFile(template_file_name) diff --git a/patches/components-sync-driver-BUILD.gn.patch b/patches/components-sync-driver-BUILD.gn.patch index e083fb0c9702..9c5cf50e6b8f 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 80ab10a408c7cc55a5729f881dc0078bb63ad8df..f8854ac9579323278f1f04291166210520e45590 100644 +index 9b6db577a7b936b771c0c49f38297c38c2f7ea69..b7179f9e14236d466c622c55f495c5452d8ffa22 100644 --- a/components/sync/driver/BUILD.gn +++ b/components/sync/driver/BUILD.gn -@@ -108,6 +108,7 @@ static_library("driver") { +@@ -107,6 +107,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 5c48d54dbd14..b544a8de071e 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 c724b649bdb8c27ed9a5804737292e551d5c1da9..c357169d28161304a4ab53eef7c251c244d71ac8 100644 +index adbca0d720e47ea720cf29c4a292fc1ce6855dd2..99b03cc04acecfa580d1b06d140c7746c9167bcf 100644 --- a/components/sync/driver/profile_sync_service.h +++ b/components/sync/driver/profile_sync_service.h -@@ -258,6 +258,7 @@ class ProfileSyncService : public SyncService, +@@ -254,6 +254,7 @@ class ProfileSyncService : public SyncService, SyncClient* GetSyncClientForTest(); diff --git a/patches/components-sync-engine-BUILD.gn.patch b/patches/components-sync-engine-BUILD.gn.patch index 0f9f7d746e7c..b8c9c1c6d114 100644 --- a/patches/components-sync-engine-BUILD.gn.patch +++ b/patches/components-sync-engine-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/engine/BUILD.gn b/components/sync/engine/BUILD.gn -index 8788ee3b89ca6c7333a216203a2364ba4eb11d8a..71a456e857e8e58f6c6ab72178283d302e3bf130 100644 +index 7cfb366d324e40706c05e1770dba84f219505eb2..5a3c82a908de53052af657f5011942b1b62886b8 100644 --- a/components/sync/engine/BUILD.gn +++ b/components/sync/engine/BUILD.gn -@@ -161,6 +161,7 @@ static_library("engine") { +@@ -156,6 +156,7 @@ static_library("engine") { "traffic_logger.h", "update_handler.h", ] diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index f48643c31b2b..2c07f3f3caac 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 37e2c952867f165708ef28717f4cfdce786a7349..ff5d799a611215e26391d4038ee34d1ffd3086f5 100644 +index a95925b3ac8125876e06f9b6d315e1f77acf266d..0a5bf7205956fb8289fec7072a8eb61a0a483aeb 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h @@ -389,6 +389,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { diff --git a/patches/content-browser-browser_main_loop.h.patch b/patches/content-browser-browser_main_loop.h.patch index 631844d67026..e5f052c7af75 100644 --- a/patches/content-browser-browser_main_loop.h.patch +++ b/patches/content-browser-browser_main_loop.h.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h -index 62acb18b0650fec5d7233993d12050b5a3d21146..cb917b012d1b1b3db6ac11f9537d95a3a71c3bd0 100644 +index 090ca9c6e8785c6e9f1b9245771645ea19805795..6201ea7d26fc81559eb0245eeef70c733bf0ca4b 100644 --- a/content/browser/browser_main_loop.h +++ b/content/browser/browser_main_loop.h -@@ -152,6 +152,7 @@ class CONTENT_EXPORT BrowserMainLoop { +@@ -153,6 +153,7 @@ class CONTENT_EXPORT BrowserMainLoop { void RunMainMessageLoop(); // Performs the pre-shutdown steps. diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index 83b37e5db248..eae9cd97c811 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 25a3cefa487c2fe6ef1d973b534d45ab1a90ff5a..01a2f8606668b46412bdb6aabe9e49a2743a6e17 100644 +index 162cc8e66522cd51ab117f51296b30c7a2ae54a9..5555893e2d94e8ad783cbb22b3dac42cc1d85c0f 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3194,16 +3194,17 @@ void NavigationControllerImpl::NavigateWithoutEntry( +@@ -3133,16 +3133,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. @@ -15,11 +15,11 @@ index 25a3cefa487c2fe6ef1d973b534d45ab1a90ff5a..01a2f8606668b46412bdb6aabe9e49a2 - params.url, browser_context_)) { + url, browser_context_)) { DiscardPendingEntry(false); - return; + return nullptr; } - + - HandleRendererDebugURL(node, params.url); + HandleRendererDebugURL(node, url); - return; + return nullptr; } - + diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index d92da57af88f..182276912e75 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,19 +1,19 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 7963b39ec4e78aa47bbdd33dc2ef855fa0c65ca9..9028539e40d2681ef3b7a5f87bba5d5793a3b909 100644 +index 9dc530e077fff80666df94b9ecd6ee8c24fb42d5..79e6fe897e86fdd66e2896bee639e7e05892dfc9 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2154,6 +2154,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2170,6 +2170,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); + BRAVE_ONREQUESTREDIRECTED_MAYBEHIDEREFERRER common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); - -@@ -3322,6 +3323,7 @@ void NavigationRequest::OnStartChecksComplete( + +@@ -3341,6 +3342,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); - + + BRAVE_ONSTARTCHECKSCOMPLETE_MAYBEHIDEREFERRER // TODO(clamy): Avoid cloning the navigation params and create the // ResourceRequest directly here. diff --git a/patches/content-common-user_agent.cc.patch b/patches/content-common-user_agent.cc.patch index b06e2cf51592..49c18770218c 100644 --- a/patches/content-common-user_agent.cc.patch +++ b/patches/content-common-user_agent.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc -index 104986360e1c593fe9db99b9cb54fa2385c0731d..7a9e6990d16a46734fe42f5081b5dfaeccd4292f 100644 +index 3b0305e66c0897262c89c24cc822a85ea86f23d0..a0653d655a799dba752626475fdcada08937d565 100644 --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc -@@ -280,6 +280,7 @@ std::string GetAndroidOSInfo( +@@ -300,6 +300,7 @@ std::string GetAndroidOSInfo( // Send information about the device. bool semicolon_inserted = false; diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index 935ab9017056..7cbbe7aa5dba 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,5 +1,5 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index a162964933327664131b01bb737f4101e70c0c5c..c36b5d705941fa6dfffc6395188cf77ff66d7109 100644 +index 09ce07d6501e1c651cf3ae76e4687650bb0c6f18..1f33cc24fcda50cfafa6c48e84e1d79c91ae6af2 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -1868,6 +1868,7 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index c11c1064e618..8778ec9e30f5 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 14627b6297bb91d290411f23482ff453cc177e0e..a2fb7482fdc647ef2acdc98f0b6ffe9b2be07476 100644 +index 08d697c611363155d3b6230b3e994ac456fb843b..b99bc1cd9cb77889902d8d9828397a6fefe909a7 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4287,6 +4287,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4334,6 +4334,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index 5bcd83bd19c2..968cec78cf9b 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 5bb7fec55d93e2beda55469b10c6960133042e11..a0a849c2f6ab2a970cb2f44ca8a6a9f1aed20294 100644 +index a61bf4dbeae9846b834372c734118119bf91e873..3d06c149d07f2f5eda4dd037d84fc3af88b7df76 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -943,6 +943,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { +@@ -949,6 +949,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/extensions-browser-api-socket-tcp_socket.cc.patch b/patches/extensions-browser-api-socket-tcp_socket.cc.patch index e167a9b84e1d..c46d0a09671e 100644 --- a/patches/extensions-browser-api-socket-tcp_socket.cc.patch +++ b/patches/extensions-browser-api-socket-tcp_socket.cc.patch @@ -1,5 +1,5 @@ diff --git a/extensions/browser/api/socket/tcp_socket.cc b/extensions/browser/api/socket/tcp_socket.cc -index f8bd9bda89a172e04c55c181137aa893fc19d171..73f6d2413e2be765574382e653e3bf69abaf73c3 100644 +index 0ae69cf6125ac63b284ba592eaa94c24a2ff5402..b37510753fe4605522b5610ba3660aa471caef73 100644 --- a/extensions/browser/api/socket/tcp_socket.cc +++ b/extensions/browser/api/socket/tcp_socket.cc @@ -156,8 +156,16 @@ void TCPSocket::Disconnect(bool socket_destroying) { 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 5a7407275ade..d24266eda64b 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 b7d804c359ff4943c81a817e730df9a637d3c2ee..b0bdcf52fd78ad5f7f6f7fa039ca77ce08fb3494 100644 +index 4da01c1e3f34008d9cfe0a6debacca4437ca9265..9f0ac406d5810fed95e3fff9c0cf6995c22f9ecf 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc -@@ -1300,6 +1300,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( +@@ -1295,6 +1295,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( const net::AuthChallengeInfo& auth_info, AuthCallback callback, net::AuthCredentials* credentials) { diff --git a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch index a4971cdcd2ae..8de44cdd872e 100644 --- a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch +++ b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm -index f22d914a541a60c9e9c0bb13b26f6ad8c29c88a3..c54ae0bed2b8af1fd7c4662a49ba78215b21b034 100644 +index ae6e4b43615b4580619af8d23f563f9c78bc57ac..49e0670f1437adb85643b11d2fe0a3b5baad2b71 100644 --- a/ios/chrome/browser/prefs/browser_prefs.mm +++ b/ios/chrome/browser/prefs/browser_prefs.mm -@@ -262,6 +262,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -260,6 +260,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterIntegerPref(kPasswordManagerOnboardingState, 0); registry->RegisterBooleanPref(kWasOnboardingFeatureCheckedBefore, false); registry->RegisterDictionaryPref(kDomainsWithCookiePref); diff --git a/patches/media-blink-key_system_config_selector.cc.patch b/patches/media-blink-key_system_config_selector.cc.patch index 31b95de9c170..f03573b4446a 100644 --- a/patches/media-blink-key_system_config_selector.cc.patch +++ b/patches/media-blink-key_system_config_selector.cc.patch @@ -1,8 +1,8 @@ diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc -index 68c833ec965146799e9aa747f50d43ad96db34c3..73427bca81a280ef68e334b30502371516554995 100644 +index 0acaf77db4d0c5cc8c8119f43730c65c12836d8a..5d33d674bbb735989ab35e7b604854648e5200fe 100644 --- a/media/blink/key_system_config_selector.cc +++ b/media/blink/key_system_config_selector.cc -@@ -994,6 +994,7 @@ void KeySystemConfigSelector::SelectConfig( +@@ -990,6 +990,7 @@ void KeySystemConfigSelector::SelectConfig( key_systems_->UpdateIfNeeded(); diff --git a/patches/mojo-public-tools-mojom-mojom_parser.py.patch b/patches/mojo-public-tools-mojom-mojom_parser.py.patch index f48b95b43853..e7c188208258 100644 --- a/patches/mojo-public-tools-mojom-mojom_parser.py.patch +++ b/patches/mojo-public-tools-mojom-mojom_parser.py.patch @@ -1,5 +1,5 @@ diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/mojom_parser.py -index eb90c825f9bccdd8bb7df42cee4a4c25bdbcb489..8ab65dfdb82a292956717e2f0333f6f11e27c4f2 100755 +index aad01b48df5053771f84d372caf0144ac194fda5..7a8f82ef32a34919699568f3cd299a23e4b47b9e 100755 --- a/mojo/public/tools/mojom/mojom_parser.py +++ b/mojo/public/tools/mojom/mojom_parser.py @@ -177,6 +177,7 @@ def _ParseAstHelper(args): diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 0de6efcafd92..7bb7af55bd22 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 0dbd3da90b269cf9f7feed24125ee224a81f1c54..405b2e3ca77481e7bfa5bafc64138b26e09557d3 100644 +index c8d5ea055ed4edae95273597579cd2fa097e830b..478c26de38e469514d433e3a5da3969df12c10da 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1142,6 +1142,7 @@ component("net") { +@@ -1138,6 +1138,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/net-dns-dns_transaction.cc.patch b/patches/net-dns-dns_transaction.cc.patch index 1f55e9d35e79..ad7f4a85c865 100644 --- a/patches/net-dns-dns_transaction.cc.patch +++ b/patches/net-dns-dns_transaction.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc -index bb17713af7800733c5fc520429c571df81c6ab7c..89ebaea00cb3a2b83ab721ad1d6bd64fefa989f4 100644 +index 57d5663ae832636b927f1b4a334f69db0609c1e7..56e2a9b4497042700be2e4e1564e2b885cd9c298 100644 --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc -@@ -1303,6 +1303,7 @@ class DnsTransactionImpl : public DnsTransaction, +@@ -1302,6 +1302,7 @@ class DnsTransactionImpl : public DnsTransaction, DCHECK(secure_); size_t doh_server_index = dns_server_iterator_->GetNextAttemptIndex(); diff --git a/patches/net-http-transport_security_state.cc.patch b/patches/net-http-transport_security_state.cc.patch index d8288bad21c1..72d1b267f8ad 100644 --- a/patches/net-http-transport_security_state.cc.patch +++ b/patches/net-http-transport_security_state.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc -index 857a7b4d0cb292c75278c612a064224fa4fa4e39..871ffdc8c96d99c3f43da7d0c3698e790307a027 100644 +index 1a13b0e6883a4622380ccedf2ac6a02e4c2c842d..49e209cdcc8d394c84cd6ad5b2f130f67d4127b6 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc @@ -409,6 +409,7 @@ TransportSecurityState::TransportSecurityState( 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 6e1a84997b8f..62e8f6995989 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 d4eb9fff293d47655d32c4efd5f7040bbfa1553c..2293d28c49925b531c38c86a24edcc4df5986228 100644 +index de24a1e063974f7776e101cbaf6e077ad339568a..5b86dd08dc189f7a2c3bcbd577c10eecd6028d43 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2396,6 +2396,7 @@ generated_interface_sources_in_modules = [ +@@ -2434,6 +2434,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.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 b46ee53c1e11..6d0af330bed3 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 d5e757a7f2dabaea716c64ee3929965b160c6846..2585b67cc0e258bcdc0b9edb01ae642b79713f44 100644 +index e3a7fb6f06ef184094171af86d30fe080950f320..87ca0ed036a2733895813efca64a86d7f1262691 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1129,6 +1129,7 @@ static_idl_files_in_modules = get_path_info( +@@ -1132,6 +1132,7 @@ static_idl_files_in_modules = get_path_info( "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.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 a917e29d933c..1d80a1313c38 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 dccd9d974b96641e51c4c7c84639b89ea73325a1..8485e2104dce46c367ecd754d1211e657820ce8b 100644 +index 5c50c4d927636bc92ca86fa3287bdac56d38c0d8..e2379ba73a11d45a45e827773b8c7d92c01ffa2b 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -174,6 +174,7 @@ component("core") { 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 1f246acdcf1b..89fae985d4db 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,5 +1,5 @@ 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 01097a03d36532c47597d6334c940a6e224bb2ef..3b37fa87b4fc9baaebc1d70f35de40cc57a01253 100644 +index b522be2f5e5f06146e4d980000bddcc4e4b389c7..606b1db93f1a55a1f3507ac2906623281287aadc 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 @@ -929,6 +929,7 @@ String HTMLCanvasElement::ToDataURLInternal( diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch index d7da1940ca22..0df5ca95cba3 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h -index 905b0acc5618b4ded9cffb0061fafbb0f310c910..eeae33d929de266d54357a7b318bab0b1f0064f8 100644 +index 1d10cd7e27735a3b1333114d0e5a235fee1a6d9b..02c74b76860426e17bf26885f5edea8357776e51 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h -@@ -321,6 +321,7 @@ class CORE_EXPORT HTMLCanvasElement final +@@ -323,6 +323,7 @@ class CORE_EXPORT HTMLCanvasElement final bool IsCanvasClear() { return canvas_is_clear_; } diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index e8d48322d328..0c720ae545b6 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 1b9f3c7206ebc6cbf742faf948e9706d55c9b762..932008c35b3ce4b9082e156d860f8aa87280758f 100644 +index b4df67c7459bfa5b003abf7401d0585608b64448..0e08cad17dbec73e35d2c9b04f49429e9464318b 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -17,6 +17,7 @@ if (is_android) { @@ -10,7 +10,7 @@ index 1b9f3c7206ebc6cbf742faf948e9706d55c9b762..932008c35b3ce4b9082e156d860f8aa8 config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -184,6 +185,7 @@ component("modules") { +@@ -185,6 +186,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 b48ad4a3c7d7..b2636c084b4e 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 aa17d476ab01cf4d8a67e8a4b48babbd8988d623..f582e41da774827ef787ec637956db638e742b3d 100644 +index 3289e29049fd0bd1c7bf30143a81ac1ac25da1eb..c31d78fed943288ce1993411029da9cc4b375c8a 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 -@@ -2064,6 +2064,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -1847,6 +1847,7 @@ ImageData* BaseRenderingContext2D::getImageData( } ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index aa17d476ab01cf4d8a67e8a4b48babbd8988d623..f582e41da774827ef787ec637956db63 int sx, int sy, int sw, -@@ -2181,6 +2182,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -1964,6 +1965,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } 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 ba30623a27c8..665191d2aa87 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 78fe811af2a902b4571c057560db76eb55d66016..b234c797c299eac08410a4d374a5871bea52554d 100644 +index 2ff888c70b38c8897573c7d2d96f7bf8da7a35f2..2061d1ab6a9eaebf487888b872d6b9904dc83d77 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 -@@ -976,6 +976,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -965,6 +965,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { if (!canvas()->GetDocument().GetFrame()) return MakeGarbageCollected(); 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 720952693251..a6c8126a9910 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 9d389a970e4fd961fb75bddadd79b29d7858eb9d..d09132d66dbc7154a1d324ba949067c601b47ca4 100644 +index 6ced1a42748a334d9b5777db9bc0c15586ea5f4f..88bb0200f7879af207129ca58dbad7fd83922e54 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc -@@ -485,6 +485,8 @@ void MediaDevices::DevicesEnumerated( +@@ -478,6 +478,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 f73a569d6c63..d638958e1466 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 5d9ce54298a0949ea21383b625626f2c1efcc0c2..09fc0ce87c9a5825fbb9b32ace28e0bba2e304bf 100644 +index 9061022c207c4f5f8fd1fb1e61a006072288f565..973920c5ed8e3f783b4d8ae140dec2dbb2b11fb1 100644 --- a/third_party/blink/renderer/modules/modules_idl_files.gni +++ b/third_party/blink/renderer/modules/modules_idl_files.gni -@@ -155,6 +155,7 @@ if (!is_android) { +@@ -156,6 +156,7 @@ if (!is_android) { "//third_party/blink/renderer/modules/serial/idls.gni", ] } 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 d09c05c23b81..eaaad859c3d3 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 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c25c1702b 100644 +index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa75061f98a674 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 -@@ -2930,6 +2930,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -2939,6 +2939,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -2961,6 +2962,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -2970,6 +2971,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -2991,6 +2993,7 @@ absl::optional>> +@@ -3000,6 +3002,7 @@ absl::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return absl::nullopt; @@ -26,7 +26,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -3005,6 +3008,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3014,6 +3017,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3038,6 +3042,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3047,6 +3051,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c switch (pname) { case GL_BUFFER_USAGE: { -@@ -3174,6 +3179,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3183,6 +3188,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -50,7 +50,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3575,6 +3581,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3584,6 +3590,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 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3590,6 +3597,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3599,6 +3606,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 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3682,6 +3690,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3691,6 +3699,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3737,6 +3746,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3746,6 +3755,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3747,6 +3757,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3756,6 +3766,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3798,6 +3809,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3807,6 +3818,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3829,6 +3841,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3838,6 +3850,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3859,6 +3872,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3868,6 +3881,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSample( -@@ -3871,6 +3885,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3880,6 +3894,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c return EnsureNotNull(shader->Source()); } -@@ -3900,6 +3915,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3909,6 +3924,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3934,6 +3950,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3943,6 +3959,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4193,6 +4210,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4202,6 +4219,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4217,6 +4235,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4226,6 +4244,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4294,6 +4313,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4303,6 +4322,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 9f9af8e5ad41d65ecc8d713c0cc65ef429e6bc40..6fd24ddc04fef314ec5625942fe6921c GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4641,6 +4661,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4650,6 +4670,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 162e069501a2..d15604c86d2f 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 b5b86bb00d59ea646e95d7d355e2f11b3d7f5589..d7780a9d5756e56f3f6187dfd6e4b2019f64d105 100644 +index a67a4b93e9551d33c4daf419512598d56ef330f2..cb8b79fec8411098e523ec5b960937bad4db074d 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -47,6 +47,9 @@ @@ -12,7 +12,7 @@ index b5b86bb00d59ea646e95d7d355e2f11b3d7f5589..d7780a9d5756e56f3f6187dfd6e4b201 "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -470,6 +473,9 @@ +@@ -474,6 +477,9 @@ "META": {"align": 100}, "messages": [2700], }, diff --git a/patches/tools-licenses.py.patch b/patches/tools-licenses.py.patch index da9741d16e40..1f381c3e7435 100644 --- a/patches/tools-licenses.py.patch +++ b/patches/tools-licenses.py.patch @@ -1,5 +1,5 @@ diff --git a/tools/licenses.py b/tools/licenses.py -index 7c2e5044226a25e2d60787a257d8d30c3ab37bba..c2ea9b2c45b2de5f2d707b627c62592244aacb55 100755 +index d6787f6455ec79437a4cd60417da127c891f1c7d..eb6f5910690075659d1883631b09cc6eab1392b9 100755 --- a/tools/licenses.py +++ b/tools/licenses.py @@ -35,6 +35,7 @@ else: 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 ee97c23ef1af..11361afb9868 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 74df5dce5b4eac1ac3a3d679d37b17136612c280..ac70e5c3b80e67b0729fcb6eef2eb39ca333dfc4 100644 +index e3e900c1146e9eb6c419e93616a76c947e448449..ebb7583c08878a1c21e95982322a7625440cf457 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -14370,6 +14370,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -14361,6 +14361,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 6c6c89d3ec19..20c1034af111 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 2939b20ceb0e77419ae088944cc6063a4202b3cd..a8f019b407f327da01fa1a6d26c1dc961a9258d1 100644 +index a6b721245a5b141b7ee3170b92335a5f89eaebb6..8f75d10f7ec47d02ab693dd298da73db080cb5cb 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn -@@ -474,6 +474,7 @@ component("base") { +@@ -464,6 +464,7 @@ component("base") { "//ui/strings", "//url", ] diff --git a/patches/ui-native_theme-native_theme_mac.mm.patch b/patches/ui-native_theme-native_theme_mac.mm.patch index 305649ae199b..b5a29e2049e6 100644 --- a/patches/ui-native_theme-native_theme_mac.mm.patch +++ b/patches/ui-native_theme-native_theme_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/native_theme/native_theme_mac.mm b/ui/native_theme/native_theme_mac.mm -index daf974af7954507c6ab9a507da7c4c2943037e6f..8734b048d7756545f45800f2db042f531ffbbbdd 100644 +index c96746c7c98d944721d73caf63b59473334d7578..a43cdbdfb910e5e5150c5ca37285907400e5f685 100644 --- a/ui/native_theme/native_theme_mac.mm +++ b/ui/native_theme/native_theme_mac.mm -@@ -177,6 +177,7 @@ absl::optional NativeThemeMac::GetOSColor( +@@ -175,6 +175,7 @@ absl::optional NativeThemeMac::GetOSColor( // Even with --secondary-ui-md, menus use the platform colors and styling, and // Mac has a couple of specific color overrides, documented below. diff --git a/patches/ui-native_theme-native_theme_win.cc.patch b/patches/ui-native_theme-native_theme_win.cc.patch index c7bfd1171c9c..c32e52e28d88 100644 --- a/patches/ui-native_theme-native_theme_win.cc.patch +++ b/patches/ui-native_theme-native_theme_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc -index 5e1dcf9487470986d771b7777033be2c32677962..3efe1c626715396930de722650f97d09bab6010a 100644 +index a02662fb29ff297a55afdb0d6e2dc336137a749d..2f4be4078a6f07e69cd713bc52a3d0d50e1f0842 100644 --- a/ui/native_theme/native_theme_win.cc +++ b/ui/native_theme/native_theme_win.cc -@@ -1689,6 +1689,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { +@@ -1688,6 +1688,7 @@ void NativeThemeWin::UpdateDarkModeStatus() { &apps_use_light_theme); dark_mode_enabled = (apps_use_light_theme == 0); } From 6b7eb6a965e939b38fc4f02f824c2dffa85e54f3 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 10:42:03 +0200 Subject: [PATCH 002/205] Conflict-resolved patches from Chromium 92.0.4515.159 to Chromium 93.0.4530.5. --- patches/chrome-VERSION.patch | 8 ++++---- ...sources-settings-site_settings-site_details.html.patch | 4 ++-- patches/components-infobars-core-infobar_delegate.h.patch | 6 +++--- ...nsions-browser-extension_event_histogram_value.h.patch | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index c535d474deb1..2c2484eb4d2b 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 0abfdef51aabc3bb1865d9bab7eec94dcfcf88dd..949699578d3cdd332edd475bed298ce51c19aaa2 100644 +index 39cfbf026793c2ab0fc066cdc5ee31e46282443c..c5cfdaaa37bdde933d93e031426a28b7344a3a94 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ - MAJOR=92 + MAJOR=93 -MINOR=0 --BUILD=4515 --PATCH=159 +-BUILD=4530 +-PATCH=5 +MINOR=1 +BUILD=30 +PATCH=30 diff --git a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch index f7b91accd74e..d56dbc631eac 100644 --- a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch +++ b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html -index dc274605f76c22da716eb0a20687b311f58cd42e..fe02d10a8dbabdc3d6b3230f8550a9c2eb8cc438 100644 +index a92d514fa35e99bdcce9100cecc871802df38fb5..a18fc20fd3cc35de62f7ea7ce40b6b61b87a2dc3 100644 --- a/chrome/browser/resources/settings/site_settings/site_details.html +++ b/chrome/browser/resources/settings/site_settings/site_details.html @@ -186,6 +186,11 @@ @@ -11,6 +11,6 @@ index dc274605f76c22da716eb0a20687b311f58cd42e..fe02d10a8dbabdc3d6b3230f8550a9c2 + icon="cr:extension" id="autoplay" + label="$i18n{siteSettingsAutoplay}"> + - + Date: Fri, 4 Jun 2021 13:37:49 +0200 Subject: [PATCH 003/205] Adapt patch for chrome/browser/sync/profile_sync_service_factory.cc It's chrome/browser/sync/sync_service_factory.cc now. Chromium change: https://chromium.googlesource.com/chromium/src/+/ff4e5f6e2d335450d95d29be8496d2f65471a3d2 commit ff4e5f6e2d335450d95d29be8496d2f65471a3d2 Author: Victor Hugo Vianna Silva Date: Tue Jun 1 20:12:14 2021 +0000 Rename chrome/'s ProfileSyncServiceFactory to SyncServiceFactory The goal of this factory is to return a SyncService. This follows the naming convention of other keyed services that have an abstract interface. Bug: 1201272 --- browser/android/brave_sync_worker.cc | 9 ++++----- browser/brave_browser_main_parts.cc | 9 ++++----- browser/sync/brave_sync_devices_android.cc | 6 +++--- browser/ui/webui/settings/brave_sync_handler.cc | 6 +++--- .../federated_learning/floc_id_provider_factory.cc | 2 +- ...c_service_factory.cc => sync_service_factory.cc} | 2 +- ...owser-sync-profile_sync_service_factory.cc.patch | 13 ------------- ...hrome-browser-sync-sync_service_factory.cc.patch | 13 +++++++++++++ 8 files changed, 29 insertions(+), 31 deletions(-) rename chromium_src/chrome/browser/sync/{profile_sync_service_factory.cc => sync_service_factory.cc} (91%) delete mode 100644 patches/chrome-browser-sync-profile_sync_service_factory.cc.patch create mode 100644 patches/chrome-browser-sync-sync_service_factory.cc.patch diff --git a/browser/android/brave_sync_worker.cc b/browser/android/brave_sync_worker.cc index d40b62fe4123..45f5d7d4e072 100644 --- a/browser/android/brave_sync_worker.cc +++ b/browser/android/brave_sync_worker.cc @@ -23,7 +23,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/sync/device_info_sync_service_factory.h" -#include "chrome/browser/sync/profile_sync_service_factory.h" +#include "chrome/browser/sync/sync_service_factory.h" #include "components/sync/driver/sync_service.h" #include "components/sync/driver/sync_user_settings.h" @@ -117,9 +117,9 @@ void BraveSyncWorker::SaveCodeWords( } syncer::BraveProfileSyncService* BraveSyncWorker::GetSyncService() const { - return ProfileSyncServiceFactory::IsSyncAllowed(profile_) + return SyncServiceFactory::IsSyncAllowed(profile_) ? static_cast( - ProfileSyncServiceFactory::GetForProfile(profile_)) + SyncServiceFactory::GetForProfile(profile_)) : nullptr; } @@ -127,8 +127,7 @@ syncer::BraveProfileSyncService* BraveSyncWorker::GetSyncService() const { // bring the logic of enabling / disabling sync from deskop to Android void BraveSyncWorker::RequestSync(JNIEnv* env) { - syncer::SyncService* service = - ProfileSyncServiceFactory::GetForProfile(profile_); + syncer::SyncService* service = SyncServiceFactory::GetForProfile(profile_); if (service && !sync_service_observer_.IsObservingSource(service)) { sync_service_observer_.AddObservation(service); diff --git a/browser/brave_browser_main_parts.cc b/browser/brave_browser_main_parts.cc index b1a18e4a6dfb..2a24b8ae2e10 100644 --- a/browser/brave_browser_main_parts.cc +++ b/browser/brave_browser_main_parts.cc @@ -48,7 +48,7 @@ #if !defined(OS_ANDROID) #include "brave/browser/infobars/sync_v2_migrate_infobar_delegate.h" -#include "chrome/browser/sync/profile_sync_service_factory.h" +#include "chrome/browser/sync/sync_service_factory.h" #include "components/sync/driver/sync_service.h" #include "components/sync/driver/sync_user_settings.h" #endif @@ -114,10 +114,9 @@ void BraveBrowserMainParts::PostBrowserStart() { if (infobar_manager) { BraveConfirmP3AInfoBarDelegate::Create( infobar_manager, g_browser_process->local_state()); - auto* sync_service = - ProfileSyncServiceFactory::IsSyncAllowed(profile()) - ? ProfileSyncServiceFactory::GetForProfile(profile()) - : nullptr; + auto* sync_service = SyncServiceFactory::IsSyncAllowed(profile()) + ? SyncServiceFactory::GetForProfile(profile()) + : nullptr; const bool is_v2_user = sync_service && sync_service->GetUserSettings()->IsFirstSetupComplete(); diff --git a/browser/sync/brave_sync_devices_android.cc b/browser/sync/brave_sync_devices_android.cc index d7a3da5f22f1..80333873469f 100644 --- a/browser/sync/brave_sync_devices_android.cc +++ b/browser/sync/brave_sync_devices_android.cc @@ -19,7 +19,7 @@ #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/sync/device_info_sync_service_factory.h" -#include "chrome/browser/sync/profile_sync_service_factory.h" +#include "chrome/browser/sync/sync_service_factory.h" #include "components/sync_device_info/device_info_sync_service.h" #include "components/sync_device_info/device_info_tracker.h" @@ -104,9 +104,9 @@ BraveSyncDevicesAndroid::GetSyncDeviceListJson(JNIEnv* env) { // TODO(AlexeyBarabash): duplicate with BraveSyncWorker? syncer::BraveProfileSyncService* BraveSyncDevicesAndroid::GetSyncService() const { - return ProfileSyncServiceFactory::IsSyncAllowed(profile_) + return SyncServiceFactory::IsSyncAllowed(profile_) ? static_cast( - ProfileSyncServiceFactory::GetForProfile(profile_)) + SyncServiceFactory::GetForProfile(profile_)) : nullptr; } diff --git a/browser/ui/webui/settings/brave_sync_handler.cc b/browser/ui/webui/settings/brave_sync_handler.cc index be3a95a670e2..d981e3638cbb 100644 --- a/browser/ui/webui/settings/brave_sync_handler.cc +++ b/browser/ui/webui/settings/brave_sync_handler.cc @@ -18,7 +18,7 @@ #include "brave/components/sync_device_info/brave_device_info.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/device_info_sync_service_factory.h" -#include "chrome/browser/sync/profile_sync_service_factory.h" +#include "chrome/browser/sync/sync_service_factory.h" #include "components/sync/driver/sync_user_settings.h" #include "components/sync_device_info/device_info_sync_service.h" #include "components/sync_device_info/device_info_tracker.h" @@ -219,9 +219,9 @@ void BraveSyncHandler::HandleDeleteDevice(const base::ListValue* args) { } syncer::BraveProfileSyncService* BraveSyncHandler::GetSyncService() const { - return ProfileSyncServiceFactory::IsSyncAllowed(profile_) + return SyncServiceFactory::IsSyncAllowed(profile_) ? static_cast( - ProfileSyncServiceFactory::GetForProfile(profile_)) + SyncServiceFactory::GetForProfile(profile_)) : nullptr; } diff --git a/chromium_src/chrome/browser/federated_learning/floc_id_provider_factory.cc b/chromium_src/chrome/browser/federated_learning/floc_id_provider_factory.cc index b2a27a6c1c32..8ba63a734e1c 100644 --- a/chromium_src/chrome/browser/federated_learning/floc_id_provider_factory.cc +++ b/chromium_src/chrome/browser/federated_learning/floc_id_provider_factory.cc @@ -8,7 +8,7 @@ #include "chrome/browser/federated_learning/floc_remote_permission_service_factory.h" #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/privacy_sandbox/privacy_sandbox_settings_factory.h" -#include "chrome/browser/sync/profile_sync_service_factory.h" +#include "chrome/browser/sync/sync_service_factory.h" #include "chrome/browser/sync/user_event_service_factory.h" #define BuildServiceInstanceFor BuildServiceInstanceFor_ChromiumImpl diff --git a/chromium_src/chrome/browser/sync/profile_sync_service_factory.cc b/chromium_src/chrome/browser/sync/sync_service_factory.cc similarity index 91% rename from chromium_src/chrome/browser/sync/profile_sync_service_factory.cc rename to chromium_src/chrome/browser/sync/sync_service_factory.cc index 827a6f1f621b..2be8b54b844d 100644 --- a/chromium_src/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chromium_src/chrome/browser/sync/sync_service_factory.cc @@ -13,6 +13,6 @@ std::make_unique( \ DeviceInfoSyncServiceFactory::GetForProfile(profile))); -#include "../../../../../chrome/browser/sync/profile_sync_service_factory.cc" +#include "../../../../../chrome/browser/sync/sync_service_factory.cc" #undef BRAVE_BUILD_SERVICE_INSTANCE_FOR diff --git a/patches/chrome-browser-sync-profile_sync_service_factory.cc.patch b/patches/chrome-browser-sync-profile_sync_service_factory.cc.patch deleted file mode 100644 index 588a2721eeb4..000000000000 --- a/patches/chrome-browser-sync-profile_sync_service_factory.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/sync/profile_sync_service_factory.cc b/chrome/browser/sync/profile_sync_service_factory.cc -index 1bcadf4d952b3b60bb5756ec097f2bf9446bbaaf..f027c9c1e5e66161c1fe7d198a5a1c25103f56e0 100644 ---- a/chrome/browser/sync/profile_sync_service_factory.cc -+++ b/chrome/browser/sync/profile_sync_service_factory.cc -@@ -278,7 +278,7 @@ KeyedService* ProfileSyncServiceFactory::BuildServiceInstanceFor( - } - - auto pss = -- std::make_unique(std::move(init_params)); -+ BRAVE_BUILD_SERVICE_INSTANCE_FOR - pss->Initialize(); - - // Hook PSS into PersonalDataManager (a circular dependency). diff --git a/patches/chrome-browser-sync-sync_service_factory.cc.patch b/patches/chrome-browser-sync-sync_service_factory.cc.patch new file mode 100644 index 000000000000..5055a4bfdefa --- /dev/null +++ b/patches/chrome-browser-sync-sync_service_factory.cc.patch @@ -0,0 +1,13 @@ +diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc +index 5d662dad1c8bf796619b4c148c247dadd5470fca..cbda1ad7b77258b682984dbc44ff08beb59f0bfa 100644 +--- a/chrome/browser/sync/sync_service_factory.cc ++++ b/chrome/browser/sync/sync_service_factory.cc +@@ -277,7 +277,7 @@ KeyedService* SyncServiceFactory::BuildServiceInstanceFor( + } + + auto pss = +- std::make_unique(std::move(init_params)); ++ BRAVE_BUILD_SERVICE_INSTANCE_FOR + pss->Initialize(); + + // Hook PSS into PersonalDataManager (a circular dependency). From fde91f37d8c89e337f8304ece96d0d9f8d9114db Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 4 Jun 2021 13:39:14 +0200 Subject: [PATCH 004/205] Adapt patch for ios/chrome/browser/sync/profile_sync_service_factory.cc It's ios/chrome/browser/sync/sync_service_factory.cc now. Chromium change: https://chromium.googlesource.com/chromium/src/+/c17aab02c3bc7cb9732708126a5001d15ad6efd3 commit c17aab02c3bc7cb9732708126a5001d15ad6efd3 Author: Victor Hugo Vianna Silva Date: Tue Jun 1 18:44:24 2021 +0000 Rename ios/'s ProfileSyncServiceFactory-s to SyncServiceFactory Same as crrev.com/c/2928734 but for the 2 factories in ios/: ProfileSyncServiceFactory and WebViewProfileSyncServiceFactory. Bug: 2928734 --- .../browser_state_keyed_service_factories.mm | 4 ++-- ...c_service_factory.cc => sync_service_factory.cc} | 8 ++++---- ios/browser/api/sync/brave_sync_api.mm | 7 +++---- ios/browser/api/sync/brave_sync_worker.cc | 10 ++++------ ...owser-sync-profile_sync_service_factory.cc.patch | 13 ------------- ...hrome-browser-sync-sync_service_factory.cc.patch | 13 +++++++++++++ 6 files changed, 26 insertions(+), 29 deletions(-) rename chromium_src/ios/chrome/browser/sync/{profile_sync_service_factory.cc => sync_service_factory.cc} (70%) delete mode 100644 patches/ios-chrome-browser-sync-profile_sync_service_factory.cc.patch create mode 100644 patches/ios-chrome-browser-sync-sync_service_factory.cc.patch diff --git a/chromium_src/ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm b/chromium_src/ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm index 6a3cb5477344..c72ac3fcef8c 100644 --- a/chromium_src/ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm +++ b/chromium_src/ios/chrome/browser/browser_state/browser_state_keyed_service_factories.mm @@ -22,8 +22,8 @@ #include "ios/chrome/browser/sync/consent_auditor_factory.h" #include "ios/chrome/browser/sync/ios_user_event_service_factory.h" #include "ios/chrome/browser/sync/model_type_store_service_factory.h" -#include "ios/chrome/browser/sync/profile_sync_service_factory.h" #include "ios/chrome/browser/sync/session_sync_service_factory.h" +#include "ios/chrome/browser/sync/sync_service_factory.h" #include "ios/chrome/browser/sync/sync_setup_service_factory.h" #include "ios/chrome/browser/undo/bookmark_undo_service_factory.h" #include "ios/chrome/browser/webdata_services/web_data_service_factory.h" @@ -51,7 +51,7 @@ void EnsureBrowserStateKeyedServiceFactoriesBuilt() { IOSChromeProfileInvalidationProviderFactory::GetInstance(); IOSUserEventServiceFactory::GetInstance(); ModelTypeStoreServiceFactory::GetInstance(); - ProfileSyncServiceFactory::GetInstance(); + SyncServiceFactory::GetInstance(); ReadingListModelFactory::GetInstance(); SessionSyncServiceFactory::GetInstance(); SyncSetupServiceFactory::GetInstance(); diff --git a/chromium_src/ios/chrome/browser/sync/profile_sync_service_factory.cc b/chromium_src/ios/chrome/browser/sync/sync_service_factory.cc similarity index 70% rename from chromium_src/ios/chrome/browser/sync/profile_sync_service_factory.cc rename to chromium_src/ios/chrome/browser/sync/sync_service_factory.cc index ec78500ca18f..a008131c99e2 100644 --- a/chromium_src/ios/chrome/browser/sync/profile_sync_service_factory.cc +++ b/chromium_src/ios/chrome/browser/sync/sync_service_factory.cc @@ -7,12 +7,12 @@ #include "brave/components/sync/driver/brave_sync_profile_sync_service.h" #include "ios/chrome/browser/sync/device_info_sync_service_factory.h" -#define BRAVE_BUILD_SERVICE_INSTANCE_FOR \ - std::make_unique( \ - std::move(init_params), \ +#define BRAVE_BUILD_SERVICE_INSTANCE_FOR \ + std::make_unique( \ + std::move(init_params), \ std::make_unique( \ DeviceInfoSyncServiceFactory::GetForBrowserState(browser_state))); -#include "../../../../../../ios/chrome/browser/sync/profile_sync_service_factory.cc" +#include "../../../../../../ios/chrome/browser/sync/sync_service_factory.cc" #undef BRAVE_BUILD_SERVICE_INSTANCE_FOR diff --git a/ios/browser/api/sync/brave_sync_api.mm b/ios/browser/api/sync/brave_sync_api.mm index f09d0722a798..16c7f28cae1c 100644 --- a/ios/browser/api/sync/brave_sync_api.mm +++ b/ios/browser/api/sync/brave_sync_api.mm @@ -29,7 +29,7 @@ #include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/browser_state/chrome_browser_state_manager.h" #include "ios/chrome/browser/sync/device_info_sync_service_factory.h" -#include "ios/chrome/browser/sync/profile_sync_service_factory.h" +#include "ios/chrome/browser/sync/sync_service_factory.h" #include "ios/chrome/browser/sync/sync_setup_service.h" #include "ios/chrome/browser/sync/sync_setup_service_factory.h" @@ -217,9 +217,8 @@ - (id)createSyncDeviceObserver:(void (^)())onDeviceInfoChanged { } - (id)createSyncServiceObserver:(void (^)())onSyncServiceStateChanged { - auto* service = - ProfileSyncServiceFactory::GetAsProfileSyncServiceForBrowserState( - _chromeBrowserState); + auto* service = SyncServiceFactory::GetAsProfileSyncServiceForBrowserState( + _chromeBrowserState); return [[BraveSyncServiceObserver alloc] initWithProfileSyncService:service callback:onSyncServiceStateChanged]; diff --git a/ios/browser/api/sync/brave_sync_worker.cc b/ios/browser/api/sync/brave_sync_worker.cc index 6c3b1239f393..b3779a6fb7fe 100644 --- a/ios/browser/api/sync/brave_sync_worker.cc +++ b/ios/browser/api/sync/brave_sync_worker.cc @@ -26,7 +26,7 @@ #include "components/sync_device_info/local_device_info_provider.h" #include "ios/chrome/browser/browser_state/chrome_browser_state.h" #include "ios/chrome/browser/sync/device_info_sync_service_factory.h" -#include "ios/chrome/browser/sync/profile_sync_service_factory.h" +#include "ios/chrome/browser/sync/sync_service_factory.h" #include "ios/chrome/browser/sync/sync_setup_service.h" #include "ios/chrome/browser/sync/sync_setup_service_factory.h" #include "ios/web/public/thread/web_thread.h" @@ -84,8 +84,7 @@ bool BraveSyncWorker::SetSyncEnabled(bool enabled) { DCHECK_CURRENTLY_ON(web::WebThread::UI); auto* setup_service = SyncSetupServiceFactory::GetForBrowserState(browser_state_); - auto* sync_service = - ProfileSyncServiceFactory::GetForBrowserState(browser_state_); + auto* sync_service = SyncServiceFactory::GetForBrowserState(browser_state_); if (!setup_service || !sync_service) { return false; @@ -238,7 +237,7 @@ void BraveSyncWorker::DeleteDevice(const std::string& device_guid) { syncer::BraveProfileSyncService* BraveSyncWorker::GetSyncService() const { DCHECK_CURRENTLY_ON(web::WebThread::UI); return static_cast( - ProfileSyncServiceFactory::GetForBrowserState(browser_state_)); + SyncServiceFactory::GetForBrowserState(browser_state_)); } void BraveSyncWorker::SetEncryptionPassphrase(syncer::SyncService* service) { @@ -324,8 +323,7 @@ bool BraveSyncWorker::IsSyncEnabled() { bool BraveSyncWorker::IsSyncFeatureActive() { DCHECK_CURRENTLY_ON(web::WebThread::UI); - auto* sync_service = - ProfileSyncServiceFactory::GetForBrowserState(browser_state_); + auto* sync_service = SyncServiceFactory::GetForBrowserState(browser_state_); if (!sync_service) { return false; diff --git a/patches/ios-chrome-browser-sync-profile_sync_service_factory.cc.patch b/patches/ios-chrome-browser-sync-profile_sync_service_factory.cc.patch deleted file mode 100644 index 6c12f46e098b..000000000000 --- a/patches/ios-chrome-browser-sync-profile_sync_service_factory.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ios/chrome/browser/sync/profile_sync_service_factory.cc b/ios/chrome/browser/sync/profile_sync_service_factory.cc -index 1729fca2683944213c17d656568d7dd0e1bbc4d5..985d4c4d0df4a6377c4efec248832ddb42a34d4d 100644 ---- a/ios/chrome/browser/sync/profile_sync_service_factory.cc -+++ b/ios/chrome/browser/sync/profile_sync_service_factory.cc -@@ -172,7 +172,7 @@ ProfileSyncServiceFactory::BuildServiceInstanceFor( - policy_connector ? policy_connector->GetPolicyService() : nullptr; - - auto pss = -- std::make_unique(std::move(init_params)); -+ BRAVE_BUILD_SERVICE_INSTANCE_FOR - pss->Initialize(); - - // Hook PSS into PersonalDataManager (a circular dependency). diff --git a/patches/ios-chrome-browser-sync-sync_service_factory.cc.patch b/patches/ios-chrome-browser-sync-sync_service_factory.cc.patch new file mode 100644 index 000000000000..45db8a6c542f --- /dev/null +++ b/patches/ios-chrome-browser-sync-sync_service_factory.cc.patch @@ -0,0 +1,13 @@ +diff --git a/ios/chrome/browser/sync/sync_service_factory.cc b/ios/chrome/browser/sync/sync_service_factory.cc +index ed009499c549e075003201b5ee04422fc7d9114b..83c68d329b1b3fc08d0204f0760cf07d48b5a4ac 100644 +--- a/ios/chrome/browser/sync/sync_service_factory.cc ++++ b/ios/chrome/browser/sync/sync_service_factory.cc +@@ -171,7 +171,7 @@ std::unique_ptr SyncServiceFactory::BuildServiceInstanceFor( + policy_connector ? policy_connector->GetPolicyService() : nullptr; + + auto pss = +- std::make_unique(std::move(init_params)); ++ BRAVE_BUILD_SERVICE_INSTANCE_FOR + pss->Initialize(); + + // Hook PSS into PersonalDataManager (a circular dependency). From 5139fd8237605634a8afc0d52aea566ba973453d Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 4 Jun 2021 13:40:34 +0200 Subject: [PATCH 005/205] chrome/browser/resources/downloads/toolbar.js migrated to TypeScript Need to patch the right .ts file now. Chromium change: https://chromium.googlesource.com/chromium/src/+/683b64f39d5890d0938bad29ecd768b8fb6a6aeb commit 683b64f39d5890d0938bad29ecd768b8fb6a6aeb Author: dpapad Date: Thu May 27 12:01:17 2021 +0000 Downloads: Migrate to TypeScript. Leveraging the "allowJs" option of the Typescript compiler, to consume Mojo JS bindings (downloads.mojom-webui.js), until Mojo can generate TypeScript code directly. Bug: 1189595 --- ...ome-browser-resources-downloads-toolbar.js.patch | 13 ------------- ...ome-browser-resources-downloads-toolbar.ts.patch | 12 ++++++++++++ 2 files changed, 12 insertions(+), 13 deletions(-) delete mode 100644 patches/chrome-browser-resources-downloads-toolbar.js.patch create mode 100644 patches/chrome-browser-resources-downloads-toolbar.ts.patch diff --git a/patches/chrome-browser-resources-downloads-toolbar.js.patch b/patches/chrome-browser-resources-downloads-toolbar.js.patch deleted file mode 100644 index 8563afece493..000000000000 --- a/patches/chrome-browser-resources-downloads-toolbar.js.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/resources/downloads/toolbar.js b/chrome/browser/resources/downloads/toolbar.js -index baf9b705a46f111e14048d13f393e614ade4d639..9a0fbfe0b5f64c66315d35669a18b9d713529179 100644 ---- a/chrome/browser/resources/downloads/toolbar.js -+++ b/chrome/browser/resources/downloads/toolbar.js -@@ -12,7 +12,7 @@ import 'chrome://resources/polymer/v3_0/paper-styles/color.js'; - import './strings.m.js'; - - import {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.m.js'; --import {CrToolbarElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; -+import 'chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js'; - import {assert} from 'chrome://resources/js/assert.m.js'; - import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; - import {html, Polymer} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/patches/chrome-browser-resources-downloads-toolbar.ts.patch b/patches/chrome-browser-resources-downloads-toolbar.ts.patch new file mode 100644 index 000000000000..7910715974c2 --- /dev/null +++ b/patches/chrome-browser-resources-downloads-toolbar.ts.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/resources/downloads/toolbar.ts b/chrome/browser/resources/downloads/toolbar.ts +index b20d9feb6042b210e9f1ce6c0dfec15f3fdc09dd..96bb079cd353ffe6d010881bbfe9d5616d4fd47e 100644 +--- a/chrome/browser/resources/downloads/toolbar.ts ++++ b/chrome/browser/resources/downloads/toolbar.ts +@@ -16,6 +16,7 @@ import {CrActionMenuElement} from 'chrome://resources/cr_elements/cr_action_menu + import {CrIconButtonElement} from 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.m.js'; + import {getToastManager} from 'chrome://resources/cr_elements/cr_toast/cr_toast_manager.m.js'; + import {CrToolbarElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; ++import 'chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js'; + import {assert} from 'chrome://resources/js/assert.m.js'; + import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; + import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; From 60e779c990ff66074bbd3ec7fca9b6dafd41e846 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 4 Jun 2021 13:43:35 +0200 Subject: [PATCH 006/205] chrome/browser/resources/history/history_*.js migrated to TypeScript Need to patch the right .ts files now. Chromium change: https://chromium.googlesource.com/chromium/src/+/f3907c07a8a0c13b1b513f507719fe3e316d8c80 commit f3907c07a8a0c13b1b513f507719fe3e316d8c80 Author: dpapad Date: Wed May 26 17:41:25 2021 +0000 History: Migrate to TypeScript. - Remove js_library(), js_type_check() targets. - Add new ts_library() target, and hook it up to the build. - Migrate all files to TypeScript, and fix all errors. - Override default tsconfig with a few options that seem necessary for Polymer code. - Introduce EventTracker usage in app.ts as part of the migration (easier than adding type info for boundOnKeyDown_) - Rename 'open-menu' event to 'synced-device-card-open-menu' in synced_device_card.ts, to be able to differentiate with the 'open-menu' event in history_card.ts, when declaring the Event type in the global HTMLElementEventMap. Bug: 1189595 --- ...-browser-resources-history-history_item.js.patch | 12 ------------ ...-browser-resources-history-history_item.ts.patch | 12 ++++++++++++ ...owser-resources-history-history_toolbar.js.patch | 13 ------------- ...owser-resources-history-history_toolbar.ts.patch | 12 ++++++++++++ 4 files changed, 24 insertions(+), 25 deletions(-) delete mode 100644 patches/chrome-browser-resources-history-history_item.js.patch create mode 100644 patches/chrome-browser-resources-history-history_item.ts.patch delete mode 100644 patches/chrome-browser-resources-history-history_toolbar.js.patch create mode 100644 patches/chrome-browser-resources-history-history_toolbar.ts.patch diff --git a/patches/chrome-browser-resources-history-history_item.js.patch b/patches/chrome-browser-resources-history-history_item.js.patch deleted file mode 100644 index c3f2329069d7..000000000000 --- a/patches/chrome-browser-resources-history-history_item.js.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/resources/history/history_item.js b/chrome/browser/resources/history/history_item.js -index 1f423d3e244077a1710b1c81ce9ec5b2e8f92a23..f58130c63b7055fc296b57825504501552472cfc 100644 ---- a/chrome/browser/resources/history/history_item.js -+++ b/chrome/browser/resources/history/history_item.js -@@ -9,6 +9,7 @@ import 'chrome://resources/cr_elements/cr_icons_css.m.js'; - import 'chrome://resources/cr_elements/shared_vars_css.m.js'; - import 'chrome://resources/js/icon.m.js'; - import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js'; -+import 'chrome://brave-resources/page_specific/history/brave_history_item.m.js' - - import {FocusRowBehavior} from 'chrome://resources/js/cr/ui/focus_row_behavior.m.js'; - import {focusWithoutInk} from 'chrome://resources/js/cr/ui/focus_without_ink.m.js'; diff --git a/patches/chrome-browser-resources-history-history_item.ts.patch b/patches/chrome-browser-resources-history-history_item.ts.patch new file mode 100644 index 000000000000..82c6b83b3285 --- /dev/null +++ b/patches/chrome-browser-resources-history-history_item.ts.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/resources/history/history_item.ts b/chrome/browser/resources/history/history_item.ts +index bcec056bb5aa6e48c8edb540a1c9177753a135d6..1748c3f1cca60a1d9d0c9202f2da5235a0c94c43 100644 +--- a/chrome/browser/resources/history/history_item.ts ++++ b/chrome/browser/resources/history/history_item.ts +@@ -9,6 +9,7 @@ import 'chrome://resources/cr_elements/cr_icons_css.m.js'; + import 'chrome://resources/cr_elements/shared_vars_css.m.js'; + import 'chrome://resources/js/icon.m.js'; + import 'chrome://resources/polymer/v3_0/iron-icon/iron-icon.js'; ++import 'chrome://brave-resources/page_specific/history/brave_history_item.m.js' + + import {CrCheckboxElement} from 'chrome://resources/cr_elements/cr_checkbox/cr_checkbox.m.js'; + import {CrIconButtonElement} from 'chrome://resources/cr_elements/cr_icon_button/cr_icon_button.m.js'; diff --git a/patches/chrome-browser-resources-history-history_toolbar.js.patch b/patches/chrome-browser-resources-history-history_toolbar.js.patch deleted file mode 100644 index 9c89c0e5088e..000000000000 --- a/patches/chrome-browser-resources-history-history_toolbar.js.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/resources/history/history_toolbar.js b/chrome/browser/resources/history/history_toolbar.js -index 6fd5cf161986d4f3901d628f9a1452b1ee370563..176ec53205eb4ab53e5ff180d1cbc4c0b1757819 100644 ---- a/chrome/browser/resources/history/history_toolbar.js -+++ b/chrome/browser/resources/history/history_toolbar.js -@@ -6,7 +6,7 @@ import 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.m.js'; - import './shared_style.js'; - import './strings.m.js'; - --import {CrToolbarElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; -+import 'chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js' - import {CrToolbarSearchFieldElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; - import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; - import {html, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/patches/chrome-browser-resources-history-history_toolbar.ts.patch b/patches/chrome-browser-resources-history-history_toolbar.ts.patch new file mode 100644 index 000000000000..e061aed8fae7 --- /dev/null +++ b/patches/chrome-browser-resources-history-history_toolbar.ts.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/resources/history/history_toolbar.ts b/chrome/browser/resources/history/history_toolbar.ts +index 498b0e97dafda77d2c0ed2a89911b7bdf2d97592..3766cae26bbddb08ec678de3dda2024638198b94 100644 +--- a/chrome/browser/resources/history/history_toolbar.ts ++++ b/chrome/browser/resources/history/history_toolbar.ts +@@ -8,6 +8,7 @@ import './strings.m.js'; + import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; + import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; + ++import 'chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js' + import {CrToolbarElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; + import {CrToolbarSearchFieldElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; + import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; From 1a6b0678dd6083f8c14d0b23373bdf6a07777a08 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 4 Jun 2021 13:44:36 +0200 Subject: [PATCH 007/205] Updated strings for Chromium 93.0.4530.5 --- app/generated_resources.grd | 15 +++++++ app/os_settings_search_tag_strings.grdp | 9 ++++ app/os_settings_strings.grdp | 6 +++ app/profiles_strings.grdp | 15 ------- app/profiles_strings_override.grdp | 19 +------- app/settings_strings.grdp | 3 -- app/settings_strings_override.grdp | 3 -- .../strings/android_chrome_strings.grd | 43 ++++++++++++++----- components/autofill_assistant_strings.grdp | 3 ++ components/autofill_payments_strings.grdp | 3 ++ components/omnibox_strings.grdp | 17 ++++++-- components/policy_strings.grdp | 3 ++ components/security_state_strings.grdp | 6 --- 13 files changed, 87 insertions(+), 58 deletions(-) diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 56548d5bda75..19b64bd107cb 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -4712,6 +4712,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Customize and control $1GMail + + Enable window controls overlay + + + Disable window controls overlay + @@ -7304,6 +7310,15 @@ Keep your key file in a safe place. You will need it to create new versions of y Send to $1Ted's Pixel2 + + Shared from $1Ted's Pixel2 + + + Page shared from another device + + + Open in New Tab + Send to your devices diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp index 01c04b508fb9..68405cc8f800 100644 --- a/app/os_settings_search_tag_strings.grdp +++ b/app/os_settings_search_tag_strings.grdp @@ -991,6 +991,15 @@ Emoji suggestions + + Predictive writing + + + Text suggestions + + + Next word prediction + diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index 3ea50407aa2e..f7eb3123379f 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -492,6 +492,12 @@ Get emoji suggestions based on what you're typing + + Predictive writing + + + Show inline writing suggestions that appear as you type + diff --git a/app/profiles_strings.grdp b/app/profiles_strings.grdp index 373e2608259d..5208685a8291 100644 --- a/app/profiles_strings.grdp +++ b/app/profiles_strings.grdp @@ -65,9 +65,6 @@ - - Profiles - Profiles @@ -139,9 +136,6 @@ Addresses and more - - Other profiles - Other profiles @@ -151,14 +145,8 @@ Hide accounts - - Manage profiles - - - Other Profiles - Other Profiles @@ -168,9 +156,6 @@ Hide Accounts - - Manage Profiles - Manage profiles diff --git a/app/profiles_strings_override.grdp b/app/profiles_strings_override.grdp index fc1cb7b05a4e..52a40f0e6386 100644 --- a/app/profiles_strings_override.grdp +++ b/app/profiles_strings_override.grdp @@ -16,9 +16,6 @@ You're Private - - Profiles - Add Profile... @@ -27,21 +24,9 @@ - - Other profiles - - - Manage profiles - - + - - Other Profiles - - - Manage Profiles - - + Profile $11 diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index 90c0789fcb3a..7c547a1a40d7 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -3199,9 +3199,6 @@ Because this account is managed by $1example.com, your bookmarks, history, passwords, and other settings will be cleared from this device. However, your data will remain stored in your Brave sync chain and can be managed on <a href="$2" target="_blank" rel="noopener noreferrer"><a href="$2" target="_blank">Brave Dashboard</a></a>. - - Edit profile - Turn off sync and personalization? diff --git a/app/settings_strings_override.grdp b/app/settings_strings_override.grdp index 67f0101d7e60..5ce352c9224c 100644 --- a/app/settings_strings_override.grdp +++ b/app/settings_strings_override.grdp @@ -88,9 +88,6 @@ - - Edit profile - diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 282724705df7..f188f96d5f26 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -265,9 +265,6 @@ CHAR_LIMIT guidelines: - - Account - You and Brave @@ -541,6 +538,14 @@ CHAR_LIMIT guidelines: Keep your passwords safe from data breaches and other security issues + + + Trusted vault + + + + Opt in to trusted vault + Never saved @@ -1617,9 +1622,6 @@ Your Brave account may have other forms of browsing history like searches and ac No data selected to sync - - Initial sync setup was not finished. Sync is off. - Tap to set up sync @@ -1897,6 +1899,12 @@ To change this setting, <resetlink>reset sync

Sign in again to start sync + + Make sure you can always access your sync data + + + Make sure you can always access your saved passwords + To start sync, verify it's you @@ -1909,9 +1917,6 @@ To change this setting, <resetlink>reset sync

Choose what to sync below - - To start sync, turn on "Sync your Brave data". - Try signing in again @@ -2847,6 +2852,9 @@ To change this setting, <resetlink>reset sync

Following + + You'll find sites you follow here + Updates Unavailable @@ -2886,6 +2894,8 @@ To change this setting, <resetlink>reset sync

Check back later for new stories Can't refresh Discover Check back later for new stories + You'll find stories here + To follow a site, go to the site, open the Brave menu, and tap Follow. @@ -4202,11 +4212,14 @@ To change this setting, <resetlink>reset sync

+ + Allow Brave to submit code on your remote device? + - Tap to verify your phone number on desktop + Allow Brave to submit code on your %1$smac? - %1$s123 is your code for %2$sexample.com + Tap OK to submit %1$s123 on %2$sexample.com @@ -4386,6 +4399,14 @@ To change this setting, <resetlink>reset sync

+ + Switching on Bluetooth… + + + + We'll switch it back off after we are done + + QR Code diff --git a/components/autofill_assistant_strings.grdp b/components/autofill_assistant_strings.grdp index 607bd616e0f0..50c716ba59c2 100644 --- a/components/autofill_assistant_strings.grdp +++ b/components/autofill_assistant_strings.grdp @@ -4,6 +4,9 @@ Continue + + Information missing + Sorry, something went wrong. diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index a396549b813d..caded3b4b70d 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp @@ -512,6 +512,9 @@ View virtual card details + + Virtual card + Remember your UPI ID? diff --git a/components/omnibox_strings.grdp b/components/omnibox_strings.grdp index b8b71136925f..c94867829d11 100644 --- a/components/omnibox_strings.grdp +++ b/components/omnibox_strings.grdp @@ -30,9 +30,6 @@ Image you copied - - "$1search string" - $1Paypal Inc. [$2US] @@ -267,6 +264,20 @@ Create Brave Doc button, press Enter to Create a new Brave Doc quickly + + + Resume journey + + + Resume journey to see relevant activity in your Brave history + + + $1dog food, press Tab, then Enter to resume your journey and see relevant activity in your Brave history + + + Resume journey button, press Enter to resume your journey and see relevant activity in your Brave history + + diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp index afde1aa6e862..cce5cbfc58b3 100644 --- a/components/policy_strings.grdp +++ b/components/policy_strings.grdp @@ -164,6 +164,9 @@ Ignored because the policy is not set by a cloud source. + + Ignored because the machine is not enrolled with Brave Browser Cloud Management. + Ignored because default search is not enabled by policy. diff --git a/components/security_state_strings.grdp b/components/security_state_strings.grdp index db9292b875a0..0f470dbeb200 100644 --- a/components/security_state_strings.grdp +++ b/components/security_state_strings.grdp @@ -11,12 +11,6 @@ This page is insecure (unencrypted HTTP). - - Form field edited on a non-secure page - - - Data was entered in a field on a non-secure page. A warning has been added to the URL bar. - This page is dangerous (flagged by Google Safe Browsing). From 5f27591ddc32f016932864ab05fb4f869e32ffe8 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 4 Jun 2021 16:18:23 +0200 Subject: [PATCH 008/205] Add missing includes for base/containers/contain.h Chromium change: https://chromium.googlesource.com/chromium/src/+/c0f9fc515c962497b90c8c8fa3b72e77b8a88647 commit c0f9fc515c962497b90c8c8fa3b72e77b8a88647 Author: Lei Zhang Date: Sat May 22 08:00:53 2021 +0000 Remove base/containers/contain.h include from base/stl_util.h. This include is temporary scaffolding to help move base::Contains() to its new location. Now that most callers to base::Contains() include base/containers/contain.h, remove it from base/stl_util.h and fix the remaining callers that need the correct include. Bug: 970209 --- browser/net/brave_request_handler.cc | 1 + .../components/component_updater/component_installer.cc | 2 +- chromium_src/net/url_request/redirect_util.cc | 2 +- .../blink/public/platform/disable_client_hints_browsertest.cc | 2 +- .../blink/renderer/core/origin_trials/origin_trials.cc | 2 ++ .../renderer/brave_content_settings_agent_impl.cc | 2 +- components/permissions/permission_lifetime_manager.cc | 2 +- .../permissions/permission_origin_lifetime_monitor_impl.cc | 2 +- 8 files changed, 9 insertions(+), 6 deletions(-) diff --git a/browser/net/brave_request_handler.cc b/browser/net/brave_request_handler.cc index 938d4fe544a0..5514ccfcbbaa 100644 --- a/browser/net/brave_request_handler.cc +++ b/browser/net/brave_request_handler.cc @@ -8,6 +8,7 @@ #include #include +#include "base/containers/contains.h" #include "base/feature_list.h" #include "base/task/post_task.h" #include "brave/browser/net/brave_ad_block_csp_network_delegate_helper.h" diff --git a/chromium_src/components/component_updater/component_installer.cc b/chromium_src/components/component_updater/component_installer.cc index 307ab2df6ad0..d07cdcc80571 100644 --- a/chromium_src/components/component_updater/component_installer.cc +++ b/chromium_src/components/component_updater/component_installer.cc @@ -12,7 +12,7 @@ #undef Register #undef CRX3_WITH_PUBLISHER_PROOF -#include "base/stl_util.h" +#include "base/containers/contains.h" namespace component_updater { diff --git a/chromium_src/net/url_request/redirect_util.cc b/chromium_src/net/url_request/redirect_util.cc index fe23c31de4ee..aaa62676e756 100644 --- a/chromium_src/net/url_request/redirect_util.cc +++ b/chromium_src/net/url_request/redirect_util.cc @@ -5,7 +5,7 @@ #include "net/url_request/redirect_util.h" -#include "base/stl_util.h" +#include "base/containers/contains.h" #include "net/url_request/url_request_job.h" #define UpdateHttpRequest UpdateHttpRequest_ChromiumImpl diff --git a/chromium_src/third_party/blink/public/platform/disable_client_hints_browsertest.cc b/chromium_src/third_party/blink/public/platform/disable_client_hints_browsertest.cc index e2f9502a4afb..f79f2600a2f0 100644 --- a/chromium_src/third_party/blink/public/platform/disable_client_hints_browsertest.cc +++ b/chromium_src/third_party/blink/public/platform/disable_client_hints_browsertest.cc @@ -4,10 +4,10 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "base/bind.h" +#include "base/containers/contains.h" #include "base/feature_list.h" #include "base/path_service.h" #include "base/run_loop.h" -#include "base/stl_util.h" #include "base/test/scoped_feature_list.h" #include "brave/common/brave_paths.h" #include "chrome/test/base/in_process_browser_test.h" diff --git a/chromium_src/third_party/blink/renderer/core/origin_trials/origin_trials.cc b/chromium_src/third_party/blink/renderer/core/origin_trials/origin_trials.cc index eb762044a1e4..557e3a463b18 100644 --- a/chromium_src/third_party/blink/renderer/core/origin_trials/origin_trials.cc +++ b/chromium_src/third_party/blink/renderer/core/origin_trials/origin_trials.cc @@ -5,6 +5,8 @@ #include "third_party/blink/renderer/core/origin_trials/origin_trials.h" +#include "base/containers/contains.h" + namespace blink { namespace origin_trials { bool IsTrialValid_ChromiumImpl(const StringView& trial_name); diff --git a/components/content_settings/renderer/brave_content_settings_agent_impl.cc b/components/content_settings/renderer/brave_content_settings_agent_impl.cc index d6ce84030cc0..f55bf9fc58d6 100644 --- a/components/content_settings/renderer/brave_content_settings_agent_impl.cc +++ b/components/content_settings/renderer/brave_content_settings_agent_impl.cc @@ -11,8 +11,8 @@ #include #include "base/callback_helpers.h" +#include "base/containers/contains.h" #include "base/feature_list.h" -#include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" #include "brave/components/brave_shields/common/brave_shield_utils.h" #include "brave/components/brave_shields/common/features.h" diff --git a/components/permissions/permission_lifetime_manager.cc b/components/permissions/permission_lifetime_manager.cc index c3b2951b2a15..bd33697dbcf1 100644 --- a/components/permissions/permission_lifetime_manager.cc +++ b/components/permissions/permission_lifetime_manager.cc @@ -9,7 +9,7 @@ #include #include "base/auto_reset.h" -#include "base/stl_util.h" +#include "base/containers/contains.h" #include "base/threading/sequenced_task_runner_handle.h" #include "brave/components/permissions/permission_lifetime_pref_names.h" #include "components/content_settings/core/browser/content_settings_registry.h" diff --git a/components/permissions/permission_origin_lifetime_monitor_impl.cc b/components/permissions/permission_origin_lifetime_monitor_impl.cc index 9a80ee078d5e..a54fa85f2c1d 100644 --- a/components/permissions/permission_origin_lifetime_monitor_impl.cc +++ b/components/permissions/permission_origin_lifetime_monitor_impl.cc @@ -7,7 +7,7 @@ #include -#include "base/stl_util.h" +#include "base/containers/contains.h" #include "content/public/browser/tld_ephemeral_lifetime.h" #include "net/base/features.h" #include "net/base/url_util.h" From 0bf548c48493f3a1cb284483dcdcef6cc15d1ce8 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 4 Jun 2021 17:26:55 +0200 Subject: [PATCH 009/205] Adapt Brave-specific's focus ring themeing for ring's color MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A different GetNativeTheme() symbol is now used in focus_ring.cc, so we can't just redefine it as we used to do. Chromium change: https://chromium.googlesource.com/chromium/src/+/b62ab23c8d294fceda02edad378327cc787292e2 commit b62ab23c8d294fceda02edad378327cc787292e2 Author: Peter Boström Date: Tue May 25 23:29:28 2021 +0000 Add scoped overriding of FocusRing colors This fixes focus-ring contrast when using themes for: * The omnibox. * Page-action icons inside the omnibox. * The tab strip. * New-tab button + tab-search button (buttons outside the tab strip). * Infobars. * Download shelf. This is done without individually fixing all buttons/views/subclasses in those view subhierarchies. It's also able to stay correct for any new subclasses added to either of those view hierarchies. This also adds contrast boosting for platforms where the default FocusRing colors are not fully opaque. Bug: 1068929 --- chromium_src/ui/views/controls/focus_ring.cc | 11 ++++++++-- patches/ui-views-controls-focus_ring.cc.patch | 20 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 patches/ui-views-controls-focus_ring.cc.patch diff --git a/chromium_src/ui/views/controls/focus_ring.cc b/chromium_src/ui/views/controls/focus_ring.cc index ed5c02a2fc74..75527bf6d619 100644 --- a/chromium_src/ui/views/controls/focus_ring.cc +++ b/chromium_src/ui/views/controls/focus_ring.cc @@ -45,6 +45,13 @@ FocusRingTheme* GetFocusRingTheme() { } // namespace -#define GetNativeTheme GetFocusRingTheme +#define BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_VALIDITY \ + paint.setColor(color_.value_or( \ + GetFocusRingTheme()->GetSystemColor(ColorIdForValidity(!invalid_)))); + +#define BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_FOCUS_AURA \ + flags.setColor(GetFocusRingTheme()->GetSystemColor( \ + ui::NativeTheme::kColorId_FocusAuraColor)); #include "../../../../../ui/views/controls/focus_ring.cc" -#undef GetNativeTheme +#undef BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_FOCUS_AURA +#undef BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_VALIDITY diff --git a/patches/ui-views-controls-focus_ring.cc.patch b/patches/ui-views-controls-focus_ring.cc.patch new file mode 100644 index 000000000000..5433e54d91cb --- /dev/null +++ b/patches/ui-views-controls-focus_ring.cc.patch @@ -0,0 +1,20 @@ +diff --git a/ui/views/controls/focus_ring.cc b/ui/views/controls/focus_ring.cc +index 677bd527de4c1cc59be73279a4122e428dc9ebc7..607b902797cc204c44a198e658f2f366b7ebf753 100644 +--- a/ui/views/controls/focus_ring.cc ++++ b/ui/views/controls/focus_ring.cc +@@ -197,6 +197,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { + cc::PaintFlags paint; + paint.setAntiAlias(true); + paint.setColor(color_.value_or(GetColor(this, !invalid_))); ++ BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_VALIDITY + paint.setStyle(cc::PaintFlags::kStroke_Style); + paint.setStrokeWidth(PlatformStyle::kFocusHaloThickness); + +@@ -218,6 +219,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { + flags.setAntiAlias(true); + flags.setColor(GetNativeTheme()->GetSystemColor( + ui::NativeTheme::kColorId_FocusAuraColor)); ++ BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_FOCUS_AURA + flags.setStyle(cc::PaintFlags::kFill_Style); + canvas->DrawPath(path, flags); + } From cf01247159f922a33e11aff58463a3047fd5e3ea Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 7 Jun 2021 11:43:45 +0200 Subject: [PATCH 010/205] Replace reference to kCloseAllIcon with vector_icons::kCloseIcon Chromium change: https://chromium.googlesource.com/chromium/src/+/62060fb114a2f54030c2c5200982eed77fa52d2c commit 62060fb114a2f54030c2c5200982eed77fa52d2c Author: David Roger Date: Tue May 25 23:22:41 2021 +0000 [profiles] Delete flag for new profile picker The new profile picker is now enabled by default, remove the flag to disable it. Bug: 1063856 --- browser/ui/views/profiles/brave_incognito_menu_view.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/ui/views/profiles/brave_incognito_menu_view.cc b/browser/ui/views/profiles/brave_incognito_menu_view.cc index 5330e1501109..099c0cad6eca 100644 --- a/browser/ui/views/profiles/brave_incognito_menu_view.cc +++ b/browser/ui/views/profiles/brave_incognito_menu_view.cc @@ -75,7 +75,7 @@ void BraveIncognitoMenuView::BuildMenu() { GetProfileMenuCloseButtonTextId(browser()->profile())), base::BindRepeating(&BraveIncognitoMenuView::OnExitButtonClicked, base::Unretained(this)), - kCloseAllIcon); + vector_icons::kCloseIcon); } void BraveIncognitoMenuView::AddTorButton() { From 8a60c8fed37897e82d6265899ce3cf687a95f271 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 7 Jun 2021 11:49:07 +0200 Subject: [PATCH 011/205] Remove reference for kHandwritingRecognitionWebPlatformApi This feature is only enabled/disabled via finch trials now, which we disable via a chromium_src override to origin_trials.cc anyway, so we can safely drop all references to this no longer existing parameter. Chromium change: https://chromium.googlesource.com/chromium/src/+/428b9ab9c67f504a745905974d1a67cdd8739706 commit 428b9ab9c67f504a745905974d1a67cdd8739706 Author: Glen Robertson Date: Tue Jun 1 10:07:42 2021 +0000 Cleanup the kHandwritingRecognitionWebPlatformApi flag. The flag was originally needed to restrict the availability of the API to specific hardware devices that could support it. The API is now available on all devices and the flag is now enabled by default. The flag is not needed even to turn off the API via Finch, as we have a separate flag for that (kHandwritingRecognitionWebPlatformApiFinch). Bug: 1166910 --- app/brave_main_delegate.cc | 1 - app/brave_main_delegate_browsertest.cc | 1 - 2 files changed, 2 deletions(-) diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index 35882b50561c..4c81a7240a1b 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -207,7 +207,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { autofill::features::kAutofillServerCommunication.name, blink::features::kFledgeInterestGroupAPI.name, blink::features::kFledgeInterestGroups.name, - blink::features::kHandwritingRecognitionWebPlatformApi.name, blink::features::kHandwritingRecognitionWebPlatformApiFinch.name, blink::features::kInterestCohortAPIOriginTrial.name, blink::features::kInterestCohortFeaturePolicy.name, diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index b78671dc88a5..7a02cb8e1371 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -73,7 +73,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &autofill::features::kAutofillServerCommunication, &blink::features::kFledgeInterestGroupAPI, &blink::features::kFledgeInterestGroups, - &blink::features::kHandwritingRecognitionWebPlatformApi, &blink::features::kHandwritingRecognitionWebPlatformApiFinch, &blink::features::kInterestCohortAPIOriginTrial, &blink::features::kInterestCohortFeaturePolicy, From d2a2c06cf63a2427c0306189acf4dadd0b0b6dfb Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 7 Jun 2021 11:58:17 +0200 Subject: [PATCH 012/205] IWYU: mojo/public/cpp/bindings/self_owned_receiver.h --- browser/brave_content_browser_client.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index 6f0ce70cd0d8..9e97cf635386 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -74,6 +74,7 @@ #include "content/public/common/content_switches.h" #include "extensions/buildflags/buildflags.h" #include "mojo/public/cpp/bindings/pending_receiver.h" +#include "mojo/public/cpp/bindings/self_owned_receiver.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/site_for_cookies.h" #include "third_party/blink/public/common/associated_interfaces/associated_interface_registry.h" From 67b22edabb8e44ca59a74d0967177a347e335dec Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 7 Jun 2021 11:53:38 +0200 Subject: [PATCH 013/205] Remove references to kEnableProfilePickerOnStartupFeature The new profile menu/picker design is now the only one available, so there's no longer any need to deal with this parameter. Chromium change: https://chromium.googlesource.com/chromium/src/+/62060fb114a2f54030c2c5200982eed77fa52d2c commit 62060fb114a2f54030c2c5200982eed77fa52d2c Author: David Roger Date: Tue May 25 23:22:41 2021 +0000 [profiles] Delete flag for new profile picker The new profile picker is now enabled by default, remove the flag to disable it. Bug: 1063856 --- app/brave_main_delegate.cc | 2 -- app/brave_main_delegate_browsertest.cc | 3 --- 2 files changed, 5 deletions(-) diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc index 4c81a7240a1b..2f8f9a345f63 100644 --- a/app/brave_main_delegate.cc +++ b/app/brave_main_delegate.cc @@ -234,8 +234,6 @@ bool BraveMainDelegate::BasicStartupComplete(int* exit_code) { offline_pages::kPrefetchingOfflinePagesFeature.name, signin::kMobileIdentityConsistency.name, translate::kTranslate.name, -#else - kEnableProfilePickerOnStartupFeature.name, #endif }; diff --git a/app/brave_main_delegate_browsertest.cc b/app/brave_main_delegate_browsertest.cc index 7a02cb8e1371..d44845424dc5 100644 --- a/app/brave_main_delegate_browsertest.cc +++ b/app/brave_main_delegate_browsertest.cc @@ -88,9 +88,6 @@ IN_PROC_BROWSER_TEST_F(BraveMainDelegateBrowserTest, DisabledFeatures) { &features::kWebOTP, &federated_learning::kFederatedLearningOfCohorts, &federated_learning::kFlocIdComputedEventLogging, -#if !defined(OS_ANDROID) - &kEnableProfilePickerOnStartupFeature, -#endif &media::kLiveCaption, &net::features::kFirstPartySets, &network::features::kTrustTokens, From fdaf6487e0dbbf94e050c6c4b52b35b029f2d148 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 7 Jun 2021 12:03:48 +0200 Subject: [PATCH 014/205] Migrate to use DictionaryValue::DictEmpty() DictionaryValue::empty() has been removed upstream. Chromium change: https://chromium.googlesource.com/chromium/src/+/c276866bb1276cf9d39604921e421fb92ac44ad9 commit c276866bb1276cf9d39604921e421fb92ac44ad9 Author: Song Fangzhen Date: Wed May 26 08:32:56 2021 +0000 CodeHealth: Remove DictionaryValue::empty After removing the use of DictionaryValue::empty(), now DictionaryValue::empty() itself should be removed. Bug: 1187020 --- .../browser/brave_content_settings_pref_provider_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc b/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc index 14247e78e7d4..6fde720bffbc 100644 --- a/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc +++ b/components/content_settings/core/browser/brave_content_settings_pref_provider_unittest.cc @@ -518,7 +518,7 @@ TEST_F(BravePrefProviderTest, TestShieldsSettingsMigrationFromUnknownSettings) { pref_service->GetDictionary(GetShieldsSettingUserPrefsPath( GetShieldsContentTypeName(content_type))); EXPECT_NE(brave_shields_dict, nullptr); - EXPECT_TRUE(brave_shields_dict->empty()); + EXPECT_TRUE(brave_shields_dict->DictEmpty()); } provider.ShutdownOnUIThread(); From 04c10471d7e5ce444f7eb2f7131d892b541e31ab Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 7 Jun 2021 12:14:08 +0200 Subject: [PATCH 015/205] Update expected value in ModelTypeTest.ModelTypeCounts unit test A new |kWorkspaceDesk| value was added to the ModelTypeForHistograms class enumeration in components/sync/base/model_type.h. Chromium change: https://chromium.googlesource.com/chromium/src/+/f5d50f5d1c2009fb570aa1e4a41dd773c86f425a commit f5d50f5d1c2009fb570aa1e4a41dd773c86f425a Author: Yanzhu Du Date: Fri May 21 16:19:52 2021 +0000 Add workspace_desk field to Chrome Sync EntitySpecifics Bug: 1177413 --- chromium_src/components/sync/base/model_type_unittest.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium_src/components/sync/base/model_type_unittest.cc b/chromium_src/components/sync/base/model_type_unittest.cc index 7eb5c80ddb8b..943238f80bcf 100644 --- a/chromium_src/components/sync/base/model_type_unittest.cc +++ b/chromium_src/components/sync/base/model_type_unittest.cc @@ -14,7 +14,7 @@ TEST_F(ModelTypeTest, EncryptableUserTypes) { // This test is supposed to fail when sync types are increased/decreased TEST_F(ModelTypeTest, ModelTypeCounts) { - EXPECT_EQ(static_cast(ModelTypeForHistograms::kMaxValue), 49); + EXPECT_EQ(static_cast(ModelTypeForHistograms::kMaxValue), 50); } } // namespace From f3785c7aeee243b9d2004443abcd8ef36068af18 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 4 Jun 2021 18:17:31 +0200 Subject: [PATCH 016/205] Adapt to the removal of default sandbox type used for Brave Ads Define an specialization of content::GetServiceSandboxType() for the bat_ads::mojom::BatAdsService mojo interface that returns the default sandbox type that was being used until now (i.e |kUtility|). Chromium change: https://chromium.googlesource.com/chromium/src/+/4aac4e9b3b64c634dcdd935e989dddaf19df43e3 commit 4aac4e9b3b64c634dcdd935e989dddaf19df43e3 Author: Alex Gough Date: Wed May 26 01:46:47 2021 +0000 Remove default sandbox type for services Deletes content::GetServiceSandboxType<>() (see content/public/browser/service_process_host.h) so that ::Launch cannot compile if a sandbox is not specified by a specialized template. All existing services without a specified sandbox are launched as kUtility, so these now have that specified. No functional changes. Template for recording::mojom::RecordingService moved to chromeos and includes adjusted. Bug: 1210301 --- .../chrome/browser/service_sandbox_type.h | 5 ++++ components/brave_ads/browser/BUILD.gn | 2 ++ .../brave_ads/browser/ads_service_impl.cc | 1 + .../brave_ads/browser/service_sandbox_type.h | 24 +++++++++++++++++++ 4 files changed, 32 insertions(+) create mode 100644 components/brave_ads/browser/service_sandbox_type.h diff --git a/chromium_src/chrome/browser/service_sandbox_type.h b/chromium_src/chrome/browser/service_sandbox_type.h index 732154a130fb..43c9dd7646f7 100644 --- a/chromium_src/chrome/browser/service_sandbox_type.h +++ b/chromium_src/chrome/browser/service_sandbox_type.h @@ -8,6 +8,7 @@ #include "../../../../chrome/browser/service_sandbox_type.h" +#include "brave/components/brave_ads/browser/buildflags/buildflags.h" #include "brave/components/ipfs/buildflags/buildflags.h" // brave::mojom::ProfileImport @@ -27,4 +28,8 @@ content::GetServiceSandboxType() { #include "brave/components/ipfs/service_sandbox_type.h" #endif +#if BUILDFLAG(BRAVE_ADS_ENABLED) +#include "brave/components/brave_ads/browser/service_sandbox_type.h" +#endif + #endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_SERVICE_SANDBOX_TYPE_H_ diff --git a/components/brave_ads/browser/BUILD.gn b/components/brave_ads/browser/BUILD.gn index 003a368a014f..2505e729170d 100644 --- a/components/brave_ads/browser/BUILD.gn +++ b/components/brave_ads/browser/BUILD.gn @@ -28,6 +28,7 @@ static_library("browser") { "frequency_capping_helper.h", "notification_helper.cc", "notification_helper.h", + "service_sandbox_type.h", ] deps = [ @@ -48,6 +49,7 @@ static_library("browser") { "//components/history/core/browser", "//components/history/core/common", "//components/wifi", + "//content/public/browser", "//net", "//services/network/public/cpp", "//services/network/public/mojom", diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc index 5b947843ad77..888135c5c45e 100644 --- a/components/brave_ads/browser/ads_service_impl.cc +++ b/components/brave_ads/browser/ads_service_impl.cc @@ -48,6 +48,7 @@ #include "brave/components/brave_ads/browser/ads_p2a.h" #include "brave/components/brave_ads/browser/frequency_capping_helper.h" #include "brave/components/brave_ads/browser/notification_helper.h" +#include "brave/components/brave_ads/browser/service_sandbox_type.h" #include "brave/components/brave_ads/common/features.h" #include "brave/components/brave_ads/common/pref_names.h" #include "brave/components/brave_ads/common/switches.h" diff --git a/components/brave_ads/browser/service_sandbox_type.h b/components/brave_ads/browser/service_sandbox_type.h new file mode 100644 index 000000000000..8f32f0c8f08d --- /dev/null +++ b/components/brave_ads/browser/service_sandbox_type.h @@ -0,0 +1,24 @@ +/* Copyright 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_SERVICE_SANDBOX_TYPE_H_ +#define BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_SERVICE_SANDBOX_TYPE_H_ + +#include "content/public/browser/service_process_host.h" + +// bat_ads::mojom::BatAdsService +namespace bat_ads { +namespace mojom { +class BatAdsService; +} // namespace mojom +} // namespace bat_ads + +template <> +inline sandbox::policy::SandboxType +content::GetServiceSandboxType() { + return sandbox::policy::SandboxType::kUtility; +} + +#endif // BRAVE_COMPONENTS_BRAVE_ADS_BROWSER_SERVICE_SANDBOX_TYPE_H_ From 059a14617ea4a7385349e6715d1e0606f66918ee Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 7 Jun 2021 14:51:25 -0400 Subject: [PATCH 017/205] [Android] Adapt to the removal of default sandbox type Define an specialization of content::GetServiceSandboxType() for the bat_ads::mojom::BatAdsService mojo interface that returns the default sandbox type that was being used until now (i.e |kUtility|). Chromium change: https://chromium.googlesource.com/chromium/src/+/4aac4e9b3b64c634dcdd935e989dddaf19df43e3 commit 4aac4e9b3b64c634dcdd935e989dddaf19df43e3 Author: Alex Gough Date: Wed May 26 01:46:47 2021 +0000 Remove default sandbox type for services Deletes content::GetServiceSandboxType<>() (see content/public/browser/service_process_host.h) so that ::Launch cannot compile if a sandbox is not specified by a specialized template. All existing services without a specified sandbox are launched as kUtility, so these now have that specified. No functional changes. Template for recording::mojom::RecordingService moved to chromeos and includes adjusted. Bug: 1210301 --- components/brave_rewards/browser/service_sandbox_type.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/brave_rewards/browser/service_sandbox_type.h b/components/brave_rewards/browser/service_sandbox_type.h index 765e5fb1a08e..443e1f368a7d 100644 --- a/components/brave_rewards/browser/service_sandbox_type.h +++ b/components/brave_rewards/browser/service_sandbox_type.h @@ -8,7 +8,6 @@ #include "content/public/browser/service_process_host.h" -#if !defined(OS_ANDROID) // Android will use default, which is kUtility. namespace bat_ledger { namespace mojom { class BatLedgerService; @@ -18,8 +17,11 @@ class BatLedgerService; template <> inline sandbox::policy::SandboxType content::GetServiceSandboxType() { +#if !defined(OS_ANDROID) return sandbox::policy::SandboxType::kNoSandbox; -} +#else + return sandbox::policy::SandboxType::kUtility; #endif // !defined(OS_ANDROID) +} #endif // BRAVE_COMPONENTS_BRAVE_REWARDS_BROWSER_SERVICE_SANDBOX_TYPE_H_ From d2a80c81b0ee88ad6ff6010832599824d118e73b Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 7 Jun 2021 16:46:57 -0400 Subject: [PATCH 018/205] [Android] Adjusted java code to upstream changes --- .../appmenu/BraveTabbedAppMenuPropertiesDelegate.java | 6 ++---- .../chromium/chrome/browser/ntp/BraveNewTabPageLayout.java | 3 +-- .../chrome/browser/settings/BraveMainPreferencesBase.java | 2 -- .../javatests/org/chromium/chrome/browser/BytecodeTest.java | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index 94840d4fac71..b495e7142332 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -52,12 +52,10 @@ public BraveTabbedAppMenuPropertiesDelegate(Context context, OneshotSupplier overviewModeBehaviorSupplier, ObservableSupplier bookmarkBridgeSupplier, WebFeedSnackbarController.FeedLauncher feedLauncher, - ModalDialogManager modalDialogManager, SnackbarManager snackbarManager, - WebFeedBridge webFeedBridge) { + ModalDialogManager modalDialogManager, SnackbarManager snackbarManager) { super(context, activityTabProvider, multiWindowModeStateDispatcher, tabModelSelector, toolbarManager, decorView, appMenuDelegate, overviewModeBehaviorSupplier, - bookmarkBridgeSupplier, feedLauncher, modalDialogManager, snackbarManager, - webFeedBridge); + bookmarkBridgeSupplier, feedLauncher, modalDialogManager, snackbarManager); mAppMenuDelegate = appMenuDelegate; } diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java index 6c96239a31ac..d2fc598b9b0e 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java @@ -98,7 +98,6 @@ import org.chromium.chrome.browser.preferences.BravePref; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.suggestions.tile.SiteSection; import org.chromium.chrome.browser.suggestions.tile.TileGroup; import org.chromium.chrome.browser.tab.EmptyTabObserver; import org.chromium.chrome.browser.tab.Tab; @@ -425,7 +424,7 @@ private void checkForBraveStats() { protected void insertSiteSectionView() { mainLayout = findViewById(R.id.ntp_main_layout); - mSiteSectionView = SiteSection.inflateSiteSection(mainLayout); + mSiteSectionView = NewTabPageLayout.inflateSiteSection(mainLayout); ViewGroup.LayoutParams layoutParams = mSiteSectionView.getLayoutParams(); layoutParams.width = ViewGroup.LayoutParams.WRAP_CONTENT; // If the explore sites section exists as its own section, then space it more closely. diff --git a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java index 836f15e63dfe..93920138152a 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java @@ -113,9 +113,7 @@ private void updateBravePreferences() { // Below prefs are removed from main settings. removePreferenceIfPresent(MainSettings.PREF_SYNC_PROMO); removePreferenceIfPresent(MainSettings.PREF_SIGN_IN); - removePreferenceIfPresent(MainSettings.PREF_ACCOUNT_SECTION); removePreferenceIfPresent(MainSettings.PREF_DATA_REDUCTION); - removePreferenceIfPresent(MainSettings.PREF_SYNC_AND_SERVICES); removePreferenceIfPresent(MainSettings.PREF_SEARCH_ENGINE); removePreferenceIfPresent(MainSettings.PREF_UI_THEME); removePreferenceIfPresent(MainSettings.PREF_DOWNLOADS); diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index b42c3ce32a96..0d7b92d63e42 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -284,7 +284,7 @@ public void testConstructorsExistAndMatch() throws Exception { TabModelSelector.class, ToolbarManager.class, View.class, AppMenuDelegate.class, OneshotSupplier.class, ObservableSupplier.class, WebFeedSnackbarController.FeedLauncher.class, ModalDialogManager.class, - SnackbarManager.class, WebFeedBridge.class)); + SnackbarManager.class)); Assert.assertTrue(constructorsMatch("org/chromium/chrome/browser/tabmodel/ChromeTabCreator", "org/chromium/chrome/browser/tabmodel/BraveTabCreator", Activity.class, WindowAndroid.class, StartupTabPreloader.class, Supplier.class, boolean.class, From bae92dd5dc4a7fd0fb1616844883f3085e98f39c Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Tue, 8 Jun 2021 16:18:50 +0200 Subject: [PATCH 019/205] Fix failing farbling-related browser tests A small change upstream in the order in which command line parameters are propagated from the browser process to renderers means we can't inspect the renderer's parameteres in AppendExtraCommandLineSwitches() to search for switches::kTestType, but the browser process' parameters. Otherwise the seed used to instantiate the crypto::HMAC for farbling purposes will be non-deterministic for tests, causing test failures. More specifically, this change fixes the following 12 browser tests: * BraveContentSettingsAgentImplBrowserTest.FarbleGetImageData * BraveContentSettingsAgentImplV2BrowserTest.FarbleGetImageData * BraveDeviceMemoryFarblingBrowserTest.FarbleDeviceMemory * BraveNavigatorHardwareConcurrencyFarblingBrowserTest.FarbleNavigatorHardwareConcurrency * BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPlugins * BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPluginsBuiltin * BraveNavigatorPluginsFarblingBrowserTest.FarbleNavigatorPluginsReset * BraveNavigatorUserAgentFarblingBrowserTest.FarbleNavigatorUserAgent * BraveOffscreenCanvasFarblingBrowserTest.FarbleGetImageData * BraveWebAudioFarblingBrowserTest.FarbleWebAudio * BraveWebGLFarblingBrowserTest.FarbleGetParameterWebGL * BraveWebGLFarblingBrowserTest.FarbleGetParameterWebGL2 Chromium change: https://chromium.googlesource.com/chromium/src/+/f453a14bc7051fd3b90ab21fc460cba1fa9fd703 commit f453a14bc7051fd3b90ab21fc460cba1fa9fd703 Author: Bruce Dawson Date: Fri May 21 15:36:33 2021 +0000 Put --extension-process earlier on the command line The process type (--type, --utility-sub-type, and --extension-process) flags are useful for human beings looking at chrome command lines. Therefore they should be early, before the non-human-readable switches. Moving them early also avoids problems with them being trimmed by tools (such as ETW tracing) that have limits on the lengths of the command lines that they can record. This change will ensure that UIforETW can reliably identify extension processes and will aid human readers also. Bug: 1211558 --- browser/brave_content_browser_client.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index 9e97cf635386..63cb1aed35f6 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -418,7 +418,15 @@ void BraveContentBrowserClient::AppendExtraCommandLineSwitches( if (process_type == switches::kRendererProcess) { uint64_t session_token = 12345; // the kinda thing an idiot would have on his luggage - if (!command_line->HasSwitch(switches::kTestType)) { + + // Command line parameters from the browser process are propagated to the + // renderers *after* ContentBrowserClient::AppendExtraCommandLineSwitches() + // is called from RenderProcessHostImpl::AppendRendererCommandLine(). This + // means we have to inspect the main browser process' parameters for the + // |switches::kTestType| as it will be too soon to find it on command_line. + const base::CommandLine& browser_command_line = + *base::CommandLine::ForCurrentProcess(); + if (!browser_command_line.HasSwitch(switches::kTestType)) { content::RenderProcessHost* process = content::RenderProcessHost::FromID(child_process_id); Profile* profile = From 3d33c65ef66e908f318f7466520ac57e393a2829 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 9 Jun 2021 12:52:49 +0200 Subject: [PATCH 020/205] Allow access to individual 3P cookies when ephemeral storage is enabled Upstream now does single cookie-specific checks in some places to determine whether cookie access should be granted. However, when ephemeral storage is enabled, Brave shouldn't care about whether access is being requested for a specific cookie or not, so we simply return |true| if that's the case. This change fixes the following 13 browser tests: * BraveContentSettingsAgentImplBrowserTest.BlockThirdPartyCookieByDefault * BraveContentSettingsAgentImplBrowserTest.ChromiumCookieBlockOverridesBraveAllowCookiesIframe * BraveContentSettingsAgentImplBrowserTest.ExplicitBlock3PCookies * EphemeralStorageBrowserTest.ClosingTabClearsEphemeralStorage * EphemeralStorageBrowserTest.EphemeralStorageDoesNotLeakBetweenProfiles * EphemeralStorageBrowserTest.FirstPartyNestedInThirdParty * EphemeralStorageBrowserTest.NavigatingClearsEphemeralStorageAfterKeepAlive * EphemeralStorageBrowserTest.ReloadDoesNotClearEphemeralStorage * EphemeralStorageBrowserTest.StorageIsPartitioned * EphemeralStorageKeepAliveDisabledBrowserTest.NavigatingClearsEphemeralStorageWhenKeepAliveDisabled * EphemeralStorageTest.CrossSiteCookiesBlockedInitial * EphemeralStorageTest.CrossSiteCookiesBlockedThisPageDifferentSession * EphemeralStorageTest.CrossSiteCookiesBlockedThisPageSameSession Last, this CL also removes a patch for cookie_settings_base.h that can be avoided entirely via a #define in the chromium_src override file. Chromium change: https://chromium.googlesource.com/chromium/src/+/a50819a49ecf91b62ec9958355915e972eb89abd commit a50819a49ecf91b62ec9958355915e972eb89abd Author: cfredric Date: Tue Jun 1 18:34:53 2021 +0000 Rewrite callsites of IsCookieAccessAllowed that care about a single cookie. Rewriting these callsites allows us to eventually replace the implementation with one that takes per-cookie details into account when determining whether the cookie is accessible re: the user's cookie-blocking settings. Bug: 1203706 --- .../core/common/cookie_settings_base.h | 11 +++++--- .../services/network/cookie_settings.cc | 28 +++++++++++++++++++ .../services/network/cookie_settings.h | 20 +++++++++++++ .../network/restricted_cookie_manager.cc | 9 ++++++ ...s-core-common-cookie_settings_base.h.patch | 12 -------- 5 files changed, 64 insertions(+), 16 deletions(-) create mode 100644 chromium_src/services/network/cookie_settings.cc create mode 100644 chromium_src/services/network/cookie_settings.h delete mode 100644 patches/components-content_settings-core-common-cookie_settings_base.h.patch diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.h b/chromium_src/components/content_settings/core/common/cookie_settings_base.h index 42147aeeda1e..1520cfae9ea4 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.h +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.h @@ -24,8 +24,8 @@ class ScopedEphemeralStorageAwareness { } // namespace content_settings -#define BRAVE_COOKIE_SETTINGS_BASE_H \ - bool ShouldUseEphemeralStorage( \ +#define IsCookieSessionOnly \ + ShouldUseEphemeralStorage( \ const GURL& url, const GURL& site_for_cookies, \ const absl::optional& top_frame_origin) const; \ ScopedEphemeralStorageAwareness CreateScopedEphemeralStorageAwareness() \ @@ -46,10 +46,13 @@ class ScopedEphemeralStorageAwareness { const GURL& url, const GURL& site_for_cookies, \ const absl::optional& top_frame_origin) const; \ \ - mutable bool ephemeral_storage_aware_ = false; + mutable bool ephemeral_storage_aware_ = false; \ + \ + public: \ + bool IsCookieSessionOnly #include "../../../../../../components/content_settings/core/common/cookie_settings_base.h" -#undef BRAVE_COOKIE_SETTINGS_BASE_H +#undef IsCookieSessionOnly #endif // BRAVE_CHROMIUM_SRC_COMPONENTS_CONTENT_SETTINGS_CORE_COMMON_COOKIE_SETTINGS_BASE_H_ diff --git a/chromium_src/services/network/cookie_settings.cc b/chromium_src/services/network/cookie_settings.cc new file mode 100644 index 000000000000..94749421200b --- /dev/null +++ b/chromium_src/services/network/cookie_settings.cc @@ -0,0 +1,28 @@ +/* Copyright (c) 2021 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "services/network/cookie_settings.h" + +namespace network { + +bool CookieSettings::IsEphemeralCookieAccessible( + const net::CanonicalCookie& cookie, + const GURL& url, + const GURL& site_for_cookies, + const absl::optional& top_frame_origin) const { + // Upstream now do single cookie-specific checks in some places to determine + // whether cookie access should be granted. However, when ephemeral storage is + // enabled, Brave doesn't care about whether access is being requested for a + // specific cookie or not, so we simply return |true| if that's the case. + // See https://crrev.com/c/2895004 for the upstream change that required this. + if (IsEphemeralCookieAccessAllowed(url, site_for_cookies, top_frame_origin)) + return true; + + return IsCookieAccessible(cookie, url, site_for_cookies, top_frame_origin); +} + +} // namespace network + +#include "../../../../../../services/network/cookie_settings.cc" // NOLINT diff --git a/chromium_src/services/network/cookie_settings.h b/chromium_src/services/network/cookie_settings.h new file mode 100644 index 000000000000..d1bb761e76a0 --- /dev/null +++ b/chromium_src/services/network/cookie_settings.h @@ -0,0 +1,20 @@ +/* Copyright (c) 2021 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_CHROMIUM_SRC_SERVICES_NETWORK_COOKIE_SETTINGS_H_ +#define BRAVE_CHROMIUM_SRC_SERVICES_NETWORK_COOKIE_SETTINGS_H_ + +#define IsCookieAccessible \ + IsEphemeralCookieAccessible( \ + const net::CanonicalCookie& cookie, const GURL& url, \ + const GURL& site_for_cookies, \ + const absl::optional& top_frame_origin) const; \ + bool IsCookieAccessible + +#include "../../../../../../services/network/cookie_settings.h" + +#undef IsCookieAccessible + +#endif // BRAVE_CHROMIUM_SRC_SERVICES_NETWORK_COOKIE_SETTINGS_H_ diff --git a/chromium_src/services/network/restricted_cookie_manager.cc b/chromium_src/services/network/restricted_cookie_manager.cc index ee8f6f90ccee..ad2c3c419cea 100644 --- a/chromium_src/services/network/restricted_cookie_manager.cc +++ b/chromium_src/services/network/restricted_cookie_manager.cc @@ -14,9 +14,18 @@ #include "url/gurl.h" #include "url/origin.h" +// IsEphemeralCookieAccessible declared & defined via a chromium_src override +// for services/network/cookie_settings.{h,cc}. +#define IsCookieAccessible IsEphemeralCookieAccessible + +// IsEphemeralCookieAccessAllowed declared & defined via a chromium_src override +// for components/content_settings/core/common/cookie_settings_base.{h,cc}. #define IsCookieAccessAllowed IsEphemeralCookieAccessAllowed + #include "../../../../services/network/restricted_cookie_manager.cc" + #undef IsCookieAccessAllowed +#undef IsCookieAccessible namespace network { diff --git a/patches/components-content_settings-core-common-cookie_settings_base.h.patch b/patches/components-content_settings-core-common-cookie_settings_base.h.patch deleted file mode 100644 index 471a800ef104..000000000000 --- a/patches/components-content_settings-core-common-cookie_settings_base.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/components/content_settings/core/common/cookie_settings_base.h b/components/content_settings/core/common/cookie_settings_base.h -index ed5dd8ba2016476ab5b1d564d5e5ed87f9ce47ef..a707e531a207a4df63c3056c0ad4412c3c845f21 100644 ---- a/components/content_settings/core/common/cookie_settings_base.h -+++ b/components/content_settings/core/common/cookie_settings_base.h -@@ -175,6 +175,7 @@ class CookieSettingsBase { - // Determines whether |setting| is a valid content setting for legacy cookie - // access. - static bool IsValidSettingForLegacyAccess(ContentSetting setting); -+ BRAVE_COOKIE_SETTINGS_BASE_H - - private: - virtual ContentSetting GetCookieSettingInternal( From c1cd91de5f0748914da9d516318d1243b8077b85 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 8 Jul 2021 18:03:28 +0200 Subject: [PATCH 021/205] Adapt NetworkServiceNetworkDelegate to account for Ephemeral storage In the past, the call to CookieSettings::IsCookieAccessible() run from NetworkServiceNetworkDelegate::OnCanSetCookie() would handle ephemeral storage via the redefinition we have in the chromium_src override for CookieSettingsBase::IsCookieAccessAllowed(). However, CookieSettings::IsCookieAccessible() does not longer call now CookieSettingsBase::IsCookieAccessAllowed() but the recently-added function CookieSettings::IsHypotheticalCookieAllowed(), which follows a different logic and does not hit our chromium_src overrides. We need therefore to make sure that NetworkServiceNetworkDelegate does call our wrapper IsEphemeralCookieAccessible() method instead of IsCookieAccessible(), so that Ephemeral storage is accounted for properly, falling back to IsHypotheticalCookieAllowed() if needed. Chromium change: https://chromium.googlesource.com/chromium/src/+/aba4a46c62f5f3ec198e7b7bd8ac1bbd6c953d1d commit aba4a46c62f5f3ec198e7b7bd8ac1bbd6c953d1d Author: cfredric Date: Tue Jun 22 18:29:13 2021 +0000 Add new --sameparty-considered-first-party flag and logic. This flag will resolve https://github.com/cfredric/sameparty/issues/4, and will allow developers to test the eventual interaction of SameParty cookies and third-party-cookie-blocking. It causes SameParty cookies to not be blocked by the user's third-party-cookie-blocking settings, as they are considered first-party. Bug: 1203706 --- .../services/network/network_service_network_delegate.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chromium_src/services/network/network_service_network_delegate.cc b/chromium_src/services/network/network_service_network_delegate.cc index 4cdfe2318ab0..b4cc05fc556b 100644 --- a/chromium_src/services/network/network_service_network_delegate.cc +++ b/chromium_src/services/network/network_service_network_delegate.cc @@ -5,6 +5,9 @@ #include "services/network/network_service_network_delegate.h" +#include "services/network/cookie_settings.h" + +#define IsCookieAccessible IsEphemeralCookieAccessible #define OnCanGetCookies OnCanGetCookies_ChromiumImpl #define OnCanSetCookie OnCanSetCookie_ChromiumImpl @@ -12,6 +15,7 @@ #undef OnCanSetCookie #undef OnCanGetCookies +#undef IsCookieAccessible namespace network { From 255ba20a93d4aba595ee1d44122372b78f7f7297 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Tue, 6 Jul 2021 18:23:04 +0200 Subject: [PATCH 022/205] Adapt chromium_src override for cookie_settings_base for privacy mode The overrides we have in place redefine IsCookieAccessAllowed() but now we need to override IsFullCookieAccessAllowed() instead to achieve the same behaviour, plus include a couple of extra overrides while upstream hasn't completely migrated to IsFullCookieAccessAllowed(). This change fixes the following 3 browser tests: * BraveNetworkDelegateBrowserTest.ThirdPartyCookiesBlockedNestedFirstPartyIframe * BraveNetworkDelegateBrowserTest.ThirdPartyYesCookiesWpComInWordpressCom * BraveNetworkDelegateBrowserTest.ThirdPartyYesCookiesnWordpressComInWpCom Chromium change: https://chromium.googlesource.com/chromium/src/+/160c6fb00757dac09df8545ef7a2ae3bc15ea162 commit 160c6fb00757dac09df8545ef7a2ae3bc15ea162 Author: cfredric Date: Tue Jun 1 16:14:59 2021 +0000 Introduce IsFullCookieAccessAllowed and IsPrivacyModeEnabled. IsCookieAccessAllowed is being renamed to more closely fit its semantics, since there will soon be scenarios in which some cookies are sent, but IsCookieAccessAllowed would return false. IsPrivacyModeEnabled is being introduced because this caller is really concerned about *any* cookie being accessible, rather than having full access to cookies, so IsFullCookieAccessAllowed would give the wrong result in cases when some cookies are accessible and others are not. In particular, in the future we intend to support sending/setting SameParty cookies (in same-party contexts) even when third-party cookies are blocked. In such a situation, we do not want to enable privacy mode even though third-party cookies are blocked, since that would prevent SameParty cookies from being sent/set. This CL rewrites the following IsCookieAccessAllowed callsites: * PrivacySandboxSettings::IsFledgeAllowed * PrivacySandboxSettings::FilterFledgeAllowedParties * PrivacySandboxSettings::IsPrivacySandboxAllowedForContext * DurableStoragePermissionContext::DecidePermission * CookieControlsController::FirstPartyCookiesBlocked * signin::SettingsAllowSigninCookies * NetworkServiceNetworkDelegate::OnForcePrivacyMode * NetworkServiceNetworkDelegate::OnCanQueueReportingReport * NetworkServiceNetworkDelegate::OnCanSetReportingClient * NetworkServiceNetworkDelegate::OnCanUseReportingClient More callsites will be handled in subsequent CLs. Bug: 1203706 --- .../core/common/cookie_settings_base.cc | 31 +++++++++-- .../core/common/cookie_settings_base.h | 55 ++++++++++--------- 2 files changed, 57 insertions(+), 29 deletions(-) diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc index 24c2dc4268a1..3ea7a2911113 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc @@ -141,19 +141,34 @@ bool CookieSettingsBase::IsEphemeralCookieAccessAllowed( const absl::optional& top_frame_origin) const { auto scoped_ephemeral_storage_awareness = CreateScopedEphemeralStorageAwareness(); - return IsCookieAccessAllowed(url, site_for_cookies, top_frame_origin); + return IsFullCookieAccessAllowed(url, site_for_cookies, top_frame_origin); } +// TODO(mario): Remove once IsCookieAccessAllowed() gets removed upstream. bool CookieSettingsBase::IsCookieAccessAllowed( const GURL& url, const GURL& first_party_url) const { - return IsCookieAccessAllowed(url, first_party_url, absl::nullopt); + return IsFullCookieAccessAllowed(url, first_party_url); } +bool CookieSettingsBase::IsFullCookieAccessAllowed( + const GURL& url, + const GURL& first_party_url) const { + return IsFullCookieAccessAllowed(url, first_party_url, absl::nullopt); +} + +// TODO(mario): Remove once IsCookieAccessAllowed() gets removed upstream. bool CookieSettingsBase::IsCookieAccessAllowed( const GURL& url, const GURL& site_for_cookies, const absl::optional& top_frame_origin) const { + return IsFullCookieAccessAllowed(url, site_for_cookies, top_frame_origin); +} + +bool CookieSettingsBase::IsFullCookieAccessAllowed( + const GURL& url, + const GURL& site_for_cookies, + const absl::optional& top_frame_origin) const { if (ephemeral_storage_aware_ && ShouldUseEphemeralStorage(url, site_for_cookies, top_frame_origin)) { return true; @@ -166,8 +181,8 @@ bool CookieSettingsBase::IsCookieAccessAllowedImpl( const GURL& url, const GURL& site_for_cookies, const absl::optional& top_frame_origin) const { - bool allow = - IsChromiumCookieAccessAllowed(url, site_for_cookies, top_frame_origin); + bool allow = IsChromiumFullCookieAccessAllowed(url, site_for_cookies, + top_frame_origin); if (allow) return true; @@ -186,6 +201,14 @@ bool CookieSettingsBase::IsCookieAccessAllowedImpl( } // namespace content_settings +// TODO(mario): Remove once IsCookieAccessAllowed() gets removed upstream. #define IsCookieAccessAllowed IsChromiumCookieAccessAllowed + +#define IsFullCookieAccessAllowed IsChromiumFullCookieAccessAllowed + #include "../../../../../../components/content_settings/core/common/cookie_settings_base.cc" // NOLINT + +#undef IsFullCookieAccessAllowed + +// TODO(mario): Remove once IsCookieAccessAllowed() gets removed upstream. #undef IsCookieAccessAllowed diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.h b/chromium_src/components/content_settings/core/common/cookie_settings_base.h index 1520cfae9ea4..2092d7a69d16 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.h +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.h @@ -24,31 +24,36 @@ class ScopedEphemeralStorageAwareness { } // namespace content_settings -#define IsCookieSessionOnly \ - ShouldUseEphemeralStorage( \ - const GURL& url, const GURL& site_for_cookies, \ - const absl::optional& top_frame_origin) const; \ - ScopedEphemeralStorageAwareness CreateScopedEphemeralStorageAwareness() \ - const; \ - bool IsEphemeralCookieAccessAllowed(const GURL& url, \ - const GURL& first_party_url) const; \ - bool IsEphemeralCookieAccessAllowed( \ - const GURL& url, const GURL& site_for_cookies, \ - const absl::optional& top_frame_origin) const; \ - bool IsChromiumCookieAccessAllowed(const GURL& url, \ - const GURL& first_party_url) const; \ - bool IsChromiumCookieAccessAllowed( \ - const GURL& url, const GURL& site_for_cookies, \ - const absl::optional& top_frame_origin) const; \ - \ - private: \ - bool IsCookieAccessAllowedImpl( \ - const GURL& url, const GURL& site_for_cookies, \ - const absl::optional& top_frame_origin) const; \ - \ - mutable bool ephemeral_storage_aware_ = false; \ - \ - public: \ +#define IsCookieSessionOnly \ + ShouldUseEphemeralStorage( \ + const GURL& url, const GURL& site_for_cookies, \ + const absl::optional& top_frame_origin) const; \ + ScopedEphemeralStorageAwareness CreateScopedEphemeralStorageAwareness() \ + const; \ + bool IsEphemeralCookieAccessAllowed(const GURL& url, \ + const GURL& first_party_url) const; \ + bool IsEphemeralCookieAccessAllowed( \ + const GURL& url, const GURL& site_for_cookies, \ + const absl::optional& top_frame_origin) const; \ + bool IsChromiumFullCookieAccessAllowed(const GURL& url, \ + const GURL& first_party_url) const; \ + bool IsChromiumFullCookieAccessAllowed( \ + const GURL& url, const GURL& site_for_cookies, \ + const absl::optional& top_frame_origin) const; \ + bool IsChromiumCookieAccessAllowed(const GURL& url, \ + const GURL& first_party_url) const; \ + bool IsChromiumCookieAccessAllowed( \ + const GURL& url, const GURL& site_for_cookies, \ + const absl::optional& top_frame_origin) const; \ + \ + private: \ + bool IsCookieAccessAllowedImpl( \ + const GURL& url, const GURL& site_for_cookies, \ + const absl::optional& top_frame_origin) const; \ + \ + mutable bool ephemeral_storage_aware_ = false; \ + \ + public: \ bool IsCookieSessionOnly #include "../../../../../../components/content_settings/core/common/cookie_settings_base.h" From b229008db06999c7131f206fdfafaa2ab6c0f199 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 11 Jun 2021 12:37:27 +0200 Subject: [PATCH 023/205] Updated patches from Chromium 93.0.4530.5 to Chromium 93.0.4535.3. --- patches/build-config-android-config.gni.patch | 2 +- ...ld-config-android-internal_rules.gni.patch | 2 +- patches/build-config-android-rules.gni.patch | 2 +- patches/build-config-compiler-BUILD.gn.patch | 4 ++-- patches/chrome-BUILD.gn.patch | 24 +++++++++---------- patches/chrome-android-BUILD.gn.patch | 14 +++++------ ...rome-android-chrome_java_sources.gni.patch | 4 ++-- ...e-android-chrome_public_apk_tmpl.gni.patch | 4 ++-- ...me-browser-ChromeTabbedActivity.java.patch | 4 ++-- ...rome-browser-app-ChromeActivity.java.patch | 6 ++--- ...-browser-toolbar-ToolbarManager.java.patch | 6 ++--- ...owser-toolbar-top-ToolbarTablet.java.patch | 6 ++--- patches/chrome-browser-BUILD.gn.patch | 4 ++-- patches/chrome-browser-about_flags.cc.patch | 4 ++-- ...rowsing_data-browsing_data_bridge.cc.patch | 4 ++-- ...hrome-browser-browser_process_impl.h.patch | 4 ++-- ...wser-chrome_content_browser_client.h.patch | 4 ++-- .../chrome-browser-extensions-BUILD.gn.patch | 4 ++-- ...ponent_extension_resource_manager.cc.patch | 4 ++-- ...flags-android-chrome_feature_list.cc.patch | 4 ++-- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 ++--- ...ome-browser-profiles-profile_impl.cc.patch | 2 +- ...rowser-resources-extensions-BUILD.gn.patch | 10 ++++---- ...er-resources-extensions-item_list.js.patch | 4 ++-- ...wser-resources-extensions-manager.js.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 8 +++---- ...-browser-ui-android-toolbar-BUILD.gn.patch | 6 ++--- patches/chrome-browser-ui-browser.cc.patch | 6 ++--- patches/chrome-browser-ui-browser.h.patch | 2 +- ...rtup-startup_browser_creator_impl.cc.patch | 2 +- .../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 ++-- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 4 ++-- .../chrome-browser-ui-webui-about_ui.cc.patch | 2 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 ++-- ...-ui-webui-settings-people_handler.cc.patch | 8 +++---- ...ttings_localized_strings_provider.cc.patch | 4 ++-- ...bui-settings-site_settings_helper.cc.patch | 6 ++--- ...de_detector-upgrade_detector_impl.cc.patch | 4 ++-- ...s-components-web_app_shortcut_mac.mm.patch | 2 +- ...er-chrome_content_renderer_client.cc.patch | 4 ++-- ...rer-chrome_content_renderer_client.h.patch | 4 ++-- patches/chrome-test-BUILD.gn.patch | 4 ++-- ...t-android-java-res-values-dimens.xml.patch | 2 +- ...ore-browser-content_settings_pref.cc.patch | 2 +- ...licy-tools-generate_policy_source.py.patch | 6 ++--- patches/components-sync-driver-BUILD.gn.patch | 2 +- ...r_host-navigation_controller_impl.cc.patch | 8 +++---- ...-renderer_host-navigation_request.cc.patch | 6 ++--- ...lic-browser-content_browser_client.h.patch | 2 +- ...ontent-renderer-render_frame_impl.cc.patch | 4 ++-- ...ntent-renderer-render_thread_impl.cc.patch | 2 +- ...ons-browser-api-socket-tcp_socket.cc.patch | 4 ++-- ...r-api-web_request-web_request_api.cc.patch | 4 ++-- ...nsions-common-api-_api_features.json.patch | 2 +- ...common-api-_permission_features.json.patch | 4 ++-- patches/google_apis-google_api_keys.cc.patch | 4 ++-- ...-blink-key_system_config_selector.cc.patch | 4 ++-- patches/net-BUILD.gn.patch | 2 +- patches/net-cookies-canonical_cookie.cc.patch | 2 +- .../net-socket-socks5_client_socket.cc.patch | 2 +- .../sandbox-policy-win-sandbox_win.cc.patch | 2 +- ...preferences-tracked-device_id_win.cc.patch | 2 +- ...d_party-blink-renderer-core-BUILD.gn.patch | 2 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 2 +- ...tools-gritsettings-resource_ids.spec.patch | 4 ++-- ...rams_xml-histogram_suffixes_list.xml.patch | 4 ++-- ...ity-platform-ax_platform_node_mac.mm.patch | 4 ++-- patches/ui-views-controls-focus_ring.cc.patch | 6 ++--- 70 files changed, 152 insertions(+), 152 deletions(-) diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index 58c976fe4d60..d18b012dc579 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 652ea7429ada84e505478fda0d2dd73d385c88ea..3e9ab86aa360c76727302eae18790b53acb54675 100644 +index cbfbba928632a4538cc3b34c58e8ed6d49d0a49e..6f73712562d2bffe6d28f171358a74be90a9cf2c 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -3,6 +3,7 @@ diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index a055c52c9dee..220697841d83 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index 5fd989b35e4618b13be4c2b2adb87ead62c6e6e7..eeb5075f44dca6bd8006dc3f334db9ee71410bb2 100644 +index 11eb48cd2528b5afeafc36aabc05203c2a54156b..8f153547f6a54fb3a918bc9ffc3d6ebdd91b79f7 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -1949,6 +1949,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 068b3151b0bb..3c0a8075b638 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 c65ab979f7a43111e24799829a201da46ccf18ca..9aa137c0a532359bbc5f14f11f4b1c0590170990 100644 +index d33240dcbe17974c331d6915966c25295a3edaa8..a45746e67ab5fa4aef0cd99690779b0b0d4d1d93 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -476,6 +476,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 8093817693f8..994d6b73f343 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 96545ed8a9e5b78d4c34e2af5c702bb8b21e4b31..2c5d01807272aae1a608ac3673212bc485c6de04 100644 +index 39659dbd1be7312447db1d4bb8218dfc6985d928..a7a4005e4417c8c0ec9ef5a947d1434b69e84cba 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1729,6 +1729,7 @@ config("chromium_code") { +@@ -1733,6 +1733,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 79a88a8cdbf0..70e021e603e7 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b0386562ca9 100644 +index ac58c2e6696a3e8278dd9d017b4b9671e671edf6..69887e19000cf7610b690ec0a290115aa82c4198 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -169,6 +169,7 @@ if (!is_android && !is_mac) { +@@ -171,6 +171,7 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -10,7 +10,7 @@ index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b03 deps += [ ":chrome_dll", -@@ -442,11 +443,12 @@ if (is_win) { +@@ -444,11 +445,12 @@ if (is_win) { args += [ "--keystone=0" ] } } @@ -24,7 +24,7 @@ index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b03 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -464,6 +466,7 @@ if (is_win) { +@@ -466,6 +468,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -32,7 +32,7 @@ index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b03 if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -539,7 +542,7 @@ if (is_win) { +@@ -541,7 +544,7 @@ if (is_win) { args = [ "-b", @@ -41,7 +41,7 @@ index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b03 "-v", chrome_version_full, "-g", -@@ -613,6 +616,7 @@ if (is_win) { +@@ -615,6 +618,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -49,7 +49,7 @@ index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b03 } } -@@ -645,9 +649,11 @@ if (is_win) { +@@ -647,9 +651,11 @@ if (is_win) { "--scm=0", ] } @@ -61,7 +61,7 @@ index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b03 if (is_chrome_branded) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -674,6 +680,7 @@ if (is_win) { +@@ -676,6 +682,7 @@ if (is_win) { info_plist_target = ":chrome_helper_plist" } @@ -69,7 +69,7 @@ index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b03 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -1149,6 +1156,7 @@ if (is_win) { +@@ -1151,6 +1158,7 @@ if (is_win) { if (is_chrome_branded) { bundle_deps += [ ":preinstalled_apps" ] } @@ -77,7 +77,7 @@ index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b03 ldflags = [ "-compatibility_version", -@@ -1333,6 +1341,7 @@ if (is_win) { +@@ -1335,6 +1343,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -85,7 +85,7 @@ index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b03 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/app:shutdown_signal_handlers", -@@ -1435,12 +1444,13 @@ group("child_dependencies") { +@@ -1437,12 +1446,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -100,7 +100,7 @@ index 039bf6ff05e45e62e0e1595cedec6c816d8c72e5..af3595efc41943b3cd189853b22a2b03 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1494,6 +1504,7 @@ group("resources") { +@@ -1496,6 +1506,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 b97b3a3cef79..183f093e2417 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 93ac6234fd31a764c6e68cfc982fb63aaa68e955..6ce4b5f0cd6edb35016ac1a86666c5bdf8a886d4 100644 +index 1aad36edf87068b01ec3116d23ed7886bacbe66b..37ac351f198596e540ef310aab10b6402384f2e5 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -244,6 +244,7 @@ android_resources("chrome_app_java_resources") { @@ -17,8 +17,8 @@ index 93ac6234fd31a764c6e68cfc982fb63aaa68e955..6ce4b5f0cd6edb35016ac1a86666c5bd + deps += brave_chrome_java_deps srcjar_deps = [ - ":chrome_android_java_enums_srcjar", -@@ -609,6 +611,7 @@ android_library("chrome_java") { + ":autofill_verification_status_generated_enum", +@@ -610,6 +612,7 @@ android_library("chrome_java") { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -26,7 +26,7 @@ index 93ac6234fd31a764c6e68cfc982fb63aaa68e955..6ce4b5f0cd6edb35016ac1a86666c5bd # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -728,6 +731,7 @@ java_group("chrome_all_java") { +@@ -729,6 +732,7 @@ java_group("chrome_all_java") { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -34,7 +34,7 @@ index 93ac6234fd31a764c6e68cfc982fb63aaa68e955..6ce4b5f0cd6edb35016ac1a86666c5bd } # This is a list of all base module jni headers. New features should add their -@@ -768,6 +772,7 @@ group("jni_headers") { +@@ -769,6 +773,7 @@ group("jni_headers") { "//components/ukm/android:jni_headers", "//components/webauthn/android:jni_headers", ] @@ -42,7 +42,7 @@ index 93ac6234fd31a764c6e68cfc982fb63aaa68e955..6ce4b5f0cd6edb35016ac1a86666c5bd } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2033,6 +2038,7 @@ if (current_toolchain == default_toolchain) { +@@ -2034,6 +2039,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -50,7 +50,7 @@ index 93ac6234fd31a764c6e68cfc982fb63aaa68e955..6ce4b5f0cd6edb35016ac1a86666c5bd if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2426,6 +2432,7 @@ android_library("base_module_java") { +@@ -2427,6 +2433,7 @@ android_library("base_module_java") { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 218cae638c1e..0844508f379c 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 97a4f17fa8cd7d888b690a473f0e4178524dac62..b7a21df158b30c50d6586f72ff2c1a9d1f83ee63 100644 +index 28416eadd09cd549562d30a2f9971c584cd890b0..e05e47b775918397d71423906dc4b35b573adf3e 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1400,3 +1400,4 @@ chrome_java_sources = [ +@@ -1402,3 +1402,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 9f5f9ee142b3..b01077800edc 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index f1cb16bf5c2e81bae7fc71b861492534ae0aacbb..5470138922a183569d4c0df81ae1b1063540ca7c 100644 +index c485c30a712325ffb56f53da7a4633534d95d758..c2a5fb5dafeb55a535211f78ffb7680dce445604 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni @@ -168,6 +168,7 @@ template("chrome_public_common_apk_or_module_tmpl") { @@ -10,7 +10,7 @@ index f1cb16bf5c2e81bae7fc71b861492534ae0aacbb..5470138922a183569d4c0df81ae1b106 if (!_is_monochrome) { product_config_java_packages = [ "org.chromium.chrome.browser" ] -@@ -250,6 +251,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -235,6 +236,7 @@ template("chrome_public_common_apk_or_module_tmpl") { if (!defined(proguard_configs)) { proguard_configs = [] } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index aa310bf8c6bc..287455a0fc4c 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index b520750c6e3cf7b28a36ccdecb1debfe3bc67733..d57e224475f61e95bfe6218b54d415e309acd350 100644 +index 0f4d292493de356e2211f33d47b4be2c2f4c6ab5..a78e94f95980ad9f45a148c692d52266af2e7a25 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2290,6 +2290,7 @@ public class ChromeTabbedActivity extends ChromeActivity - new ArrayList<>(); +@@ -375,7 +375,7 @@ public abstract class ChromeActivity + private ShareRegistrationCoordinator mShareRegistrationCoordinator; protected ChromeActivity() { - mIntentHandler = new IntentHandler(this, createIntentHandlerDelegate()); 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 edb69a707625..a17144095d72 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 61633ff533723fc64c2d510d1caa416c94a180ad..4d863d009ab4b94030aafdb6ea3f44a66bbee546 100644 +index ff4b27194a5ec8113fb5885593b4113ad103c866..5323439759637c9ea0f2ffc718da447d7150067a 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 -@@ -489,13 +489,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -488,13 +488,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve boolean isCustomTab = toolbarLayout instanceof CustomTabToolbar; ThemeColorProvider menuButtonThemeColorProvider = isCustomTab ? mCustomTabThemeColorProvider : browsingModeThemeColorProvider; @@ -18,7 +18,7 @@ index 61633ff533723fc64c2d510d1caa416c94a180ad..4d863d009ab4b94030aafdb6ea3f44a6 appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mWindowAndroid, (focus, type) -> setUrlBarFocus(focus, type), -@@ -923,7 +923,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -935,7 +935,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled, boolean isTabGroupsAndroidContinuationEnabled) { // clang-format off diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch index deece29f2921..cbd083eded53 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -index 99665e621607f9096a2721c9b07c6b778eb4e6c1..9011f11f81c0c234bb41c6ecf94af54d8e8e2c4f 100644 +index ce0ea0b4c7022f16105513555a13a8a0b1a00ed0..3ed6ad46619ddbe626a41b9cc2719fe7fef0b7d0 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java @@ -60,7 +60,7 @@ import java.util.Collection; @@ -11,7 +11,7 @@ index 99665e621607f9096a2721c9b07c6b778eb4e6c1..9011f11f81c0c234bb41c6ecf94af54d implements OnClickListener, View.OnLongClickListener, TabCountObserver { private HomeButton mHomeButton; private ImageButton mBackButton; -@@ -315,10 +315,12 @@ public class ToolbarTablet extends ToolbarLayout +@@ -316,10 +316,12 @@ public class ToolbarTablet extends ToolbarLayout DownloadUtils.downloadOfflinePage(getContext(), getToolbarDataProvider().getTab()); RecordUserAction.record("MobileToolbarDownloadPage"); } @@ -24,7 +24,7 @@ index 99665e621607f9096a2721c9b07c6b778eb4e6c1..9011f11f81c0c234bb41c6ecf94af54d String description = null; Context context = getContext(); Resources resources = context.getResources(); -@@ -384,6 +386,7 @@ public class ToolbarTablet extends ToolbarLayout +@@ -385,6 +387,7 @@ public class ToolbarTablet extends ToolbarLayout textBoxColor, PorterDuff.Mode.SRC_IN); mLocationBar.updateVisualsForState(); diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index df70ab33d9d9..182b09c930f8 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 b4acb5dd3862e8411bfb00a99168e69822be0d53..6feb47adc70873c7457e1ff5bb04bb4d6cdf0aea 100644 +index 29691cfbd621cb6fab1c22ad8e344ea8bfda863d..dcb59ce12922a79665c7716317c0aa74b119b143 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2474,6 +2474,7 @@ static_library("browser") { +@@ -2465,6 +2465,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 598dad3e87aa..92c9b6f5181a 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 0bef22b4326fcf5a31e521017959764f191cd6a8..0a0a515206a50f5f4486a12396c1a111e2475fe7 100644 +index 20d44cff308d4d2709e407c195c2d5647516358c..775b653c397f93c0f9a34cba1d95614d7e1c2b01 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -309,14 +309,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { @@ -21,7 +21,7 @@ index 0bef22b4326fcf5a31e521017959764f191cd6a8..0a0a515206a50f5f4486a12396c1a111 const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -7217,6 +7217,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7213,6 +7213,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-android-browsing_data-browsing_data_bridge.cc.patch b/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch index 10bf1b6d54c7..0d56866133e5 100644 --- a/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch +++ b/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc -index 51357a0433ca95f709d51611d20e3bf2f408cf8e..c6c8725704761d89fe6da34568f7742968923c1d 100644 +index cf4c0a5ff7ca236995ab41ee6963bc64ec850847..2de768934ca1fb8c69a6f37b82c78934017edf8d 100644 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc -@@ -126,6 +126,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData( +@@ -125,6 +125,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData( remove_mask |= chrome_browsing_data_remover::DATA_TYPE_CONTENT_SETTINGS; break; case browsing_data::BrowsingDataType::DOWNLOADS: diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index 72e7a1b82812..b0f19831f889 100644 --- a/patches/chrome-browser-browser_process_impl.h.patch +++ b/patches/chrome-browser-browser_process_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h -index 0ee317e90a2c7c92d74168b08f6cf4e9b5e6efcc..cc98c8b00eb19dbe2158dec98f44c61eb321e4e8 100644 +index e9c1273a3aa8372efce98520e63469a832f97e32..56a639eccbf49c983f290d583f6d22cb3589f133 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -205,6 +205,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -209,6 +209,7 @@ class BrowserProcessImpl : public BrowserProcess, static void RegisterPrefs(PrefRegistrySimple* registry); private: diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index edabb8f9ca2d..8f1711493387 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 b0d91a2678334921425ea526000dafa7c4fffd11..a4d50acccf8091ed9f7a79ebf6ed6ec7a64ad984 100644 +index 0dd59b011e8b5a2244caa0950f275a3ff52230f0..59687cad37b019d998e11d7db095e0ee73e08515 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -747,6 +747,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -752,6 +752,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index 7155b1d9782c..44d70dd9f335 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 0582dce1cf7d97cec4026c3e5005fc0248bac22c..2ed0c6ea19478161a744f0a28eb25cbe6a64184f 100644 +index ed3363ad668d2f56a7040222d447ff516d0303ee..5af7f45f2d96f4ce324ba4a4fd6e891955ac5490 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1310,6 +1310,7 @@ static_library("extensions") { +@@ -1309,6 +1309,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 f748a7d1741b..b0c4e31510e9 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 e56ca286b7d7a75e088e084be0558702753a0f9a..f301c4645867bd4ad9a78dfc1858c5314dc7a3b9 100644 +index f9d62291a24a56ee8410562c8ec0a77d51fd7ee9..26ec609bbac2d93ef5995b0ec43601062ddc6098 100644 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc -@@ -145,6 +145,7 @@ ChromeComponentExtensionResourceManager::Data::Data() { +@@ -144,6 +144,7 @@ ChromeComponentExtensionResourceManager::Data::Data() { std::move(pdf_viewer_replacements); } #endif 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 f6588a08a1ae..661df8f0033e 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 762e84bd405cacba08df2ebf724cd73d86035675..5cb274d7a2237f7661feaad16e0b06d4cf9ac12a 100644 +index f204c09ed3f3df33bc0c0fecd2d399321b7df0e1..d77b5d00d68cb49c74fc42479a3e3ad92d5a82f5 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -320,6 +320,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -315,6 +315,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 61dbd73eab32..57d3106f2318 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 e69c5fd1c25e5159532bcf4dd862771d7a646bfb..2086e442fc52ada6f2452c94a77cf4467799331e 100644 +index 72de75a0d5f6400f3613663d5550432318dcc352..84436cc2475ef70c55fd851604facedbdbafbee4 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -933,6 +933,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -943,6 +943,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index e69c5fd1c25e5159532bcf4dd862771d7a646bfb..2086e442fc52ada6f2452c94a77cf446 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1224,6 +1225,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1231,6 +1232,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index c23fe76df186..76cd37986c9e 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 0f051ffa90eb297243e9f551d7e4d8d227239727..0af2d7dd24b0345d5509985a0fe774431dd32ec2 100644 +index 3fd507a3ed6f760b6fd37368360049fa0a488fc1..b605d0b44f388974d399f2c7412e7f4cddeb9fa2 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -407,7 +407,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch index 3d719e4a4e33..3d7fecfa9045 100644 --- a/patches/chrome-browser-resources-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-resources-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn -index d4cbf4e99d6f7770fb36c5669e0c80dbb1bd1740..6f1999325ac761ad40658c40bd78c09d986ba38d 100644 +index bae9844d79099b625f39423cfaaa2a5296456eab..9c21ff78077e61474d27f8b19a4f700ec99bdc69 100644 --- a/chrome/browser/resources/extensions/BUILD.gn +++ b/chrome/browser/resources/extensions/BUILD.gn -@@ -34,6 +34,7 @@ if (optimize_webui) { +@@ -33,6 +33,7 @@ if (optimize_webui) { "../../../../ui/webui/resources:preprocess", ] excludes = [ "chrome://resources/js/cr.m.js" ] @@ -10,9 +10,9 @@ index d4cbf4e99d6f7770fb36c5669e0c80dbb1bd1740..6f1999325ac761ad40658c40bd78c09d } } -@@ -61,6 +62,7 @@ generate_grd("build_grd") { - "$target_gen_dir/$preprocess_gen_manifest", - ] +@@ -54,6 +55,7 @@ generate_grd("build_grd") { + deps = [ ":build_ts" ] + manifest_files = [ "$target_gen_dir/tsconfig.manifest" ] } + deps += [ "//brave/browser/resources/extensions:resources" ] } diff --git a/patches/chrome-browser-resources-extensions-item_list.js.patch b/patches/chrome-browser-resources-extensions-item_list.js.patch index 8954a6a1861a..5caabf794e38 100644 --- a/patches/chrome-browser-resources-extensions-item_list.js.patch +++ b/patches/chrome-browser-resources-extensions-item_list.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/extensions/item_list.js b/chrome/browser/resources/extensions/item_list.js -index 7e990d486b94c9ffb1c2c08f55c0e14245e70370..d17f521761d5df71f9d671999a142825c48f94a8 100644 +index 5d6a46444e43d229c34654d87e3eb1ee7d4238e4..016a8d930714eca663a03e2d2d1f18fe9c1168c6 100644 --- a/chrome/browser/resources/extensions/item_list.js +++ b/chrome/browser/resources/extensions/item_list.js -@@ -13,6 +13,7 @@ import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-annou +@@ -14,6 +14,7 @@ import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-annou import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {ItemDelegate} from './item.js'; diff --git a/patches/chrome-browser-resources-extensions-manager.js.patch b/patches/chrome-browser-resources-extensions-manager.js.patch index 11ae12be97aa..7ce2f7813100 100644 --- a/patches/chrome-browser-resources-extensions-manager.js.patch +++ b/patches/chrome-browser-resources-extensions-manager.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/extensions/manager.js b/chrome/browser/resources/extensions/manager.js -index 3ef910e4fda823c05236ae2e807be178874d32c3..45ef27ff9aa429711a06f11fedc6fbadf36b494c 100644 +index 969b3e9335f9ea272a2060da9b9741211b8ce61b..9478bd84fc14e64b948b12dbc65894a2115ead51 100644 --- a/chrome/browser/resources/extensions/manager.js +++ b/chrome/browser/resources/extensions/manager.js @@ -5,7 +5,6 @@ diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 43b383166bb9..07338a0f0448 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,16 +1,16 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index e5f42e0b9d71f83dc0aaf524ce032b2f5240a0bb..ce0cfc9ea2768ceea51d5e1748097c536cfb27df 100644 +index 71c55fc44dc45fbf2fecd24b4fe326137424caaf..39c70bc6a2e7f28ee6b2cbce20c9bb0cb6ad0f99 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -601,6 +601,7 @@ static_library("ui") { - "//ui/webui/resources/cr_components/customize_themes:mojom", +@@ -603,6 +603,7 @@ static_library("ui") { + "//ui/webui/resources/cr_components/most_visited:mojom", "//v8:v8_version", ] + deps+= [ "//brave/browser/ui" ] # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -3407,10 +3408,13 @@ static_library("ui") { +@@ -3412,10 +3413,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index 9ba1e8ccb4e8..3a3bda720cc9 100644 --- a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn -index dde7c39bc7bf5cf94050bd02fdf9891990c26ad4..97da769a19622870050b3336c88d737a02f1dc8e 100644 +index dee5afb4a336f1df86748123dc4fdbdb6480c5fc..3fa48c5d44663cbf0b60d210abff7d5ead42446e 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -67,6 +67,7 @@ android_library("java") { +@@ -66,6 +66,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java", "java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java", ] + sources += brave_browser_ui_android_toolbar_sources - + deps = [ ":java_resources", diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index c296006e3dea..2d25365984ef 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 268f6547ff84b14c8f35afe36fcc3a46df65fdc9..04b2047f2aaa560ff4bfdf4b4f26db22262100b8 100644 +index 335611dcad36ab2bf058015321a9a72d8f77989b..d0034ed4502d72d467800361011703dfed1261bd 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -441,6 +441,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { +@@ -442,6 +442,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { // static Browser* Browser::Create(const CreateParams& params) { CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -10,7 +10,7 @@ index 268f6547ff84b14c8f35afe36fcc3a46df65fdc9..04b2047f2aaa560ff4bfdf4b4f26db22 return new Browser(params); } -@@ -452,7 +453,7 @@ Browser::Browser(const CreateParams& params) +@@ -453,7 +454,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 1f3a989316c1..3c96e55361c8 100644 --- a/patches/chrome-browser-ui-browser.h.patch +++ b/patches/chrome-browser-ui-browser.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h -index 946c447afbde10c3136e8f13c3aaaa6333cc0153..ec1899705762d852486173fef7f84cf85e5eb827 100644 +index 25422f4bbe93f0bb31f88c2e11cd79e95d1845dd..1ce47d1d0d392d62f4880b771cccef922c1a5dd1 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -697,6 +697,7 @@ class Browser : public TabStripModelObserver, 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 a2880b36bfdc..42880ca74aa2 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,5 +1,5 @@ diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -index d813c2a698c7dd6f0ca2155b2a9c68e40c3844a3..0a64e6e8e615591e70e1044e64634a00bfd6debd 100644 +index eb05e1b9fe54aba80bcd4d8cc52e11349bc5d9c3..5cd403df73226e60248a2ab7960d0246426905a9 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -375,6 +375,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index 02d892e8e0b9..be6ab8eee3d3 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 23b9226c943ab92fb3ad349a57e9230fb58efa11..98a3c44ea97e70fbc142ed7075afb1188626fe34 100644 +index 1addd2c03c828334dfbc0e394f0657ca884548a1..940326e01b128db164d6068ecef8cc28e10cea95 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -495,4 +495,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -498,4 +498,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 1fbdabe65e64..ef07a6eee354 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 4e2a3e62cae96533853973ef059d3e42e90745b8..7ab4ee52ceb9c4cdc90c864e213d090cf4057e0d 100644 +index b7258e2d3563da0d71736c65b03769e765dc8641..7e32575a6f96586439db337bcba09dd60b7afe3e 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -600,6 +600,7 @@ class TabStripModel : public TabGroupController { +@@ -601,6 +601,7 @@ class TabStripModel : public TabGroupController { // Serialise this object into a trace. void WriteIntoTrace(perfetto::TracedValue context) 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 70781660477b..9a662660e869 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 cbfa041bea8bfb1fae6c5037b057ce7822c02be0..f4b20f8bf20ce8480868ca1d4f6afe6f04e97003 100644 +index ddebb0b6bb41eb76fd10d45b92d037dd4b5d69af..c00722a2472a35876d59b540b67aa55df9ed4e3d 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -833,6 +833,7 @@ void BookmarkBarView::Layout() { +@@ -832,6 +832,7 @@ void BookmarkBarView::Layout() { x = next_x; } } diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 42983b10a8c7..538e19118470 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index b80a9dc170565dda1644e406abfae98e6b620992..ec30575c657768e56a09a7ec47b2e18a60b8598b 100644 +index eab58689553750700f0b770910cd47c9dc28b8b4..99b56213735795497eecc4b33c2ba4eacb14b243 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -342,6 +342,7 @@ void ToolbarView::Init() { +@@ -341,6 +341,7 @@ void ToolbarView::Init() { } else { // TODO(crbug.com/932818): Remove this once the // |kAutofillEnableToolbarStatusChip| is fully launched. diff --git a/patches/chrome-browser-ui-webui-about_ui.cc.patch b/patches/chrome-browser-ui-webui-about_ui.cc.patch index 54dce3041537..11550c028765 100644 --- a/patches/chrome-browser-ui-webui-about_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-about_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc -index e04c83a8031397dd54088e1ea565227dc33a3a47..9f2bcc20dc12c34fbb0843d81724de04cb274ceb 100644 +index a199e567d216242d41708e68e7b1e0ec18808d76..a62460e53511bfa6047371ca26756aca8f608c78 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -579,6 +579,7 @@ std::string ChromeURLs() { 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 af375a09ac44..8a6e1bfd8dff 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,8 +1,8 @@ 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 4a2a142a6b7de37f1a444875f926ac44d2b6bd62..d53cfc8faba45b13801386f9f60b18ed36c9611f 100644 +index 8be071404bfff0f204f390d037d41352ce3b4d76..9102779d792d4914b1f2417e3cfdc47537cefe67 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1175,6 +1175,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1181,6 +1181,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { 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 ce067511fa74..81e91ac3e443 100644 --- a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc -index b22eecdc9aa8ead324f191e0c8289a31627a8aa0..b24f899a6e403c715185099e174c1bf9731f347d 100644 +index 35113af5b7de4af12803fb5f941a68e4ef308219..db32ddb1d39a4fa203f33cc2cb5e6f2e440f21f9 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -865,6 +865,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { +@@ -862,6 +862,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { void PeopleHandler::BeforeUnloadDialogCancelled() { // The before unload dialog is only shown during the first sync setup. @@ -10,7 +10,7 @@ index b22eecdc9aa8ead324f191e0c8289a31627a8aa0..b24f899a6e403c715185099e174c1bf9 DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount( signin::ConsentLevel::kSync)); syncer::SyncService* service = GetSyncService(); -@@ -915,6 +916,7 @@ std::unique_ptr PeopleHandler::GetSyncStatusDictionary() +@@ -912,6 +913,7 @@ std::unique_ptr PeopleHandler::GetSyncStatusDictionary() service && !disallowed_by_policy && service->IsSetupInProgress() && !service->GetUserSettings()->IsFirstSetupComplete() && identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)); @@ -18,7 +18,7 @@ index b22eecdc9aa8ead324f191e0c8289a31627a8aa0..b24f899a6e403c715185099e174c1bf9 const sync_ui_util::StatusLabels status_labels = sync_ui_util::GetStatusLabels(profile_); -@@ -1067,6 +1069,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { +@@ -1064,6 +1066,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { } bool PeopleHandler::IsProfileAuthNeededOrHasErrors() { 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 3023a045dbb2..ac411322721b 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 373a81f6a619801f180987cf3cf576f79be625ed..eaa0eb30f75ecdbce8446e784a419fab94a8f3ac 100644 +index ea433770e4d8723289b450e4551df7688343f65c..a86dc8ab2c11b668715bd0b0c4cff11961d880fa 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2678,6 +2678,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2685,6 +2685,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 79a82706b6bb..7d75a207f9d2 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,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index b4dcf0a97cb5a1f61352f29a4db633eba55715ac..55c990cc7cbe6692864ea99948f9ec7956c0eb4c 100644 +index 783168496a670a06aa83f11a5f058ecc526896ad..8834cfb9f93465ec63dab8a90a0cec94392193ba 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -154,6 +154,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { +@@ -159,6 +159,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { {ContentSettingsType::DISPLAY_CAPTURE, nullptr}, {ContentSettingsType::FEDERATED_IDENTITY_SHARING, nullptr}, {ContentSettingsType::FEDERATED_IDENTITY_REQUEST, nullptr}, @@ -10,7 +10,7 @@ index b4dcf0a97cb5a1f61352f29a4db633eba55715ac..55c990cc7cbe6692864ea99948f9ec79 }; static_assert(base::size(kContentSettingsTypeGroupNames) == -@@ -377,6 +378,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -382,6 +383,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { } ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) { diff --git a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch index 14b64bee54ff..1e88eb6a9f18 100644 --- a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch +++ b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -index 34dafcc8609a4cbcbe4a3ee297296644d4550404..e126b9b14bc5c430e512afc1a369c062cab6d82d 100644 +index aacd6bdc7aec948b4ec6a5378163d818fcca6452..ffff132be16136f71993c5124a3f7d52c7d25590 100644 --- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -@@ -457,7 +457,7 @@ void UpgradeDetectorImpl::Init() { +@@ -475,7 +475,7 @@ void UpgradeDetectorImpl::Init() { // On Windows, only enable upgrade notifications for Google Chrome builds. // Chromium does not use an auto-updater. #if !defined(OS_WIN) || BUILDFLAG(GOOGLE_CHROME_BRANDING) || \ 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 78ab45deff7b..33850fdbcb05 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 631e9605aab69e124982fa5b52c638541e54fefa..96013dacb8ca3c47eca51144b2a517df74834432 100644 +index 92bc8dce8478810159dc88fa4ed99eacd0cd558c..7cbe71bf79bb8f3bdf1aa925b54fee8b49cc8410 100644 --- a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm +++ b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm @@ -763,6 +763,7 @@ base::FilePath GetChromeAppsFolder() { diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index 79778cd1fbb9..86b4c60951d9 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 21bc479c64b31293c498391da3ebcfdfe0bde9c8..28e62d3895d93838a468fe99fea21d860caae781 100644 +index 9b520e164c548bc48c2d0e2b861b74c8532a3952..095954a794f94d51f7546b1ad199e63743899402 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -513,7 +513,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -518,7 +518,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 20f41723155a..0b8f1becc856 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.h.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h -index 4fb3926576c80881a9230bb91bfe7655fec12df1..1cf767b9a63d078f47b8017710dda47498f79f3f 100644 +index 0b9f4e64d09774b1a249eac0b17a6519effd156c..cada52b00c16e18bde3308c0f3b38e720c404710 100644 --- a/chrome/renderer/chrome_content_renderer_client.h +++ b/chrome/renderer/chrome_content_renderer_client.h -@@ -220,6 +220,7 @@ class ChromeContentRendererClient +@@ -224,6 +224,7 @@ class ChromeContentRendererClient #endif private: diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 7898a47f3e0c..5000c1aa3803 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 081cb42207daad824a12ea8b5c709387a3a0832a..591cf64b7e3a6d957e393c4441596b85c92f93a1 100644 +index 1d849f6140e7a8f1d39bb3161644fbbdddeca833..14cb243f68877e74089ab808c7131f1198d53cfe 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1207,6 +1207,7 @@ if (!is_android) { +@@ -1229,6 +1229,7 @@ if (!is_android) { "//v8", ] diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch index e476d6a4f8f1..596ae4141032 100644 --- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch +++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml -index 5233ea8275c13856f7098863401b60bf8e20e435..6719ecbb698aa6b5ae801460754fb5b011e3ed5c 100644 +index 126a93277ed4bcc2b35b7120da0a52141ee5f59b..57a6f9ba60f65b108665166c6ab8a317116c0ea5 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml @@ -64,7 +64,7 @@ diff --git a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch index d1623c7b44a4..376e38bf9258 100644 --- a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc -index df9136ae2c1fc442d927e3e582a9f3ce087ca647..35de016bac5ac6af07d058ad6a91113a77a46b22 100644 +index 6144f3552a4c2497d4c5ba8cbc17fdd185903fdf..d1dce3680e5e2bd62e4aecd7cff5912554c5103b 100644 --- a/components/content_settings/core/browser/content_settings_pref.cc +++ b/components/content_settings/core/browser/content_settings_pref.cc @@ -160,6 +160,7 @@ bool ContentSettingsPref::SetWebsiteSetting( diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch index b61fc570833b..bb8591a8fc41 100644 --- a/patches/components-policy-tools-generate_policy_source.py.patch +++ b/patches/components-policy-tools-generate_policy_source.py.patch @@ -1,8 +1,8 @@ diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py -index db57ccfb60149631b8161be7bc76c2c2d703cc71..f4c2e7e4e7cc6425a10bbd569649a9701e795785 100755 +index e59592e6e41b47fd6fe730931671d29b1c4ef641..ac1ea91b5cae82ac0e105cbe81ccb8fe9eed4f7d 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py -@@ -43,6 +43,7 @@ PLATFORM_STRINGS = { +@@ -54,6 +54,7 @@ PLATFORM_STRINGS = { 'chrome.win7': ['win'] } @@ -10,7 +10,7 @@ index db57ccfb60149631b8161be7bc76c2c2d703cc71..f4c2e7e4e7cc6425a10bbd569649a970 class PolicyDetails: """Parses a policy template and caches all its details.""" -@@ -354,6 +355,7 @@ def main(): +@@ -365,6 +366,7 @@ def main(): chrome_major_version = ParseVersionFile(version_path) template_file_contents = _LoadJSONFile(template_file_name) diff --git a/patches/components-sync-driver-BUILD.gn.patch b/patches/components-sync-driver-BUILD.gn.patch index 9c5cf50e6b8f..3d272bc5877d 100644 --- a/patches/components-sync-driver-BUILD.gn.patch +++ b/patches/components-sync-driver-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/driver/BUILD.gn b/components/sync/driver/BUILD.gn -index 9b6db577a7b936b771c0c49f38297c38c2f7ea69..b7179f9e14236d466c622c55f495c5452d8ffa22 100644 +index a70a0cd53d6ca4fcc5ae7782061339ef29e067a8..d77b88576d80145f586cff4980de11e89733630e 100644 --- a/components/sync/driver/BUILD.gn +++ b/components/sync/driver/BUILD.gn @@ -107,6 +107,7 @@ static_library("driver") { diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index eae9cd97c811..c945f12d4673 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 162cc8e66522cd51ab117f51296b30c7a2ae54a9..5555893e2d94e8ad783cbb22b3dac42cc1d85c0f 100644 +index 756ed3dd4e78ce17bcd281636cfb1bdde2451528..2cb7255d262e7766599e4a1e5ac462e611aef522 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3133,16 +3133,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3134,16 +3134,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. @@ -17,9 +17,9 @@ index 162cc8e66522cd51ab117f51296b30c7a2ae54a9..5555893e2d94e8ad783cbb22b3dac42c DiscardPendingEntry(false); return nullptr; } - + - HandleRendererDebugURL(node, params.url); + HandleRendererDebugURL(node, url); return nullptr; } - + diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 182276912e75..6cf13fbb150d 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 9dc530e077fff80666df94b9ecd6ee8c24fb42d5..79e6fe897e86fdd66e2896bee639e7e05892dfc9 100644 +index 8974f4ea4041c9ed75b833f3c063f857ba85fc00..dd0eda6820ea828785043b5e85f982a4aad8c25e 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2170,6 +2170,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2157,6 +2157,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 9dc530e077fff80666df94b9ecd6ee8c24fb42d5..79e6fe897e86fdd66e2896bee639e7e0 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -3341,6 +3342,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -3329,6 +3330,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index 7cbbe7aa5dba..a7b284b3491f 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,5 +1,5 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 09ce07d6501e1c651cf3ae76e4687650bb0c6f18..1f33cc24fcda50cfafa6c48e84e1d79c91ae6af2 100644 +index 7dd2b78088759ffdd80c33cd529adbb93215334f..ce5dc0599e3dc166a9e7b9c61ade3bf9f6a9fb30 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -1868,6 +1868,7 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index 8778ec9e30f5..294f8e6415b8 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 08d697c611363155d3b6230b3e994ac456fb843b..b99bc1cd9cb77889902d8d9828397a6fefe909a7 100644 +index 031f052207aaec4bfde791e7d5b54ef982834559..2d1a7cf9ab59519f8f60223ddc97ea848f4c750a 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4334,6 +4334,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4338,6 +4338,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index 968cec78cf9b..bb3d214feec6 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index a61bf4dbeae9846b834372c734118119bf91e873..3d06c149d07f2f5eda4dd037d84fc3af88b7df76 100644 +index 32dd9d006c4d4301fc2272e2e942f0a46ebd4060..98cc75fdc3941d703f51139af85d6f1ff6a8e79b 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -949,6 +949,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { diff --git a/patches/extensions-browser-api-socket-tcp_socket.cc.patch b/patches/extensions-browser-api-socket-tcp_socket.cc.patch index c46d0a09671e..920b6661e9e8 100644 --- a/patches/extensions-browser-api-socket-tcp_socket.cc.patch +++ b/patches/extensions-browser-api-socket-tcp_socket.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/socket/tcp_socket.cc b/extensions/browser/api/socket/tcp_socket.cc -index 0ae69cf6125ac63b284ba592eaa94c24a2ff5402..b37510753fe4605522b5610ba3660aa471caef73 100644 +index 217be3e3f5d586cef85220b927d34243de40399c..8d26a4ddc7f9f29563d635f6d24d1b7cfcf4d5a2 100644 --- a/extensions/browser/api/socket/tcp_socket.cc +++ b/extensions/browser/api/socket/tcp_socket.cc -@@ -156,8 +156,16 @@ void TCPSocket::Disconnect(bool socket_destroying) { +@@ -152,8 +152,16 @@ void TCPSocket::Disconnect(bool socket_destroying) { client_socket_.reset(); server_socket_.reset(); listen_callback_.Reset(); 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 d24266eda64b..5a7407275ade 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 4da01c1e3f34008d9cfe0a6debacca4437ca9265..9f0ac406d5810fed95e3fff9c0cf6995c22f9ecf 100644 +index b7d804c359ff4943c81a817e730df9a637d3c2ee..b0bdcf52fd78ad5f7f6f7fa039ca77ce08fb3494 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc -@@ -1295,6 +1295,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( +@@ -1300,6 +1300,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( const net::AuthChallengeInfo& auth_info, AuthCallback callback, net::AuthCredentials* credentials) { diff --git a/patches/extensions-common-api-_api_features.json.patch b/patches/extensions-common-api-_api_features.json.patch index bf9ff6a744d6..d1ef6567d5d8 100644 --- a/patches/extensions-common-api-_api_features.json.patch +++ b/patches/extensions-common-api-_api_features.json.patch @@ -1,5 +1,5 @@ diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json -index aa91cd576cfc84f52627415df211706c8d1bf2cc..6901e97add104edcb33d879459776278aae8d245 100644 +index 725c27e6ada9a8f6cf2338921f5f33b51179ee1c..363817f8d6c9aa1cc8894a57b50a55286fac0f0a 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json @@ -526,6 +526,7 @@ diff --git a/patches/extensions-common-api-_permission_features.json.patch b/patches/extensions-common-api-_permission_features.json.patch index 470cf44a2976..3c5727cfd8cd 100644 --- a/patches/extensions-common-api-_permission_features.json.patch +++ b/patches/extensions-common-api-_permission_features.json.patch @@ -1,5 +1,5 @@ diff --git a/extensions/common/api/_permission_features.json b/extensions/common/api/_permission_features.json -index 4f8ce754691d907d22cd26c1eba007c96c65c3ec..f7e0941f668495a4a84fe1890e44840fc9fc3671 100644 +index d9e0ea3166747329a4f4a219f9867cb5b43b0c75..b08eeba0807226d342b224796b36b0441a6b0fc8 100644 --- a/extensions/common/api/_permission_features.json +++ b/extensions/common/api/_permission_features.json @@ -319,6 +319,7 @@ @@ -10,7 +10,7 @@ index 4f8ce754691d907d22cd26c1eba007c96c65c3ec..f7e0941f668495a4a84fe1890e44840f "496B6890097EB6E19809ADEADD095A8721FBB2E0", // FIDO U2F APIs "AD8ED80B705E1818AAD4684F9FF62B43D6D79620", // FIDO U2F APIs (dev) "E24F1786D842E91E74C27929B0B3715A4689A473", // CryptoToken -@@ -658,6 +659,7 @@ +@@ -654,6 +655,7 @@ "channel": "stable", "extension_types": ["extension"], "allowlist": [ diff --git a/patches/google_apis-google_api_keys.cc.patch b/patches/google_apis-google_api_keys.cc.patch index eb078caec3b9..b28055316354 100644 --- a/patches/google_apis-google_api_keys.cc.patch +++ b/patches/google_apis-google_api_keys.cc.patch @@ -1,8 +1,8 @@ diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc -index 28774f16e21f0e2871a78d2027c24e4a9b950de0..5a9f318d334ab1b1c9e22d9fb1bf892dfa714fdf 100644 +index da3fb4f261991fcd72d35305d1625f81f3ed3694..690bce99d74b95d3a325ac03f201766069e9b837 100644 --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc -@@ -209,6 +209,7 @@ class APIKeyCache { +@@ -218,6 +218,7 @@ class APIKeyCache { #if defined(OS_IOS) || defined(OS_FUCHSIA) void set_api_key(const std::string& api_key) { api_key_ = api_key; } #endif diff --git a/patches/media-blink-key_system_config_selector.cc.patch b/patches/media-blink-key_system_config_selector.cc.patch index f03573b4446a..716b2266fb3a 100644 --- a/patches/media-blink-key_system_config_selector.cc.patch +++ b/patches/media-blink-key_system_config_selector.cc.patch @@ -1,8 +1,8 @@ diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc -index 0acaf77db4d0c5cc8c8119f43730c65c12836d8a..5d33d674bbb735989ab35e7b604854648e5200fe 100644 +index 462550a600b8a9c611a154bc9ffffd8c7b31202e..9dc203212d9f69f182682cfe1772d8e7c6732745 100644 --- a/media/blink/key_system_config_selector.cc +++ b/media/blink/key_system_config_selector.cc -@@ -990,6 +990,7 @@ void KeySystemConfigSelector::SelectConfig( +@@ -994,6 +994,7 @@ void KeySystemConfigSelector::SelectConfig( key_systems_->UpdateIfNeeded(); diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 7bb7af55bd22..a5f75e63dd52 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index c8d5ea055ed4edae95273597579cd2fa097e830b..478c26de38e469514d433e3a5da3969df12c10da 100644 +index 1f228f8cd35c0dd149044a625567616ef74f8bed..e42b2562696f1d74643740e2003e1bec58c0cd72 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1138,6 +1138,7 @@ component("net") { diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch index 22b6f9a322f8..3fe50221fa05 100644 --- a/patches/net-cookies-canonical_cookie.cc.patch +++ b/patches/net-cookies-canonical_cookie.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc -index 83232c77be524f69b9042e4a3e6d4929171698f0..9cb5969f5f124cfad058256aace7da65bbd59803 100644 +index adba3eca12f3c8738c78811a293fad6544d005c0..a13f6fc90be3a9c107b02f49cb81d67b70225c7f 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc @@ -452,6 +452,7 @@ std::unique_ptr CanonicalCookie::Create( diff --git a/patches/net-socket-socks5_client_socket.cc.patch b/patches/net-socket-socks5_client_socket.cc.patch index 23ac941cc619..688e9ec76c28 100644 --- a/patches/net-socket-socks5_client_socket.cc.patch +++ b/patches/net-socket-socks5_client_socket.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc -index e22ddb2630bad854c3c0b89a882f8e1447fb3911..13e9f0546ca533372c0e7244e82e0c68dd801d9e 100644 +index ae130d9b5f8b83ded0bcdc83c1c392904967cd6f..ff8adb800f2d18c25260158b0460b561cc4e209e 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc @@ -238,6 +238,9 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch index 012ce2f9cf5a..9671f9141bfc 100644 --- a/patches/sandbox-policy-win-sandbox_win.cc.patch +++ b/patches/sandbox-policy-win-sandbox_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc -index 3b6543c4d498ad4a2c9d292a1ef5e78cffd6ee36..9bff937e40432b0b27ce26d3671084022f92958c 100644 +index 52413e2776fb6a7e9c6913a31177ea1d38b05197..71b041e0ec7fc1c4d9ff3e56c057041a673d6b14 100644 --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc @@ -772,6 +772,7 @@ ResultCode LaunchWithoutSandbox( diff --git a/patches/services-preferences-tracked-device_id_win.cc.patch b/patches/services-preferences-tracked-device_id_win.cc.patch index 339acb7f24b0..a41eefd9e488 100644 --- a/patches/services-preferences-tracked-device_id_win.cc.patch +++ b/patches/services-preferences-tracked-device_id_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/services/preferences/tracked/device_id_win.cc b/services/preferences/tracked/device_id_win.cc -index b6d37f81c281ad202a94f021a14ad6c5f92ae95f..5fa3202f69896c76739956f9f314e84e074ba325 100644 +index 17a2e75205c82dcdb5b981c65351fa1eeb6440f6..7385649a361c128cd6a0d951f4b4a1edffa0a3ea 100644 --- a/services/preferences/tracked/device_id_win.cc +++ b/services/preferences/tracked/device_id_win.cc @@ -15,6 +15,7 @@ diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index 1d80a1313c38..ffa337e8fe66 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 5c50c4d927636bc92ca86fa3287bdac56d38c0d8..e2379ba73a11d45a45e827773b8c7d92c01ffa2b 100644 +index b601c941d70f8b7b3c971aefb9a3034f527783a3..5bebd1231025c640150051ab949fc847ebb1f7c2 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -174,6 +174,7 @@ component("core") { diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 0c720ae545b6..ff036e77e19e 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 b4df67c7459bfa5b003abf7401d0585608b64448..0e08cad17dbec73e35d2c9b04f49429e9464318b 100644 +index 49946d8ac920facefd63112614d62aca20eb4ff4..a0b2387f87d32bac36fcfdab84230f6c0f6335a6 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -17,6 +17,7 @@ if (is_android) { diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index d15604c86d2f..778570d060b7 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 a67a4b93e9551d33c4daf419512598d56ef330f2..cb8b79fec8411098e523ec5b960937bad4db074d 100644 +index 699091dadd3aa262df4d81387851fda479a48457..1d215813d636ceaec0bb3e9b7f16ddf5831ed0a4 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -47,6 +47,9 @@ @@ -12,7 +12,7 @@ index a67a4b93e9551d33c4daf419512598d56ef330f2..cb8b79fec8411098e523ec5b960937ba "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -474,6 +477,9 @@ +@@ -475,6 +478,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 11361afb9868..8fc319246a6d 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 e3e900c1146e9eb6c419e93616a76c947e448449..ebb7583c08878a1c21e95982322a7625440cf457 100644 +index 0ed9790d2882f000e831ee222d14a5e23da618d9..fab4e8d9babb91789a5d80882e440ba20d032782 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -14361,6 +14361,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -14370,6 +14370,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. diff --git a/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch index 8db647bebcef..12a64f88b6ec 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_mac.mm b/ui/accessibility/platform/ax_platform_node_mac.mm -index e8600ea3b8cd524c2fae2db62014d943a773d466..f783cca4371fdd2b9a9ae7590151feaf6f54c2cb 100644 +index 115f964ee0ef5518a3a02eae4310d2af02068148..4562fb52b41acb66a5d9a30cc34f0337fefba9aa 100644 --- a/ui/accessibility/platform/ax_platform_node_mac.mm +++ b/ui/accessibility/platform/ax_platform_node_mac.mm -@@ -1175,6 +1175,7 @@ bool IsAXSetter(SEL selector) { +@@ -1164,6 +1164,7 @@ bool IsAXSetter(SEL selector) { if (!_node) return nil; diff --git a/patches/ui-views-controls-focus_ring.cc.patch b/patches/ui-views-controls-focus_ring.cc.patch index 5433e54d91cb..4ff896086881 100644 --- a/patches/ui-views-controls-focus_ring.cc.patch +++ b/patches/ui-views-controls-focus_ring.cc.patch @@ -1,8 +1,8 @@ diff --git a/ui/views/controls/focus_ring.cc b/ui/views/controls/focus_ring.cc -index 677bd527de4c1cc59be73279a4122e428dc9ebc7..607b902797cc204c44a198e658f2f366b7ebf753 100644 +index 699c15fe76528e557b08c1c0027a1a63a4791df0..a781de1543c3c0a893b723d82e95be4ef722c1fd 100644 --- a/ui/views/controls/focus_ring.cc +++ b/ui/views/controls/focus_ring.cc -@@ -197,6 +197,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { +@@ -180,6 +180,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { cc::PaintFlags paint; paint.setAntiAlias(true); paint.setColor(color_.value_or(GetColor(this, !invalid_))); @@ -10,7 +10,7 @@ index 677bd527de4c1cc59be73279a4122e428dc9ebc7..607b902797cc204c44a198e658f2f366 paint.setStyle(cc::PaintFlags::kStroke_Style); paint.setStrokeWidth(PlatformStyle::kFocusHaloThickness); -@@ -218,6 +219,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { +@@ -201,6 +202,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { flags.setAntiAlias(true); flags.setColor(GetNativeTheme()->GetSystemColor( ui::NativeTheme::kColorId_FocusAuraColor)); From 9799a480e437c44feae83de596145720e9c1756e Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 11 Jun 2021 12:37:41 +0200 Subject: [PATCH 024/205] Conflict-resolved patches from Chromium 93.0.4530.5 to Chromium 93.0.4535.3. --- patches/chrome-VERSION.patch | 6 +++--- ...tensions-browser-extension_event_histogram_value.h.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 2c2484eb4d2b..2773e150ec1d 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 39cfbf026793c2ab0fc066cdc5ee31e46282443c..c5cfdaaa37bdde933d93e031426a28b7344a3a94 100644 +index 95625b9ac001706a254beaa380eb488985ce509f..c5cfdaaa37bdde933d93e031426a28b7344a3a94 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=93 -MINOR=0 --BUILD=4530 --PATCH=5 +-BUILD=4535 +-PATCH=3 +MINOR=1 +BUILD=30 +PATCH=30 diff --git a/patches/extensions-browser-extension_event_histogram_value.h.patch b/patches/extensions-browser-extension_event_histogram_value.h.patch index 3ec39cab302a..ea1c2df282d5 100644 --- a/patches/extensions-browser-extension_event_histogram_value.h.patch +++ b/patches/extensions-browser-extension_event_histogram_value.h.patch @@ -1,11 +1,11 @@ diff --git a/extensions/browser/extension_event_histogram_value.h b/extensions/browser/extension_event_histogram_value.h -index 211a319c2aa61da095fbf00944c56272ed7ab98c..3e92121c5f5b4b3fbee88c15984337c2dd99dc70 100644 +index 0e7b32664e07a84c73d6bbd4d30258db088012bf..3f37380ccdd79ee94d9af3129dd0516bb0136f86 100644 --- a/extensions/browser/extension_event_histogram_value.h +++ b/extensions/browser/extension_event_histogram_value.h -@@ -498,6 +498,20 @@ enum HistogramValue { - TTS_ENGINE_ON_SPEAK_WITH_AUDIO_STREAM = 476, +@@ -499,6 +499,20 @@ enum HistogramValue { ACCESSIBILITY_PRIVATE_ON_SHOW_CHROMEVOX_TUTORIAL = 477, STORAGE_SESSION_ON_CHANGE = 478, + ACCESSIBILITY_PRIVATE_ON_TOGGLE_DICTATION = 479, + + BRAVE_START = 600, + BRAVE_AD_BLOCKED, From ad63971f197fd8de7a35a95ba465362c00ab0502 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 11 Jun 2021 12:38:46 +0200 Subject: [PATCH 025/205] Adapt to relocation of components/sync/driver/profile_sync_service.* They are in components/sync/driver/sync_service_impl.{cc,h} now. Chromium change: https://chromium.googlesource.com/chromium/src/+/b77854267a62e9208b1ac5ceb4167387ec7c56cc commit b77854267a62e9208b1ac5ceb4167387ec7c56cc Author: Victor Hugo Vianna Silva Date: Fri Jun 4 09:15:21 2021 +0000 Reland "Rename ProfileSyncService to SyncServiceImpl" Reason for reland: Original CL was reverted to unwind other changes. Original change's description: > Rename ProfileSyncService to SyncServiceImpl > > Renaming related classes like ProfileSyncServiceAndroid and > ProfileSyncServiceHarness is left for next CLs. We also use this CL as > an opportunity to hide the implementation class when possible: > - Some includes for sync_service_impl.h are removed if unnecessary, or > replaced with sync_service.h. > - Even comments referring to SyncServiceImpl are updated to refer to > the interface if the layer isn't aware SyncServiceImpl is being used. > > The CL also adds one missing include for in > fake_server_helper_android.cc to address one IWYU presubmit warning. Bug: 1201272 --- browser/sync/brave_profile_sync_service_delegate.h | 1 - ...{profile_sync_service.cc => sync_service_impl.cc} | 2 +- .../{profile_sync_service.h => sync_service_impl.h} | 8 ++++---- .../sync/driver/brave_sync_profile_sync_service.cc | 6 +++--- .../sync/driver/brave_sync_profile_sync_service.h | 4 ++-- .../brave_sync_profile_sync_service_unittest.cc | 8 ++++---- ios/browser/api/sync/brave_sync_api.mm | 4 ++-- ios/browser/api/sync/brave_sync_worker.cc | 4 ++-- ...chrome-browser-sync-sync_service_factory.cc.patch | 10 +++++----- ...mponents-sync-driver-profile_sync_service.h.patch | 12 ------------ .../components-sync-driver-sync_service_impl.h.patch | 12 ++++++++++++ ...chrome-browser-sync-sync_service_factory.cc.patch | 10 +++++----- 12 files changed, 40 insertions(+), 41 deletions(-) rename chromium_src/components/sync/driver/{profile_sync_service.cc => sync_service_impl.cc} (88%) rename chromium_src/components/sync/driver/{profile_sync_service.h => sync_service_impl.h} (75%) delete mode 100644 patches/components-sync-driver-profile_sync_service.h.patch create mode 100644 patches/components-sync-driver-sync_service_impl.h.patch diff --git a/browser/sync/brave_profile_sync_service_delegate.h b/browser/sync/brave_profile_sync_service_delegate.h index 4a4b2e2cee26..d66811a360b5 100644 --- a/browser/sync/brave_profile_sync_service_delegate.h +++ b/browser/sync/brave_profile_sync_service_delegate.h @@ -10,7 +10,6 @@ #include "base/memory/weak_ptr.h" #include "base/scoped_observation.h" -#include "components/sync/driver/profile_sync_service.h" #include "components/sync_device_info/device_info_tracker.h" class Profile; diff --git a/chromium_src/components/sync/driver/profile_sync_service.cc b/chromium_src/components/sync/driver/sync_service_impl.cc similarity index 88% rename from chromium_src/components/sync/driver/profile_sync_service.cc rename to chromium_src/components/sync/driver/sync_service_impl.cc index d0566ba4d91a..89f3268b61ba 100644 --- a/chromium_src/components/sync/driver/profile_sync_service.cc +++ b/chromium_src/components/sync/driver/sync_service_impl.cc @@ -9,7 +9,7 @@ #define SyncAuthManager BraveSyncAuthManager #define SyncStoppedReporter BraveSyncStoppedReporter -#include "../../../../../components/sync/driver/profile_sync_service.cc" +#include "../../../../../components/sync/driver/sync_service_impl.cc" #undef SyncAuthManager #undef SyncStoppedReporter diff --git a/chromium_src/components/sync/driver/profile_sync_service.h b/chromium_src/components/sync/driver/sync_service_impl.h similarity index 75% rename from chromium_src/components/sync/driver/profile_sync_service.h rename to chromium_src/components/sync/driver/sync_service_impl.h index f6d36c6bdc2a..6b97d063e41e 100644 --- a/chromium_src/components/sync/driver/profile_sync_service.h +++ b/chromium_src/components/sync/driver/sync_service_impl.h @@ -3,8 +3,8 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_DRIVER_PROFILE_SYNC_SERVICE_H_ -#define BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_DRIVER_PROFILE_SYNC_SERVICE_H_ +#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_DRIVER_SYNC_SERVICE_IMPL_H_ +#define BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_DRIVER_SYNC_SERVICE_IMPL_H_ #define BRAVE_PROFILE_SYNC_SERVICE_H_ \ private: \ @@ -19,10 +19,10 @@ #include "components/sync/engine/sync_engine.h" #define Initialize virtual Initialize -#include "../../../../../components/sync/driver/profile_sync_service.h" +#include "../../../../../components/sync/driver/sync_service_impl.h" #undef Initialize #undef BRAVE_PROFILE_SYNC_SERVICE_H_ -#endif // BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_DRIVER_PROFILE_SYNC_SERVICE_H_ +#endif // BRAVE_CHROMIUM_SRC_COMPONENTS_SYNC_DRIVER_SYNC_SERVICE_IMPL_H_ diff --git a/components/sync/driver/brave_sync_profile_sync_service.cc b/components/sync/driver/brave_sync_profile_sync_service.cc index ae720118dd19..540582dcf5f8 100644 --- a/components/sync/driver/brave_sync_profile_sync_service.cc +++ b/components/sync/driver/brave_sync_profile_sync_service.cc @@ -20,7 +20,7 @@ namespace syncer { BraveProfileSyncService::BraveProfileSyncService( InitParams init_params, std::unique_ptr profile_service_delegate) - : ProfileSyncService(std::move(init_params)), + : SyncServiceImpl(std::move(init_params)), brave_sync_prefs_(sync_client_->GetPrefService()), profile_service_delegate_(std::move(profile_service_delegate)), weak_ptr_factory_(this) { @@ -39,7 +39,7 @@ BraveProfileSyncService::~BraveProfileSyncService() { } void BraveProfileSyncService::Initialize() { - ProfileSyncService::Initialize(); + SyncServiceImpl::Initialize(); if (!brave_sync_prefs_.IsSyncV1Migrated()) { StopImpl(CLEAR_DATA); brave_sync_prefs_.SetSyncV1Migrated(true); @@ -47,7 +47,7 @@ void BraveProfileSyncService::Initialize() { } bool BraveProfileSyncService::IsSetupInProgress() const { - return ProfileSyncService::IsSetupInProgress() && + return SyncServiceImpl::IsSetupInProgress() && !user_settings_->IsFirstSetupComplete(); } diff --git a/components/sync/driver/brave_sync_profile_sync_service.h b/components/sync/driver/brave_sync_profile_sync_service.h index 81ff62f0e51f..f49b723847a5 100644 --- a/components/sync/driver/brave_sync_profile_sync_service.h +++ b/components/sync/driver/brave_sync_profile_sync_service.h @@ -12,7 +12,7 @@ #include "base/memory/weak_ptr.h" #include "brave/components/brave_sync/brave_sync_prefs.h" #include "components/prefs/pref_change_registrar.h" -#include "components/sync/driver/profile_sync_service.h" +#include "components/sync/driver/sync_service_impl.h" class Profile; @@ -21,7 +21,7 @@ namespace syncer { class BraveSyncAuthManager; class ProfileSyncServiceDelegate; -class BraveProfileSyncService : public ProfileSyncService { +class BraveProfileSyncService : public SyncServiceImpl { public: explicit BraveProfileSyncService( InitParams init_params, diff --git a/components/sync/driver/brave_sync_profile_sync_service_unittest.cc b/components/sync/driver/brave_sync_profile_sync_service_unittest.cc index 074e94f49e25..1e12db43651f 100644 --- a/components/sync/driver/brave_sync_profile_sync_service_unittest.cc +++ b/components/sync/driver/brave_sync_profile_sync_service_unittest.cc @@ -56,7 +56,7 @@ class BraveProfileSyncServiceTest : public testing::Test { ~BraveProfileSyncServiceTest() override { sync_service_->Shutdown(); } void CreateSyncService( - ProfileSyncService::StartBehavior start_behavior, + SyncServiceImpl::StartBehavior start_behavior, ModelTypeSet registered_types = ModelTypeSet(BOOKMARKS)) { DataTypeController::TypeVector controllers; for (ModelType type : registered_types) { @@ -99,7 +99,7 @@ class BraveProfileSyncServiceTest : public testing::Test { TEST_F(BraveProfileSyncServiceTest, ValidPassphrase) { OSCryptMocker::SetUp(); - CreateSyncService(ProfileSyncService::MANUAL_START); + CreateSyncService(SyncServiceImpl::MANUAL_START); brave_sync_service()->Initialize(); EXPECT_FALSE(engine()); @@ -115,7 +115,7 @@ TEST_F(BraveProfileSyncServiceTest, ValidPassphrase) { TEST_F(BraveProfileSyncServiceTest, InvalidPassphrase) { OSCryptMocker::SetUp(); - CreateSyncService(ProfileSyncService::MANUAL_START); + CreateSyncService(SyncServiceImpl::MANUAL_START); brave_sync_service()->Initialize(); EXPECT_FALSE(engine()); @@ -132,7 +132,7 @@ TEST_F(BraveProfileSyncServiceTest, InvalidPassphrase) { TEST_F(BraveProfileSyncServiceTest, ValidPassphraseLeadingTrailingWhitespace) { OSCryptMocker::SetUp(); - CreateSyncService(ProfileSyncService::MANUAL_START); + CreateSyncService(SyncServiceImpl::MANUAL_START); brave_sync_service()->Initialize(); EXPECT_FALSE(engine()); diff --git a/ios/browser/api/sync/brave_sync_api.mm b/ios/browser/api/sync/brave_sync_api.mm index 16c7f28cae1c..966344eb588f 100644 --- a/ios/browser/api/sync/brave_sync_api.mm +++ b/ios/browser/api/sync/brave_sync_api.mm @@ -18,8 +18,8 @@ #include "brave/components/brave_sync/crypto/crypto.h" #include "brave/components/sync_device_info/brave_device_info.h" #include "brave/ios/browser/api/sync/brave_sync_worker.h" -#include "components/sync/driver/profile_sync_service.h" #include "components/sync/driver/sync_service.h" +#include "components/sync/driver/sync_service_impl.h" #include "components/sync/driver/sync_service_observer.h" #include "components/sync_device_info/device_info.h" #include "components/sync_device_info/device_info_sync_service.h" @@ -62,7 +62,7 @@ @interface BraveSyncServiceObserver : NSObject { @implementation BraveSyncServiceObserver - (instancetype) - initWithProfileSyncService:(syncer::ProfileSyncService*)profileSyncService + initWithProfileSyncService:(syncer::SyncServiceImpl*)profileSyncService callback:(void (^)())onSyncServiceStateChanged { if ((self = [super init])) { _service_tracker = std::make_unique( diff --git a/ios/browser/api/sync/brave_sync_worker.cc b/ios/browser/api/sync/brave_sync_worker.cc index b3779a6fb7fe..d1be5b0264fe 100644 --- a/ios/browser/api/sync/brave_sync_worker.cc +++ b/ios/browser/api/sync/brave_sync_worker.cc @@ -17,8 +17,8 @@ #include "brave/components/brave_sync/profile_sync_service_helper.h" #include "brave/components/sync/driver/brave_sync_profile_sync_service.h" #include "brave/components/sync_device_info/brave_device_info.h" -#include "components/sync/driver/profile_sync_service.h" #include "components/sync/driver/sync_service.h" +#include "components/sync/driver/sync_service_impl.h" #include "components/sync/driver/sync_service_observer.h" #include "components/sync_device_info/device_info.h" #include "components/sync_device_info/device_info_sync_service.h" @@ -54,7 +54,7 @@ void BraveSyncDeviceTracker::OnDeviceInfoChange() { } BraveSyncServiceTracker::BraveSyncServiceTracker( - syncer::ProfileSyncService* profile_sync_service, + syncer::SyncServiceImpl* profile_sync_service, std::function on_state_changed_callback) : on_state_changed_callback_(on_state_changed_callback) { DCHECK(profile_sync_service); diff --git a/patches/chrome-browser-sync-sync_service_factory.cc.patch b/patches/chrome-browser-sync-sync_service_factory.cc.patch index 5055a4bfdefa..53a469873d06 100644 --- a/patches/chrome-browser-sync-sync_service_factory.cc.patch +++ b/patches/chrome-browser-sync-sync_service_factory.cc.patch @@ -1,13 +1,13 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc -index 5d662dad1c8bf796619b4c148c247dadd5470fca..cbda1ad7b77258b682984dbc44ff08beb59f0bfa 100644 +index 546b699ccd9418b1c8cfa0e020c50d03a5469376..501c55adda32595b6d81e3b726f9a955ad5c9d55 100644 --- a/chrome/browser/sync/sync_service_factory.cc +++ b/chrome/browser/sync/sync_service_factory.cc @@ -277,7 +277,7 @@ KeyedService* SyncServiceFactory::BuildServiceInstanceFor( } - auto pss = -- std::make_unique(std::move(init_params)); + auto sync_service = +- std::make_unique(std::move(init_params)); + BRAVE_BUILD_SERVICE_INSTANCE_FOR - pss->Initialize(); + sync_service->Initialize(); - // Hook PSS into PersonalDataManager (a circular dependency). + // Hook |sync_service| into PersonalDataManager (a circular dependency). diff --git a/patches/components-sync-driver-profile_sync_service.h.patch b/patches/components-sync-driver-profile_sync_service.h.patch deleted file mode 100644 index b544a8de071e..000000000000 --- a/patches/components-sync-driver-profile_sync_service.h.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/components/sync/driver/profile_sync_service.h b/components/sync/driver/profile_sync_service.h -index adbca0d720e47ea720cf29c4a292fc1ce6855dd2..99b03cc04acecfa580d1b06d140c7746c9167bcf 100644 ---- a/components/sync/driver/profile_sync_service.h -+++ b/components/sync/driver/profile_sync_service.h -@@ -254,6 +254,7 @@ class ProfileSyncService : public SyncService, - - SyncClient* GetSyncClientForTest(); - -+ BRAVE_PROFILE_SYNC_SERVICE_H_ - private: - // Passed as an argument to StopImpl to control whether or not the sync - // engine should clear its data when it shuts down. See StopImpl for more diff --git a/patches/components-sync-driver-sync_service_impl.h.patch b/patches/components-sync-driver-sync_service_impl.h.patch new file mode 100644 index 000000000000..504db8b48168 --- /dev/null +++ b/patches/components-sync-driver-sync_service_impl.h.patch @@ -0,0 +1,12 @@ +diff --git a/components/sync/driver/sync_service_impl.h b/components/sync/driver/sync_service_impl.h +index 8595f8ffb3a1ce1a5529aea209058f846c935d0d..a1d6b2ffd9ea44d45475efeab2f9bef990cca5a2 100644 +--- a/components/sync/driver/sync_service_impl.h ++++ b/components/sync/driver/sync_service_impl.h +@@ -254,6 +254,7 @@ class SyncServiceImpl : public SyncService, + + SyncClient* GetSyncClientForTest(); + ++ BRAVE_PROFILE_SYNC_SERVICE_H_ + private: + // Passed as an argument to StopImpl to control whether or not the sync + // engine should clear its data when it shuts down. See StopImpl for more diff --git a/patches/ios-chrome-browser-sync-sync_service_factory.cc.patch b/patches/ios-chrome-browser-sync-sync_service_factory.cc.patch index 45db8a6c542f..89c6acf3007f 100644 --- a/patches/ios-chrome-browser-sync-sync_service_factory.cc.patch +++ b/patches/ios-chrome-browser-sync-sync_service_factory.cc.patch @@ -1,13 +1,13 @@ diff --git a/ios/chrome/browser/sync/sync_service_factory.cc b/ios/chrome/browser/sync/sync_service_factory.cc -index ed009499c549e075003201b5ee04422fc7d9114b..83c68d329b1b3fc08d0204f0760cf07d48b5a4ac 100644 +index fa41cb4d38d4337a1451699eabb7589fcf9c39a1..d237f38d2f2310b1456c9d1c7b875c3ebcfbea2a 100644 --- a/ios/chrome/browser/sync/sync_service_factory.cc +++ b/ios/chrome/browser/sync/sync_service_factory.cc @@ -171,7 +171,7 @@ std::unique_ptr SyncServiceFactory::BuildServiceInstanceFor( policy_connector ? policy_connector->GetPolicyService() : nullptr; - auto pss = -- std::make_unique(std::move(init_params)); + auto sync_service = +- std::make_unique(std::move(init_params)); + BRAVE_BUILD_SERVICE_INSTANCE_FOR - pss->Initialize(); + sync_service->Initialize(); - // Hook PSS into PersonalDataManager (a circular dependency). + // Hook |sync_service| into PersonalDataManager (a circular dependency). From 63d51dab32962cce37d0ca675cdf50ae571f6a6a Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 11 Jun 2021 12:44:57 +0200 Subject: [PATCH 026/205] Update patches to JS files now migrated to TypeScript Chromium change: https://chromium.googlesource.com/chromium/src/+/bdac63b4caf1f2eaaecdcd4fa4058755e704537b commit bdac63b4caf1f2eaaecdcd4fa4058755e704537b Author: rbpotter Date: Thu Jun 3 16:19:08 2021 +0000 Reland Bookmarks: Update to TypeScript Bug: 1189595 --- ...-resources-bookmarks-api_listener.js.patch | 20 ---------------- ...-resources-bookmarks-api_listener.ts.patch | 20 ++++++++++++++++ ...sources-bookmarks-command_manager.js.patch | 13 ----------- ...sources-bookmarks-command_manager.ts.patch | 13 +++++++++++ ...wser-resources-bookmarks-reducers.js.patch | 23 ------------------- ...wser-resources-bookmarks-reducers.ts.patch | 23 +++++++++++++++++++ ...owser-resources-bookmarks-toolbar.js.patch | 13 ----------- ...owser-resources-bookmarks-toolbar.ts.patch | 12 ++++++++++ 8 files changed, 68 insertions(+), 69 deletions(-) delete mode 100644 patches/chrome-browser-resources-bookmarks-api_listener.js.patch create mode 100644 patches/chrome-browser-resources-bookmarks-api_listener.ts.patch delete mode 100644 patches/chrome-browser-resources-bookmarks-command_manager.js.patch create mode 100644 patches/chrome-browser-resources-bookmarks-command_manager.ts.patch delete mode 100644 patches/chrome-browser-resources-bookmarks-reducers.js.patch create mode 100644 patches/chrome-browser-resources-bookmarks-reducers.ts.patch delete mode 100644 patches/chrome-browser-resources-bookmarks-toolbar.js.patch create mode 100644 patches/chrome-browser-resources-bookmarks-toolbar.ts.patch diff --git a/patches/chrome-browser-resources-bookmarks-api_listener.js.patch b/patches/chrome-browser-resources-bookmarks-api_listener.js.patch deleted file mode 100644 index f0dd9d6ea18b..000000000000 --- a/patches/chrome-browser-resources-bookmarks-api_listener.js.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/chrome/browser/resources/bookmarks/api_listener.js b/chrome/browser/resources/bookmarks/api_listener.js -index 13723908914b07e4ca2207eff0f444bdeb0e4dc6..61b05509b9f6c2c0efe4eda68835dba198778e65 100644 ---- a/chrome/browser/resources/bookmarks/api_listener.js -+++ b/chrome/browser/resources/bookmarks/api_listener.js -@@ -142,6 +142,7 @@ function onChildrenReordered(id, reorderInfo) { - */ - function onImportBegan() { - chrome.bookmarks.onCreated.removeListener(onBookmarkCreated); -+ chrome.bookmarks.onMoved.removeListener(onBookmarkMoved); - } - - function onImportEnded() { -@@ -149,6 +150,7 @@ function onImportEnded() { - dispatch(refreshNodes(normalizeNodes(results[0]))); - }); - chrome.bookmarks.onCreated.addListener(onBookmarkCreated); -+ chrome.bookmarks.onMoved.addListener(onBookmarkMoved); - } - - /** diff --git a/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch b/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch new file mode 100644 index 000000000000..636a02bb4412 --- /dev/null +++ b/patches/chrome-browser-resources-bookmarks-api_listener.ts.patch @@ -0,0 +1,20 @@ +diff --git a/chrome/browser/resources/bookmarks/api_listener.ts b/chrome/browser/resources/bookmarks/api_listener.ts +index 8581e3b11612d4399c39608a362a4e997c5d9c7a..b4a04246115f72300525d22c81d15f80024f49ed 100644 +--- a/chrome/browser/resources/bookmarks/api_listener.ts ++++ b/chrome/browser/resources/bookmarks/api_listener.ts +@@ -118,6 +118,7 @@ function onChildrenReordered( + */ + function onImportBegan() { + chrome.bookmarks.onCreated.removeListener(onBookmarkCreated); ++ chrome.bookmarks.onMoved.removeListener(onBookmarkMoved); + } + + function onImportEnded() { +@@ -125,6 +126,7 @@ function onImportEnded() { + dispatch(refreshNodes(normalizeNodes(results[0]!))); + }); + chrome.bookmarks.onCreated.addListener(onBookmarkCreated); ++ chrome.bookmarks.onMoved.addListener(onBookmarkMoved); + } + + function onIncognitoAvailabilityChanged(availability: IncognitoAvailability) { diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.js.patch b/patches/chrome-browser-resources-bookmarks-command_manager.js.patch deleted file mode 100644 index ce2961dc0347..000000000000 --- a/patches/chrome-browser-resources-bookmarks-command_manager.js.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/resources/bookmarks/command_manager.js b/chrome/browser/resources/bookmarks/command_manager.js -index f47e1c00070dc50d4533a440560d59d522217e73..f52e877ae3e132f1c49c7d02e7293f9c0638a1e2 100644 ---- a/chrome/browser/resources/bookmarks/command_manager.js -+++ b/chrome/browser/resources/bookmarks/command_manager.js -@@ -471,7 +471,7 @@ export class BookmarksCommandManagerElement extends - chrome.bookmarks.export(); - break; - case Command.HELP_CENTER: -- window.open('https://support.google.com/chrome/?p=bookmarks'); -+ window.open('https://community.brave.com'); - break; - default: - assert(false); diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch new file mode 100644 index 000000000000..120d68fd846d --- /dev/null +++ b/patches/chrome-browser-resources-bookmarks-command_manager.ts.patch @@ -0,0 +1,13 @@ +diff --git a/chrome/browser/resources/bookmarks/command_manager.ts b/chrome/browser/resources/bookmarks/command_manager.ts +index ae44167687cf66b50407355ab9383ece92c7f96f..deff4066b138b5a1b43d16920be1f0616ffd4d55 100644 +--- a/chrome/browser/resources/bookmarks/command_manager.ts ++++ b/chrome/browser/resources/bookmarks/command_manager.ts +@@ -438,7 +438,7 @@ export class BookmarksCommandManagerElement extends + chrome.bookmarks.export(); + break; + case Command.HELP_CENTER: +- window.open('https://support.google.com/chrome/?p=bookmarks'); ++ window.open('https://community.brave.com'); + break; + default: + assert(false); diff --git a/patches/chrome-browser-resources-bookmarks-reducers.js.patch b/patches/chrome-browser-resources-bookmarks-reducers.js.patch deleted file mode 100644 index e1ef97220f6e..000000000000 --- a/patches/chrome-browser-resources-bookmarks-reducers.js.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/chrome/browser/resources/bookmarks/reducers.js b/chrome/browser/resources/bookmarks/reducers.js -index ea2453167ee475a069067a7aff178df6d3dd2a25..661ce986cfecd4253af968fe07fbda293ee295e8 100644 ---- a/chrome/browser/resources/bookmarks/reducers.js -+++ b/chrome/browser/resources/bookmarks/reducers.js -@@ -245,6 +245,9 @@ function editBookmark(nodes, action) { - function moveBookmark(nodes, action) { - const nodeModifications = {}; - const id = action.id; -+ // Skip when new/old parent is invisible (Pending Bookmarks) -+ if (!nodes[action.oldParentId] || !nodes[action.parentId]) -+ return nodes; - - // Change node's parent. - nodeModifications[id] = -@@ -415,7 +418,7 @@ export function updateFolderOpenState(folderOpenState, action, nodes) { - return openFolderAndAncestors( - folderOpenState, nodes[action.id].parentId, nodes); - case 'move-bookmark': -- if (!nodes[action.id].children) { -+ if (!nodes[action.id] || !nodes[action.id].children) { - return folderOpenState; - } - diff --git a/patches/chrome-browser-resources-bookmarks-reducers.ts.patch b/patches/chrome-browser-resources-bookmarks-reducers.ts.patch new file mode 100644 index 000000000000..6af461136087 --- /dev/null +++ b/patches/chrome-browser-resources-bookmarks-reducers.ts.patch @@ -0,0 +1,23 @@ +diff --git a/chrome/browser/resources/bookmarks/reducers.ts b/chrome/browser/resources/bookmarks/reducers.ts +index 5e224479b3af8ca0039e429a438632f5e1fb4289..7fbaa741dc1310436b7638bf690f0ca64f5e518c 100644 +--- a/chrome/browser/resources/bookmarks/reducers.ts ++++ b/chrome/browser/resources/bookmarks/reducers.ts +@@ -193,6 +193,9 @@ function editBookmark(nodes: NodeMap, action: EditBookmarkAction): NodeMap { + function moveBookmark(nodes: NodeMap, action: MoveBookmarkAction): NodeMap { + const nodeModifications: NodeMap = {}; + const id = action.id; ++ // Skip when new/old parent is invisible (Pending Bookmarks) ++ if (!nodes[action.oldParentId] || !nodes[action.parentId]) ++ return nodes; + + // Change node's parent. + nodeModifications[id] = +@@ -328,7 +331,7 @@ export function updateFolderOpenState( + folderOpenState, nodes[(action as SelectFolderAction).id]!.parentId!, + nodes); + case 'move-bookmark': +- if (!nodes[(action as MoveBookmarkAction).id]!.children) { ++ if (!nodes[(action as MoveBookmarkAction).id] || !nodes[(action as MoveBookmarkAction).id]!.children) { + return folderOpenState; + } + return openFolderAndAncestors( diff --git a/patches/chrome-browser-resources-bookmarks-toolbar.js.patch b/patches/chrome-browser-resources-bookmarks-toolbar.js.patch deleted file mode 100644 index c0bbd28bb8f3..000000000000 --- a/patches/chrome-browser-resources-bookmarks-toolbar.js.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/resources/bookmarks/toolbar.js b/chrome/browser/resources/bookmarks/toolbar.js -index 0e5cdde9cf5e0fe520147f4cf4c08b03305ec257..fb7b010b6c8d727b993adf67f2b962ebb2f24909 100644 ---- a/chrome/browser/resources/bookmarks/toolbar.js -+++ b/chrome/browser/resources/bookmarks/toolbar.js -@@ -8,7 +8,7 @@ import 'chrome://resources/cr_elements/icons.m.js'; - import './shared_style.js'; - import './strings.m.js'; - --import {CrToolbarElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; -+import 'chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js'; - import {CrToolbarSearchFieldElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; - import {assert} from 'chrome://resources/js/assert.m.js'; - import {StoreObserver} from 'chrome://resources/js/cr/ui/store.m.js'; diff --git a/patches/chrome-browser-resources-bookmarks-toolbar.ts.patch b/patches/chrome-browser-resources-bookmarks-toolbar.ts.patch new file mode 100644 index 000000000000..c3ee39e8e51e --- /dev/null +++ b/patches/chrome-browser-resources-bookmarks-toolbar.ts.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/resources/bookmarks/toolbar.ts b/chrome/browser/resources/bookmarks/toolbar.ts +index 86e6f729a495721a931b1fc12c4ff5d3e2efad5f..945b6d653c17d073b4fe755c7bdb8d9a34f5f9f1 100644 +--- a/chrome/browser/resources/bookmarks/toolbar.ts ++++ b/chrome/browser/resources/bookmarks/toolbar.ts +@@ -10,6 +10,7 @@ import './strings.m.js'; + import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; + import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; + ++import 'chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js'; + import {CrToolbarElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; + import {CrToolbarSearchFieldElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; + import {assert} from 'chrome://resources/js/assert.m.js'; From 16c6e44412bdf7ea9e07c84a9ba2b89471821b5f Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 11 Jun 2021 12:45:30 +0200 Subject: [PATCH 027/205] Update patches to JS files now migrated to TypeScript Chromium change: https://chromium.googlesource.com/chromium/src/+/27f5525d7368694e0d049975e1fef0049bab1a2e commit 27f5525d7368694e0d049975e1fef0049bab1a2e Author: dpapad Date: Thu Jun 3 18:58:55 2021 +0000 Extensions: Migrate to TypeScript, part1. In this part migrating non Polymer files (11/40 total files). Also adding minimal definition files for chrome.management and chrome.runtime.lastError APIs. Remaining files will be addressed in follow up CL(s). Bug: 1189595 --- ...chrome-browser-resources-extensions-extensions.ts.patch} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename patches/{chrome-browser-resources-extensions-extensions.js.patch => chrome-browser-resources-extensions-extensions.ts.patch} (62%) diff --git a/patches/chrome-browser-resources-extensions-extensions.js.patch b/patches/chrome-browser-resources-extensions-extensions.ts.patch similarity index 62% rename from patches/chrome-browser-resources-extensions-extensions.js.patch rename to patches/chrome-browser-resources-extensions-extensions.ts.patch index 8d59eceb44cf..6058778c3cde 100644 --- a/patches/chrome-browser-resources-extensions-extensions.js.patch +++ b/patches/chrome-browser-resources-extensions-extensions.ts.patch @@ -1,7 +1,7 @@ -diff --git a/chrome/browser/resources/extensions/extensions.js b/chrome/browser/resources/extensions/extensions.js +diff --git a/chrome/browser/resources/extensions/extensions.ts b/chrome/browser/resources/extensions/extensions.ts index 5836804c9e488bb23869d05881bd55cd7ccd9f52..928974d8d5dc367276527ae521b26fc3bb7cb226 100644 ---- a/chrome/browser/resources/extensions/extensions.js -+++ b/chrome/browser/resources/extensions/extensions.js +--- a/chrome/browser/resources/extensions/extensions.ts ++++ b/chrome/browser/resources/extensions/extensions.ts @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. From c09b40d6456acd64036fea73e2f318f22d3ce99a Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 11 Jun 2021 13:25:13 +0200 Subject: [PATCH 028/205] Updated strings for Chromium 93.0.4535.3. --- app/brave_strings.grd | 33 ++++++++++++++++++ app/generated_resources.grd | 40 +++++++++++++++++++--- app/generated_resources_override.grd | 3 ++ app/os_settings_strings.grdp | 21 ++++++++++++ app/url_handler_intent_picker_strings.grdp | 23 +++++++++++++ components/arc_strings.grdp | 3 ++ 6 files changed, 119 insertions(+), 4 deletions(-) create mode 100644 app/url_handler_intent_picker_strings.grdp diff --git a/app/brave_strings.grd b/app/brave_strings.grd index 996abf0dee38..06bfe672cf3f 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -1091,9 +1091,42 @@ Brave is unable to recover your settings. Install Chrome OS + Install Chrome OS + + Installing Chrome OS will overwrite all data on your device. + + + <p>Before we get started, please ensure that you have an up-to-date backup of your data. Installing Chrome OS will overwrite all data on your hard drive.</p> + <p>Brave is not responsible for any data loss, and makes no guarantee that Chrome OS will work on uncertified models. Please visit [TBD] to learn more about certified models.</p> + <p>Learn more about installing Chrome OS and data erasure: [TBD URL]</p> + <p>If you are ready to proceed, click “Install Chrome OS” and we'll guide you through the installation in just a couple easy steps. You'll have another chance to confirm before we make any changes to your computer.</p> + + + Install Chrome OS + + + Ready to install Chrome OS + + + <p>We’re ready to install Chrome OS! Once you proceed: + <ul> + <li>Files, data, and your current operating system will be erased. + <li>Chrome OS will be installed. + <li>Your device will shut down once the installation is complete. + </ul> + </p> + <p>One last reminder: installation will erase your entire hard drive. Please make sure you have any data you care about backed up.</p> + <p>Once installation starts it cannot be canceled.</p> + + + Erase Hard Drive & Install Chrome OS + + + Chrome OS installation in progress + diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 19b64bd107cb..5cbca0b71df6 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -293,6 +293,7 @@ are declared in tools/grit/grit_rule.gni. + @@ -4225,6 +4226,19 @@ are declared in tools/grit/grit_rule.gni. The folder you selected contains sensitive files. Are you sure you want to grant "$1Text" permanent write access to this folder? + + + + Connection Dialog + + + Address + + + Port + + + @@ -5014,8 +5028,8 @@ Keep your key file in a safe place. You will need it to create new versions of y - - Lacros is an experimental Browser. Please report issues with: Help > "Report an issue...". + + Experimental browser! May lose data or compromise privacy or security. Please report issues with: Help > "Report an issue...". @@ -5753,6 +5767,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Extensions + + Show side panel + + + Hide side panel + Close @@ -7424,8 +7444,8 @@ Keep your key file in a safe place. You will need it to create new versions of y Press $1Ctrl+V to paste - - Tap the notification on $1Jimmy's Pixel to verify your phone number + + Brave has sent the verification code to the website upon your approval on $1Jimmy's Pixel @@ -10385,6 +10405,18 @@ Please help our engineers fix this problem. Tell us what happened right before y $1example.com will be able to view files in $2My Project until you close all tabs for this site + + $1example.com will be able to edit $2README.md + + + $1example.com will be able to edit files in $2My Project + + + $1example.com will be able to view $2README.md + + + $1example.com will be able to view files in $2My Project + Let site edit $1README.md? diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index cbead8d64125..c37a054908ac 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -427,6 +427,9 @@ are declared in tools/grit/grit_rule.gni. + + + diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index f7eb3123379f..188053397458 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -17,6 +17,9 @@ Dismiss + + Keyboard shortcut notice dismissed + @@ -1983,9 +1986,24 @@ Press an assigned switch to remove assignment. There are no printers available to save. + + Managed printers + + + There are $13 managed printers. + + + There is 1 managed printer. + + + There are no managed printers. + Edit + + View + Remove @@ -2169,6 +2187,9 @@ Press an assigned switch to remove assignment. Edit printer + + View printer + Save diff --git a/app/url_handler_intent_picker_strings.grdp b/app/url_handler_intent_picker_strings.grdp new file mode 100644 index 000000000000..b2232835281c --- /dev/null +++ b/app/url_handler_intent_picker_strings.grdp @@ -0,0 +1,23 @@ + + + + + + Which application do you want to use? + + + Remember my choice + + + Open + + + Cancel + + + $1Demo App ($2Work) + + + Publisher: $1example.com + + diff --git a/components/arc_strings.grdp b/components/arc_strings.grdp index 17029db70d7f..f56026ba56f5 100644 --- a/components/arc_strings.grdp +++ b/components/arc_strings.grdp @@ -26,6 +26,9 @@ Settings + + Resize toggle menu + This app is designed for mobile From a6825e20e36a860398710b3dc643e99bd44c1922 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 11 Jun 2021 16:19:43 +0200 Subject: [PATCH 029/205] Adapt to relocation of prefs::kNtp{UseMostVisitedTiles,ShortcutsVisible} They have moved into the ntp_tiles:: namespace now. Chromium change: https://chromium.googlesource.com/chromium/src/+/b0e2a7e1f4ef8634dc4bc417fdce2f450e6b0315 commit b0e2a7e1f4ef8634dc4bc417fdce2f450e6b0315 Author: Moe Ahmadi Date: Wed Jun 2 22:35:34 2021 +0000 [MV] Moves MV settings into MostVisitedSites Currently MV settings/preferences are registered and controlled by the InstantService which updates the MostVisitedSites when those preferences change in the NTP. MostVisitedSites has a partial knowledge of whether custom links are enabled via a state it keeps. In order to eliminate the dependency of the 1P NTP to the InstantService this change moves those prefs into the MostVisitedSites. In the future, this will allow the NTP to observe and set those preferences directly in MostVisitedSites without needing the InstantService as an intermediary. This change is not expected to make any changes to the logic around setting or using these preferences. Bug: 1084363 --- browser/brave_prefs_browsertest.cc | 3 ++- browser/brave_profile_prefs.cc | 4 ++-- browser/search/ntp_utils.cc | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/browser/brave_prefs_browsertest.cc b/browser/brave_prefs_browsertest.cc index f7c42ad51d6a..58414d7ae0a2 100644 --- a/browser/brave_prefs_browsertest.cc +++ b/browser/brave_prefs_browsertest.cc @@ -16,6 +16,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/base/chrome_test_utils.h" #include "components/embedder_support/pref_names.h" +#include "components/ntp_tiles/pref_names.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/spellcheck/browser/pref_names.h" @@ -145,7 +146,7 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, prefs::kCloudPrintSubmitEnabled)); #if !defined(OS_ANDROID) EXPECT_TRUE(chrome_test_utils::GetProfile(this)->GetPrefs()->GetBoolean( - prefs::kNtpUseMostVisitedTiles)); + ntp_tiles::prefs::kNtpUseMostVisitedTiles)); #endif EXPECT_TRUE(chrome_test_utils::GetProfile(this)->GetPrefs()->GetBoolean( prefs::kHideWebStoreIcon)); diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index cd5a1ee930b9..fdb3539f47d2 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -43,6 +43,7 @@ #include "components/content_settings/core/common/pref_names.h" #include "components/embedder_support/pref_names.h" #include "components/gcm_driver/gcm_buildflags.h" +#include "components/ntp_tiles/pref_names.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/safe_browsing/core/common/safe_browsing_prefs.h" @@ -108,7 +109,6 @@ #if defined(OS_ANDROID) #include "components/feed/core/shared_prefs/pref_names.h" -#include "components/ntp_tiles/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" #endif @@ -404,7 +404,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { #if !defined(OS_ANDROID) // Turn on most visited mode on NTP by default. // We can turn customization mode on when we have add-shortcut feature. - registry->SetDefaultPrefValue(prefs::kNtpUseMostVisitedTiles, + registry->SetDefaultPrefValue(ntp_tiles::prefs::kNtpUseMostVisitedTiles, base::Value(true)); RegisterDefaultBraveBrowserPromptPrefs(registry); #endif diff --git a/browser/search/ntp_utils.cc b/browser/search/ntp_utils.cc index ba50fefc567e..3d6223a3d840 100644 --- a/browser/search/ntp_utils.cc +++ b/browser/search/ntp_utils.cc @@ -9,7 +9,7 @@ #include "brave/browser/profiles/profile_util.h" #include "brave/common/pref_names.h" #include "brave/components/crypto_dot_com/browser/buildflags/buildflags.h" -#include "chrome/common/pref_names.h" +#include "components/ntp_tiles/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -46,8 +46,8 @@ void MigrateNewTabPagePrefs(Profile* profile) { const PrefService::Preference* top_sites_pref = prefs->FindPreference(kNewTabPageShowTopSites); if (top_sites_pref->HasUserSetting()) { - prefs->SetBoolean(prefs::kNtpShortcutsVisible, - prefs->GetBoolean(kNewTabPageShowTopSites)); + prefs->SetBoolean(ntp_tiles::prefs::kNtpShortcutsVisible, + prefs->GetBoolean(kNewTabPageShowTopSites)); } // The toggle to turn off all widgets used to simply turn off From e234417de4619106433bae3788ead60945cb56fc Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 11 Jun 2021 17:32:31 +0200 Subject: [PATCH 030/205] Adapt usage of DictionaryValue::GetIntegerWithoutPathExpansion() We should use Value::FindIntKey() now. Chromium changes: https://chromium.googlesource.com/chromium/src/+/0284432657804a07a1493bdb025b111851962539 https://chromium.googlesource.com/chromium/src/+/146e9cdbf128d29b0cf72d98659d07c9e1e59df7 commit 0284432657804a07a1493bdb025b111851962539 Author: Song Fangzhen Date: Wed Jun 2 16:28:50 2021 +0000 CodeHealth: Remove use of DictionaryValue::GetIntegerWithoutPathExpansion This change removes the use of DictionaryValue::GetIntegerWithoutPathExpansion and replaces with Value::FindIntKey() Bug: 1187044 commit 146e9cdbf128d29b0cf72d98659d07c9e1e59df7 Author: Song Fangzhen Date: Fri Jun 4 15:26:07 2021 +0000 Remove DictionaryValue::GetIntegerWithoutPathExpansion After removing the use of DictionaryValue::GetIntegerWithoutPathExpansion, now DictionaryValue::GetIntegerWithoutPathExpansion itself should be removed. Bug: 1187044 --- .../core/browser/brave_content_settings_utils.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/content_settings/core/browser/brave_content_settings_utils.cc b/components/content_settings/core/browser/brave_content_settings_utils.cc index 5557c51111c9..ca18f3d5ce85 100644 --- a/components/content_settings/core/browser/brave_content_settings_utils.cc +++ b/components/content_settings/core/browser/brave_content_settings_utils.cc @@ -135,16 +135,16 @@ base::Time GetTimeStampFromDictionary(const base::DictionaryValue* dictionary, content_settings::SessionModel GetSessionModelFromDictionary( const base::DictionaryValue* dictionary, const char* key) { - int model_int = 0; - dictionary->GetIntegerWithoutPathExpansion(key, &model_int); - if ((model_int > + absl::optional model_int = dictionary->FindIntKey(key); + if (!model_int.has_value() || + (model_int > static_cast(content_settings::SessionModel::kMaxValue)) || (model_int < 0)) { model_int = 0; } content_settings::SessionModel session_model = - static_cast(model_int); + static_cast(model_int.value()); return session_model; } From ab8073d6137c36237f133eecca6cc271287a4d17 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 11 Jun 2021 17:39:37 +0200 Subject: [PATCH 031/205] Add dummy implementation override of LogStore::staged_log_user_id() BraveP3ALogStore inherits from LogStore, so we need to override this newly added method. Chromium change: https://chromium.googlesource.com/chromium/src/+/d7d5fdc161ccfa3fe292dca639a2a0b16b8709de commit d7d5fdc161ccfa3fe292dca639a2a0b16b8709de Author: Jonghyun Ahn Date: Fri Jun 4 00:15:08 2021 +0000 Reporting service checks for user id and corresponding user consent before uploading. User ID added to log metadata so log doesn't need to be de-compressed to observe user ID. Bug: 1181504 --- components/p3a/brave_p3a_log_store.cc | 5 +++++ components/p3a/brave_p3a_log_store.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/components/p3a/brave_p3a_log_store.cc b/components/p3a/brave_p3a_log_store.cc index dd3b378dacb6..5a7fb5da864e 100644 --- a/components/p3a/brave_p3a_log_store.cc +++ b/components/p3a/brave_p3a_log_store.cc @@ -144,6 +144,11 @@ const std::string& BraveP3ALogStore::staged_log_signature() const { return staged_log_signature_; } +absl::optional BraveP3ALogStore::staged_log_user_id() const { + NOTREACHED(); + return absl::nullopt; +} + void BraveP3ALogStore::StageNextLog() { // Stage the next item. DCHECK(has_unsent_logs()); diff --git a/components/p3a/brave_p3a_log_store.h b/components/p3a/brave_p3a_log_store.h index 62221daaf654..29e0ae62eaca 100644 --- a/components/p3a/brave_p3a_log_store.h +++ b/components/p3a/brave_p3a_log_store.h @@ -13,6 +13,7 @@ #include "base/strings/string_piece.h" #include "base/time/time.h" #include "components/metrics/log_store.h" +#include "third_party/abseil-cpp/absl/types/optional.h" class PrefService; class PrefRegistrySimple; @@ -56,6 +57,7 @@ class BraveP3ALogStore : public metrics::LogStore { std::string staged_log_type() const; const std::string& staged_log_hash() const override; const std::string& staged_log_signature() const override; + absl::optional staged_log_user_id() const override; void StageNextLog() override; void DiscardStagedLog() override; void MarkStagedLogAsSent() override; From 23b2cbee7ee6d0264ec0e12443174053421867fc Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 11 Jun 2021 17:47:47 +0200 Subject: [PATCH 032/205] Adapt to removal of ListValue::AppendStrings() Chromium change: https://chromium.googlesource.com/chromium/src/+/c126d64cab6443252034b1bd4b52e47ed1c50bbb commit c126d64cab6443252034b1bd4b52e47ed1c50bbb Author: Anastasiia N Date: Wed Jun 2 14:11:49 2021 +0000 CodeHealth: Remove ListValue::AppendStrings() Bug: 1187103 --- .../brave_spelling_options_submenu_observer_browsertest.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc b/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc index 9bbfed88271e..bbd1fc97834f 100644 --- a/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc +++ b/browser/renderer_context_menu/brave_spelling_options_submenu_observer_browsertest.cc @@ -70,8 +70,10 @@ class BraveSpellingOptionsSubMenuObserverTest : public InProcessBrowserTest { enable_spellcheck); menu()->GetPrefs()->SetString(language::prefs::kAcceptLanguages, accept_languages); - base::ListValue dictionaries_value; - dictionaries_value.AppendStrings(dictionaries); + base::Value dictionaries_value(base::Value::Type::LIST); + for (auto dictionary : dictionaries) { + dictionaries_value.Append(dictionary); + } menu()->GetPrefs()->Set(spellcheck::prefs::kSpellCheckDictionaries, dictionaries_value); observer()->InitMenu(content::ContextMenuParams()); From b885ba15af801d587c1e3d9b3a12553007a09cee Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 11 Jun 2021 17:56:35 +0200 Subject: [PATCH 033/205] Remove reference to features::kTabHoverCards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is already enabled by default and there's no need to explicitly enable the feature for testing purposes. Chromium changes: https://chromium.googlesource.com/chromium/src/+/e2124a1d261f70ffe0048553b0f4642e0444d6a1 https://chromium.googlesource.com/chromium/src/+/83e7d72c507e71db60900a59923e90fd3c4644ee commit e2124a1d261f70ffe0048553b0f4642e0444d6a1 Author: Caroline Rising Date: Fri Mar 5 19:30:23 2021 +0000 Clean up tab hover card feature flag and references. This feature has been launched on all platforms since M87. Bug: 910739 commit 83e7d72c507e71db60900a59923e90fd3c4644ee Author: Peter Boström Date: Wed Jun 2 16:43:11 2021 +0000 Remove stale kTabHoverCards feature flag This experiment was cleaned up and is no longer in use. Bug: 910739 --- .../ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc index 2f04702266e6..6ebc7096dd18 100644 --- a/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc +++ b/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc @@ -4,7 +4,6 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "base/strings/string_util.h" -#include "base/test/scoped_feature_list.h" #include "chrome/browser/ui/test/test_browser_dialog.h" #include "chrome/browser/ui/ui_features.h" #include "chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h" @@ -56,7 +55,6 @@ class TabHoverCardBubbleViewBrowserTest : public DialogBrowserTest { ~TabHoverCardBubbleViewBrowserTest() override = default; void SetUp() override { - scoped_feature_list_.InitAndEnableFeature(features::kTabHoverCards); DialogBrowserTest::SetUp(); } @@ -100,7 +98,6 @@ class TabHoverCardBubbleViewBrowserTest : public DialogBrowserTest { private: std::unique_ptr> animation_mode_reset_; - base::test::ScopedFeatureList scoped_feature_list_; DISALLOW_COPY_AND_ASSIGN(TabHoverCardBubbleViewBrowserTest); }; From 29d4b656a9986b7600bf18978a0fde5bb010947b Mon Sep 17 00:00:00 2001 From: samartnik Date: Fri, 11 Jun 2021 16:50:57 -0400 Subject: [PATCH 034/205] [Android] Changes for ProfileSyncServiceAndroid Chromium change: https://chromium.googlesource.com/chromium/src/+/d8ef96e6b8d1de5c4441c8b7df1dab8ef9142290 Remove ProfileSyncServiceAndroid::Init() This method is basically a way to check whether the native ProfileSyncService is null. If so, JNI_ProfileSyncService_Init() destroys ProfileSyncServiceAndroid immediately. Instead, let's check first and then construct the object if PSS is non-null. ProfileSyncServiceAndroid now only has 2 deps (the native and java services), both set on construction. The CL also does some minor readability improvements to profile_sync_service_android.cc. Bug: None --- browser/sync/brave_sync_devices_android.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/browser/sync/brave_sync_devices_android.h b/browser/sync/brave_sync_devices_android.h index b8a71499e43e..959c3d9ea869 100644 --- a/browser/sync/brave_sync_devices_android.h +++ b/browser/sync/brave_sync_devices_android.h @@ -14,6 +14,8 @@ #include "chrome/browser/sync/profile_sync_service_android.h" #include "components/sync_device_info/device_info_tracker.h" +class Profile; + namespace syncer { class BraveProfileSyncService; } From 43578e674731f7b06a401c44cf87890cc5a8f8c2 Mon Sep 17 00:00:00 2001 From: samartnik Date: Fri, 11 Jun 2021 16:52:06 -0400 Subject: [PATCH 035/205] [Android] Tab.getUrlString was removed Chromium change: https://chromium.googlesource.com/chromium/src/+/e69282129b23e48d40c953fa7d388e0ebf8c7a5a [GURL] Remove references to Tab.getUrlString() ~50 left Bug: 783819 --- .../BraveRewardsDonationSentActivity.java | 8 ++-- .../chrome/browser/BraveRewardsHelper.java | 2 +- .../browser/BraveRewardsNativeWorker.java | 2 +- .../browser/BraveRewardsPanelPopup.java | 37 ++++++++++--------- .../BraveRewardsSiteBannerActivity.java | 2 +- .../chrome/browser/app/BraveActivity.java | 14 +++---- .../RetentionNotificationPublisher.java | 10 +++-- .../browser/shields/BraveShieldsHandler.java | 4 +- .../toolbar/top/BraveToolbarLayout.java | 22 +++++------ 9 files changed, 54 insertions(+), 47 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java index e319c87dd20c..fc8d905b2aa2 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java @@ -45,13 +45,15 @@ public class BraveRewardsDonationSentActivity extends Activity implements BraveR protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.brave_rewards_donation_sent); - currentTabId_ = IntentUtils.safeGetIntExtra(getIntent(), BraveRewardsSiteBannerActivity.TAB_ID_EXTRA, -1); + currentTabId_ = IntentUtils.safeGetIntExtra( + getIntent(), BraveRewardsSiteBannerActivity.TAB_ID_EXTRA, -1); mBraveRewardsNativeWorker = BraveRewardsNativeWorker.getInstance(); mBraveRewardsNativeWorker.AddObserver(this); - String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_); + String publisherFavIconURL = + mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_); Tab currentActiveTab = BraveRewardsHelper.currentActiveChromeTabbedActivityTab(); - String url = currentActiveTab.getUrlString(); + String url = currentActiveTab.getUrl().getSpec(); String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL; mIconFetcher = new org.chromium.chrome.browser.BraveRewardsHelper(currentActiveTab); mIconFetcher.retrieveLargeIcon(favicon_url, this); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java index e8c2ccc34aec..4c3f15ba9308 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java @@ -218,7 +218,7 @@ private void retrieveLargeIconInternal() { //favIconURL (or content URL) is still not available, try to read it again if (mFaviconUrl == null || mFaviconUrl.isEmpty() || mFaviconUrl.equals("clear")) { if (mTab != null) { - mFaviconUrl = mTab.getUrlString(); + mFaviconUrl = mTab.getUrl().getSpec(); } mHandler.postDelayed(new Runnable() { diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java index b1a31ae164cf..e81a5e3c9817 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java @@ -157,7 +157,7 @@ public void TriggerOnNotifyFrontTabUrlChanged() { public void run() { Tab tab = BraveRewardsHelper.currentActiveChromeTabbedActivityTab(); if (tab != null && !tab.isIncognito()) { - OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrlString()); + OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrl().getSpec()); } } }); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java index 5916e66906fa..4898f13d0860 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java @@ -938,22 +938,23 @@ public void ShowRewardsSummary() { public void ShowWebSiteView() { tvBrBatWallet.setText(String.format(Locale.getDefault(), "%.3f", 0.0)); - String usdText = String.format(this.root.getResources().getString(R.string.brave_ui_usd), "0.00"); - ((TextView)this.root.findViewById(R.id.br_usd_wallet)).setText(usdText); + String usdText = + String.format(this.root.getResources().getString(R.string.brave_ui_usd), "0.00"); + ((TextView) this.root.findViewById(R.id.br_usd_wallet)).setText(usdText); CreateUpdateBalanceTask(); - ScrollView sv_new = (ScrollView)this.root.findViewById(R.id.sv_no_website); + ScrollView sv_new = (ScrollView) this.root.findViewById(R.id.sv_no_website); sv_new.setVisibility(View.VISIBLE); ShowRewardsSummary(); - ((LinearLayout)this.root.findViewById(R.id.website_summary)).setVisibility(View.VISIBLE); + ((LinearLayout) this.root.findViewById(R.id.website_summary)).setVisibility(View.VISIBLE); EnableWalletDetails(true); Tab currentActiveTab = BraveRewardsHelper.currentActiveChromeTabbedActivityTab(); if (currentActiveTab != null && !currentActiveTab.isIncognito()) { - String url = currentActiveTab.getUrlString(); + String url = currentActiveTab.getUrl().getSpec(); if (URLUtil.isValidUrl(url)) { mBraveRewardsNativeWorker.GetPublisherInfo(currentActiveTab.getId(), url); mPublisherFetcher = new Timer(); mPublisherFetcher.schedule(new PublisherFetchTimer(currentActiveTab.getId(), url), - PUBLISHER_INFO_FETCH_RETRY, PUBLISHER_INFO_FETCH_RETRY); + PUBLISHER_INFO_FETCH_RETRY, PUBLISHER_INFO_FETCH_RETRY); } else { btRewardsSummary.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); btRewardsSummary.setClickable(false); @@ -1421,7 +1422,6 @@ public void run() { } } - @Override public void OnPublisherInfo(int tabId) { publisherExist = true; @@ -1433,14 +1433,14 @@ public void OnPublisherInfo(int tabId) { String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId); Tab currentActiveTab = BraveRewardsHelper.currentActiveChromeTabbedActivityTab(); - String url = currentActiveTab.getUrlString(); + String url = currentActiveTab.getUrl().getSpec(); final String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL; mIconFetcher.retrieveLargeIcon(favicon_url, this); - GridLayout gl = (GridLayout)this.root.findViewById(R.id.website_summary_grid); + GridLayout gl = (GridLayout) this.root.findViewById(R.id.website_summary_grid); gl.setVisibility(View.VISIBLE); - LinearLayout ll = (LinearLayout)this.root.findViewById(R.id.br_central_layout); + LinearLayout ll = (LinearLayout) this.root.findViewById(R.id.br_central_layout); ll.setBackgroundColor(Color.WHITE); String pubName = thisObject.mBraveRewardsNativeWorker.GetPublisherName(currentTabId); @@ -1452,22 +1452,25 @@ public void OnPublisherInfo(int tabId) { pubSuffix = thisObject.root.getResources().getString(R.string.brave_ui_on_twitch); } pubName = "" + pubName + " " + pubSuffix; - TextView tv = (TextView)thisObject.root.findViewById(R.id.publisher_name); + TextView tv = (TextView) thisObject.root.findViewById(R.id.publisher_name); tv.setText(Html.fromHtml(pubName)); - tv = (TextView)thisObject.root.findViewById(R.id.publisher_attention); - String percent = Integer.toString(thisObject.mBraveRewardsNativeWorker.GetPublisherPercent(currentTabId)) + "%"; + tv = (TextView) thisObject.root.findViewById(R.id.publisher_attention); + String percent = Integer.toString(thisObject.mBraveRewardsNativeWorker.GetPublisherPercent( + currentTabId)) + + "%"; tv.setText(percent); if (btAutoContribute != null) { btAutoContribute.setOnCheckedChangeListener(null); - btAutoContribute.setChecked(!thisObject.mBraveRewardsNativeWorker.GetPublisherExcluded(currentTabId)); + btAutoContribute.setChecked( + !thisObject.mBraveRewardsNativeWorker.GetPublisherExcluded(currentTabId)); btAutoContribute.setOnCheckedChangeListener(autoContributeSwitchListener); } UpdatePublisherStatus( - thisObject.mBraveRewardsNativeWorker.GetPublisherStatus(currentTabId)); + thisObject.mBraveRewardsNativeWorker.GetPublisherStatus(currentTabId)); - tv = (TextView)root.findViewById(R.id.br_no_activities_yet); - gl = (GridLayout)thisObject.root.findViewById(R.id.br_activities); + tv = (TextView) root.findViewById(R.id.br_no_activities_yet); + gl = (GridLayout) thisObject.root.findViewById(R.id.br_activities); if (tv != null && gl != null) { tv.setVisibility(View.GONE); gl.setVisibility(View.GONE); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java index 19184c149c41..3cd7e0168143 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java @@ -130,7 +130,7 @@ public void onClick(View view) { String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_); Tab currentActiveTab = BraveRewardsHelper.currentActiveChromeTabbedActivityTab(); - String url = currentActiveTab.getUrlString(); + String url = currentActiveTab.getUrl().getSpec(); String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL; mIconFetcher = new BraveRewardsHelper(currentActiveTab); mIconFetcher.retrieveLargeIcon(favicon_url, this); diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index a18d2f7fae55..2f9720089af1 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -499,10 +499,10 @@ private void checkForNotificationData() { case RetentionNotificationUtil.BRAVE_STATS_ADS_TRACKERS: case RetentionNotificationUtil.BRAVE_STATS_DATA: case RetentionNotificationUtil.BRAVE_STATS_TIME: - if (getActivityTab() != null - && getActivityTab().getUrlString() != null - && !UrlUtilities.isNTPUrl(getActivityTab().getUrlString())) { - getTabCreator(false).launchUrl(UrlConstants.NTP_URL, TabLaunchType.FROM_CHROME_UI); + if (getActivityTab() != null && getActivityTab().getUrl().getSpec() != null + && !UrlUtilities.isNTPUrl(getActivityTab().getUrl().getSpec())) { + getTabCreator(false).launchUrl( + UrlConstants.NTP_URL, TabLaunchType.FROM_CHROME_UI); } break; case RetentionNotificationUtil.DAY_10: @@ -518,8 +518,8 @@ public void checkForBraveStats() { if (OnboardingPrefManager.getInstance().isBraveStatsEnabled()) { BraveStatsUtil.showBraveStats(); } else { - if (getActivityTab() != null && getActivityTab().getUrlString() != null - && !UrlUtilities.isNTPUrl(getActivityTab().getUrlString())) { + if (getActivityTab() != null && getActivityTab().getUrl().getSpec() != null + && !UrlUtilities.isNTPUrl(getActivityTab().getUrl().getSpec())) { OnboardingPrefManager.getInstance().setFromNotification(true); if (getTabCreator(false) != null) { getTabCreator(false).launchUrl( @@ -688,7 +688,7 @@ public void openRewardsPanel() { public Tab selectExistingTab(String url) { Tab tab = getActivityTab(); - if (tab != null && tab.getUrlString().equals(url)) { + if (tab != null && tab.getUrl().getSpec().equals(url)) { return tab; } diff --git a/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationPublisher.java b/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationPublisher.java index 795b32704229..2a8555d212ab 100644 --- a/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationPublisher.java +++ b/android/java/org/chromium/chrome/browser/notifications/retention/RetentionNotificationPublisher.java @@ -56,10 +56,12 @@ public void onReceive(Context context, Intent intent) { case RetentionNotificationUtil.BRAVE_STATS_ADS_TRACKERS: case RetentionNotificationUtil.BRAVE_STATS_DATA: case RetentionNotificationUtil.BRAVE_STATS_TIME: - if (braveActivity.getActivityTab() != null - && braveActivity.getActivityTab().getUrlString() != null - && !UrlUtilities.isNTPUrl(braveActivity.getActivityTab().getUrlString())) { - braveActivity.getTabCreator(false).launchUrl(UrlConstants.NTP_URL, TabLaunchType.FROM_CHROME_UI); + if (braveActivity.getActivityTab() != null + && braveActivity.getActivityTab().getUrl().getSpec() != null + && !UrlUtilities.isNTPUrl( + braveActivity.getActivityTab().getUrl().getSpec())) { + braveActivity.getTabCreator(false).launchUrl( + UrlConstants.NTP_URL, TabLaunchType.FROM_CHROME_UI); } break; case RetentionNotificationUtil.DAY_10: diff --git a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java index a452007df88e..479ff1afcd92 100644 --- a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java +++ b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java @@ -202,7 +202,7 @@ public void addObserver(BraveShieldsMenuObserver menuObserver) { public void show(View anchorView, Tab tab) { if (mHardwareButtonMenuAnchor == null) return; - mHost = tab.getUrlString(); + mHost = tab.getUrl().getSpec(); mTitle = tab.getUrl().getHost(); mTabId = tab.getId(); mProfile = Profile.fromWebContents(tab.getWebContents()); @@ -401,7 +401,7 @@ private void initViews() { private void setUpMainLayout() { String favIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(mTabId); Tab currentActiveTab = mIconFetcher.getTab(); - String url = currentActiveTab.getUrlString(); + String url = currentActiveTab.getUrl().getSpec(); final String favicon_url = (favIconURL.isEmpty()) ? url : favIconURL; mIconFetcher.retrieveLargeIcon(favicon_url, this); diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java index ce9a6ca53bc8..66af9c4eef12 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -248,7 +248,7 @@ public void blockEvent(int tabId, String block_type, String subresource) { && (block_type.equals(BraveShieldsContentSettings.RESOURCE_IDENTIFIER_ADS) || block_type.equals(BraveShieldsContentSettings .RESOURCE_IDENTIFIER_TRACKERS))) { - addStatsToDb(block_type, subresource, currentTab.getUrlString()); + addStatsToDb(block_type, subresource, currentTab.getUrl().getSpec()); } } @@ -382,11 +382,11 @@ public void onDidFinishNavigation(Tab tab, NavigationHandle navigation) { if (getToolbarDataProvider().getTab() == tab && mBraveRewardsNativeWorker != null && !tab.isIncognito()) { mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged( - tab.getId(), tab.getUrlString()); + tab.getId(), tab.getUrl().getSpec()); } - if (PackageUtils.isFirstInstall(getContext()) && tab.getUrlString() != null - && (tab.getUrlString().equals(BraveActivity.REWARDS_SETTINGS_URL) - || tab.getUrlString().equals( + if (PackageUtils.isFirstInstall(getContext()) && tab.getUrl().getSpec() != null + && (tab.getUrl().getSpec().equals(BraveActivity.REWARDS_SETTINGS_URL) + || tab.getUrl().getSpec().equals( BraveActivity.BRAVE_REWARDS_SETTINGS_URL)) && !BraveAdsNativeHelper.nativeIsBraveAdsEnabled( Profile.getLastUsedRegularProfile()) @@ -410,7 +410,7 @@ public void didSelectTab(Tab tab, @TabSelectionType int type, int lastId) { if (getToolbarDataProvider().getTab() == tab && mBraveRewardsNativeWorker != null && !tab.isIncognito()) { mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged( - tab.getId(), tab.getUrlString()); + tab.getId(), tab.getUrl().getSpec()); } } }; @@ -426,7 +426,7 @@ private void checkForTooltip(Tab tab) { BraveShieldsUtils.PREF_SHIELDS_TOOLTIP); } else if (!BraveShieldsUtils.hasShieldsTooltipShown( BraveShieldsUtils.PREF_SHIELDS_VIDEO_ADS_BLOCKED_TOOLTIP) - && shouldShowVideoTooltip(tab.getUrlString())) { + && shouldShowVideoTooltip(tab.getUrl().getSpec())) { showTooltip(ShieldsTooltipEnum.VIDEO_ADS_BLOCKED_TOOLTIP, BraveShieldsUtils.PREF_SHIELDS_VIDEO_ADS_BLOCKED_TOOLTIP); } else if (!BraveShieldsUtils.hasShieldsTooltipShown( @@ -469,7 +469,7 @@ private void chooseStatsShareTier(Tab tab, int trackersPlusAdsBlocked) { || BraveActivity.getBraveActivity() == null || BraveActivity.getBraveActivity().getActivityTab() == null || UrlUtilities.isNTPUrl( - BraveActivity.getBraveActivity().getActivityTab().getUrlString())) { + BraveActivity.getBraveActivity().getActivityTab().getUrl().getSpec())) { return; } @@ -895,7 +895,7 @@ private void showShieldsMenu(View mBraveShieldsButton) { return; } try { - URL url = new URL(currentTab.getUrlString()); + URL url = new URL(currentTab.getUrl().getSpec()); // Don't show shields popup if protocol is not valid for shields. if (!isValidProtocolForShields(url.getProtocol())) { return; @@ -934,7 +934,7 @@ public void onUrlFocusChange(boolean hasFocus) { && BraveActivity.getBraveActivity() != null && BraveActivity.getBraveActivity().getActivityTab() != null && UrlUtilities.isNTPUrl( - BraveActivity.getBraveActivity().getActivityTab().getUrlString()) + BraveActivity.getBraveActivity().getActivityTab().getUrl().getSpec()) && !OnboardingPrefManager.getInstance().hasSearchEngineOnboardingShown()) { Intent searchActivityIntent = new Intent(context, SearchActivity.class); context.startActivity(searchActivityIntent); @@ -1052,7 +1052,7 @@ private boolean isShieldsOnForTab(Tab tab) { return false; } return BraveShieldsContentSettings.getShields( - Profile.fromWebContents(((TabImpl) tab).getWebContents()), tab.getUrlString(), + Profile.fromWebContents(((TabImpl) tab).getWebContents()), tab.getUrl().getSpec(), BraveShieldsContentSettings.RESOURCE_IDENTIFIER_BRAVE_SHIELDS); } From 47ca776f03a94cce22d93bb74743fe839746f298 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 16 Jun 2021 15:50:27 +0200 Subject: [PATCH 036/205] Check for ephemeral storage where needed from RestrictedCookieManager We previously only had to replace calls to IsCookieAccessAllowed() and IsCookieAccessible() with calls to IsEphemeralCookieAccessAllowed(), but we now need to also include IsFullCookieAccessAllowed() or we will end up wrongly blocking 3P cookies when Ephemeral storage is enabled. This change fixes the following 6 browser tests: * EphemeralStorageTest.CrossSiteCookiesBlockedInitial * EphemeralStorageTest.CrossSiteCookiesBlockedNewPageResetSession * EphemeralStorageTest.CrossSiteCookiesBlockedRemotePageNewSession * EphemeralStorageTest.CrossSiteCookiesBlockedRemotePageSameSession * EphemeralStorageTest.CrossSiteCookiesBlockedThisPageDifferentSession * EphemeralStorageTest.CrossSiteCookiesBlockedThisPageSameSession Chromium change: https://chromium.googlesource.com/chromium/src/+/32dfa4130cd0729f4dd39a59837582e8ff495b9c commit 32dfa4130cd0729f4dd39a59837582e8ff495b9c Author: cfredric Date: Thu Jun 3 14:39:42 2021 +0000 Rename remaining non-read IsCookieAccessAllowed callsites. IsCookieAccessAllowed will be deleted after the remaining "read" callsites have been rewritten in a subsequent CL. (In this context, by "read", I'm referring to callsites that actually read cookies. Some callsites of IsCookieAccessAllowed read cookies, some set cookies, and some do neither.) Bug: 1203706 --- chromium_src/services/network/restricted_cookie_manager.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/chromium_src/services/network/restricted_cookie_manager.cc b/chromium_src/services/network/restricted_cookie_manager.cc index ad2c3c419cea..396f844ee6cc 100644 --- a/chromium_src/services/network/restricted_cookie_manager.cc +++ b/chromium_src/services/network/restricted_cookie_manager.cc @@ -21,9 +21,11 @@ // IsEphemeralCookieAccessAllowed declared & defined via a chromium_src override // for components/content_settings/core/common/cookie_settings_base.{h,cc}. #define IsCookieAccessAllowed IsEphemeralCookieAccessAllowed +#define IsFullCookieAccessAllowed IsEphemeralCookieAccessAllowed #include "../../../../services/network/restricted_cookie_manager.cc" +#undef IsFullCookieAccessAllowed #undef IsCookieAccessAllowed #undef IsCookieAccessible From 15ecc5434d5ecc94b12f3cad4b09ce08b1284001 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 16:58:03 +0200 Subject: [PATCH 037/205] Updated patches from Chromium 93.0.4535.3 to Chromium 93.0.4542.2. --- patches/base-BUILD.gn.patch | 4 +- ...ld-config-android-internal_rules.gni.patch | 2 +- patches/build-config-android-rules.gni.patch | 2 +- patches/build-config-compiler-BUILD.gn.patch | 4 +- patches/chrome-BUILD.gn.patch | 18 ++++---- patches/chrome-android-BUILD.gn.patch | 12 ++--- ...rome-android-chrome_java_sources.gni.patch | 2 +- ...ome-android-java-AndroidManifest.xml.patch | 8 ++-- ...hromium-chrome-browser-AppHooks.java.patch | 4 +- ...me-browser-ChromeTabbedActivity.java.patch | 4 +- ...er-TabbedModeTabDelegateFactory.java.patch | 4 +- ...rome-browser-app-ChromeActivity.java.patch | 6 +-- ...rowser-sync-AndroidSyncSettings.java.patch | 2 +- ...ync-settings-ManageSyncSettings.java.patch | 4 +- ...-browser-toolbar-ToolbarManager.java.patch | 4 +- patches/chrome-browser-BUILD.gn.patch | 4 +- patches/chrome-browser-about_flags.cc.patch | 6 +-- ...hrome-browser-browser_process_impl.h.patch | 4 +- ...wser-chrome_content_browser_client.h.patch | 4 +- ...ponent_extension_resource_manager.cc.patch | 2 +- ...rotocol-external_protocol_handler.cc.patch | 4 +- ...flags-android-chrome_feature_list.cc.patch | 4 +- ...et-system_network_context_manager.cc.patch | 2 +- ...notification_display_service_impl.cc.patch | 4 +- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 +-- ...profiles-profile_avatar_icon_util.cc.patch | 2 +- ...ome-browser-profiles-profile_impl.cc.patch | 2 +- ...rome-browser-profiles-profile_impl.h.patch | 2 +- ...e-browser-profiles-profile_manager.h.patch | 4 +- ...text_menu-render_view_context_menu.h.patch | 4 +- ...rowser-resources-extensions-BUILD.gn.patch | 2 +- ...resources-history-history_toolbar.ts.patch | 4 +- ...-browser-resources-pdf-manifest.json.patch | 4 +- ...ettings-privacy_page-privacy_page.js.patch | 2 +- ...r-resources-tools-optimize_webui.gni.patch | 4 +- ...er-resources-tools-optimize_webui.py.patch | 6 +-- patches/chrome-browser-ui-BUILD.gn.patch | 4 +- ...-browser-ui-android-toolbar-BUILD.gn.patch | 2 +- patches/chrome-browser-ui-browser.cc.patch | 6 +-- patches/chrome-browser-ui-browser.h.patch | 4 +- ...rtup-startup_browser_creator_impl.cc.patch | 4 +- ...r-ui-startup-startup_tab_provider.cc.patch | 4 +- ...me-browser-ui-tabs-tab_strip_model.h.patch | 4 +- ...toolbar-recent_tabs_sub_menu_model.h.patch | 4 +- ...views-bookmarks-bookmark_bar_view.cc.patch | 4 +- ...-views-download-download_item_view.h.patch | 2 +- ...rowser-ui-views-frame-browser_view.h.patch | 2 +- ...ws-location_bar-location_bar_view.cc.patch | 4 +- ...ews-location_bar-location_bar_view.h.patch | 6 +-- ...s-location_bar-location_icon_view.cc.patch | 4 +- ...ews-profiles-avatar_toolbar_button.h.patch | 2 +- ...ser-ui-views-tabs-tab_style_views.cc.patch | 4 +- ...wser-ui-views-toolbar-toolbar_view.h.patch | 10 ++--- .../chrome-browser-ui-webui-about_ui.cc.patch | 4 +- ...-chrome_web_ui_controller_factory.cc.patch | 2 +- ...-ui-webui-settings-people_handler.cc.patch | 8 ++-- ...ttings_localized_strings_provider.cc.patch | 4 +- ...bui-settings-site_settings_helper.cc.patch | 2 +- patches/chrome-common-BUILD.gn.patch | 2 +- patches/chrome-installer-linux-BUILD.gn.patch | 14 +++--- ...taller-mini_installer-chrome.release.patch | 4 +- ...er-chrome_content_renderer_client.cc.patch | 4 +- ...tor-qrcode_generator_service_impl.cc.patch | 13 ------ patches/chrome-test-BUILD.gn.patch | 4 +- patches/chrome-utility-BUILD.gn.patch | 2 +- ...s-bookmarks-browser-bookmark_model.h.patch | 4 +- ...er-page_specific_content_settings.cc.patch | 2 +- ...derer-content_settings_agent_impl.cc.patch | 4 +- ...history-core-browser-history_types.h.patch | 2 +- .../components-omnibox-browser-BUILD.gn.patch | 2 +- ...x-browser-autocomplete_controller.cc.patch | 2 +- ...mnibox-browser-omnibox_edit_model.cc.patch | 2 +- patches/components-page_info-BUILD.gn.patch | 4 +- ...components-page_info-page_info_ui.cc.patch | 4 +- ...nager-core-browser-login_database.cc.patch | 2 +- patches/components-permissions-BUILD.gn.patch | 4 +- ...s-permissions-permission_uma_util.cc.patch | 2 +- ...mponents-permissions-request_type.cc.patch | 2 +- ...licy-tools-generate_policy_source.py.patch | 6 +-- .../components-search_engines-BUILD.gn.patch | 4 +- ...itials-content-cert_report_helper.cc.patch | 2 +- patches/components-sync-driver-BUILD.gn.patch | 2 +- ...ents-sync-driver-sync_service_impl.h.patch | 4 +- ...ents-translate-core-browser-BUILD.gn.patch | 2 +- ...r_host-navigation_controller_impl.cc.patch | 4 +- ...-renderer_host-navigation_request.cc.patch | 6 +-- patches/content-common-BUILD.gn.patch | 2 +- patches/content-common-user_agent.cc.patch | 4 +- ...lic-browser-content_browser_client.h.patch | 4 +- ...ontent-renderer-render_frame_impl.cc.patch | 4 +- ...ntent-renderer-render_thread_impl.cc.patch | 2 +- ...r-api-web_request-web_request_api.cc.patch | 2 +- ...nsions-browser-sandboxed_unpacker.cc.patch | 4 +- patches/net-BUILD.gn.patch | 4 +- patches/net-cookies-canonical_cookie.cc.patch | 4 +- patches/net-dns-BUILD.gn.patch | 2 +- ...-common-client_hints-client_hints.cc.patch | 2 +- ...er-bindings-generated_in_modules.gni.patch | 4 +- ...d_party-blink-renderer-core-BUILD.gn.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 4 +- ...re-html-canvas-html_canvas_element.h.patch | 2 +- ...-html-canvas-html_canvas_element.idl.patch | 2 +- ...anvas2d-base_rendering_context_2d.cc.patch | 6 +-- ...vas2d-canvas_rendering_context_2d.cc.patch | 4 +- ...modules-cookie_store-cookie_store.cc.patch | 4 +- ...modules-mediastream-media_devices.cc.patch | 2 +- ...bgl-webgl2_rendering_context_base.cc.patch | 2 +- ...ebgl-webgl_rendering_context_base.cc.patch | 44 +++++++++---------- ...snapshot-win-process_snapshot_win.cc.patch | 2 +- ...shpad-util-net-http_transport_win.cc.patch | 2 +- ...tools-gritsettings-resource_ids.spec.patch | 4 +- ...rams_xml-histogram_suffixes_list.xml.patch | 4 +- ...ws-controls-button-md_text_button.cc.patch | 4 +- ...ar-cr_toolbar_selection_overlay.html.patch | 2 +- 114 files changed, 235 insertions(+), 248 deletions(-) delete mode 100644 patches/chrome-services-qrcode_generator-qrcode_generator_service_impl.cc.patch diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 620f36f8139a..4a1f2b3d773d 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 fad1f1b0913556807affd2b24f34dfdea70ffc20..4d2693f7fef8da76b253fb4d017ea4c0032ba811 100644 +index cdf351b0ab362d469257a730ce4e6a6f7ab228ef..096c1cc82fe4ef7c97940263d474c46104610200 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3917,6 +3917,7 @@ if (is_android) { +@@ -3915,6 +3915,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-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index 220697841d83..0381bb0c44a8 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index 11eb48cd2528b5afeafc36aabc05203c2a54156b..8f153547f6a54fb3a918bc9ffc3d6ebdd91b79f7 100644 +index 472a6f6011586456724bf7a9274e20eaf1563cca..913789593d6452c3731279986c784ed5980c4d1e 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -1949,6 +1949,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 3c0a8075b638..07531e85a968 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 d33240dcbe17974c331d6915966c25295a3edaa8..a45746e67ab5fa4aef0cd99690779b0b0d4d1d93 100644 +index d61fa88ec2e5433d7120d05383485d29cc3c7862..cacb7878920f8c30c665d62a3795d11448b72a77 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -476,6 +476,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 994d6b73f343..7be88b569b40 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 39659dbd1be7312447db1d4bb8218dfc6985d928..a7a4005e4417c8c0ec9ef5a947d1434b69e84cba 100644 +index 3abdf7d232cf9fd998d32cd52217b2148fe1daac..19b7dfde6d34011d2392526f144826646c54df20 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1733,6 +1733,7 @@ config("chromium_code") { +@@ -1727,6 +1727,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 70e021e603e7..be5d9449acd1 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 ac58c2e6696a3e8278dd9d017b4b9671e671edf6..69887e19000cf7610b690ec0a290115aa82c4198 100644 +index 3aeda626f18b23cb79e81710c08c353b5abe6651..f1d83c5283379b01118069270b57e0f0bd7968e5 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -171,6 +171,7 @@ if (!is_android && !is_mac) { @@ -32,7 +32,7 @@ index ac58c2e6696a3e8278dd9d017b4b9671e671edf6..69887e19000cf7610b690ec0a290115a if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -541,7 +544,7 @@ if (is_win) { +@@ -540,7 +543,7 @@ if (is_win) { args = [ "-b", @@ -41,7 +41,7 @@ index ac58c2e6696a3e8278dd9d017b4b9671e671edf6..69887e19000cf7610b690ec0a290115a "-v", chrome_version_full, "-g", -@@ -615,6 +618,7 @@ if (is_win) { +@@ -614,6 +617,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -49,7 +49,7 @@ index ac58c2e6696a3e8278dd9d017b4b9671e671edf6..69887e19000cf7610b690ec0a290115a } } -@@ -647,9 +651,11 @@ if (is_win) { +@@ -646,9 +650,11 @@ if (is_win) { "--scm=0", ] } @@ -61,7 +61,7 @@ index ac58c2e6696a3e8278dd9d017b4b9671e671edf6..69887e19000cf7610b690ec0a290115a if (is_chrome_branded) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -676,6 +682,7 @@ if (is_win) { +@@ -675,6 +681,7 @@ if (is_win) { info_plist_target = ":chrome_helper_plist" } @@ -69,7 +69,7 @@ index ac58c2e6696a3e8278dd9d017b4b9671e671edf6..69887e19000cf7610b690ec0a290115a extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -1151,6 +1158,7 @@ if (is_win) { +@@ -1148,6 +1155,7 @@ if (is_win) { if (is_chrome_branded) { bundle_deps += [ ":preinstalled_apps" ] } @@ -77,7 +77,7 @@ index ac58c2e6696a3e8278dd9d017b4b9671e671edf6..69887e19000cf7610b690ec0a290115a ldflags = [ "-compatibility_version", -@@ -1335,6 +1343,7 @@ if (is_win) { +@@ -1331,6 +1339,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -85,7 +85,7 @@ index ac58c2e6696a3e8278dd9d017b4b9671e671edf6..69887e19000cf7610b690ec0a290115a "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/app:shutdown_signal_handlers", -@@ -1437,12 +1446,13 @@ group("child_dependencies") { +@@ -1433,12 +1442,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -100,7 +100,7 @@ index ac58c2e6696a3e8278dd9d017b4b9671e671edf6..69887e19000cf7610b690ec0a290115a output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1496,6 +1506,7 @@ group("resources") { +@@ -1492,6 +1502,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 183f093e2417..a0f86a5f4d36 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 1aad36edf87068b01ec3116d23ed7886bacbe66b..37ac351f198596e540ef310aab10b6402384f2e5 100644 +index 7781a2627e7c9975f2a5a1ffe3c01e8c8840f013..21260e0bb50b96ce342351cc6a123716ba4093ed 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -244,6 +244,7 @@ android_resources("chrome_app_java_resources") { +@@ -245,6 +245,7 @@ android_resources("chrome_app_java_resources") { "//third_party/androidx:androidx_preference_preference_java", "//third_party/androidx:androidx_recyclerview_recyclerview_java", ] @@ -26,7 +26,7 @@ index 1aad36edf87068b01ec3116d23ed7886bacbe66b..37ac351f198596e540ef310aab10b640 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -729,6 +732,7 @@ java_group("chrome_all_java") { +@@ -730,6 +733,7 @@ java_group("chrome_all_java") { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -34,7 +34,7 @@ index 1aad36edf87068b01ec3116d23ed7886bacbe66b..37ac351f198596e540ef310aab10b640 } # This is a list of all base module jni headers. New features should add their -@@ -769,6 +773,7 @@ group("jni_headers") { +@@ -770,6 +774,7 @@ group("jni_headers") { "//components/ukm/android:jni_headers", "//components/webauthn/android:jni_headers", ] @@ -42,7 +42,7 @@ index 1aad36edf87068b01ec3116d23ed7886bacbe66b..37ac351f198596e540ef310aab10b640 } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2034,6 +2039,7 @@ if (current_toolchain == default_toolchain) { +@@ -2036,6 +2041,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -50,7 +50,7 @@ index 1aad36edf87068b01ec3116d23ed7886bacbe66b..37ac351f198596e540ef310aab10b640 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2427,6 +2433,7 @@ android_library("base_module_java") { +@@ -2433,6 +2439,7 @@ android_library("base_module_java") { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 0844508f379c..8439fbec258a 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index 28416eadd09cd549562d30a2f9971c584cd890b0..e05e47b775918397d71423906dc4b35b573adf3e 100644 +index 127a9213e08cd69bd01e068c5f87ac5062327c4f..9b4c92d0404ec3d9224d15933d46580d34a8bcbd 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni @@ -1402,3 +1402,4 @@ chrome_java_sources = [ diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index a3794a49313f..d71775711ed5 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 9f21b4fbcd92d754324aa637c7991ed27f80fa08..5a0f003c4232238f0245ce7601ab9c618d4cb8cd 100644 +index dab1346ff08290d2f2418e2d5df4f97ef3d88929..8aa5b19a23b23afd88029f0d1306565f7e06bc40 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -56,7 +56,9 @@ by a child template that "extends" this file. @@ -57,15 +57,15 @@ index 9f21b4fbcd92d754324aa637c7991ed27f80fa08..5a0f003c4232238f0245ce7601ab9c61 android:icon="@drawable/ic_launcher" android:roundIcon="@drawable/ic_launcher_round" android:label="{% block application_label %}@string/app_name{% endblock %}" -@@ -1170,6 +1183,7 @@ by a child template that "extends" this file. +@@ -1161,6 +1174,7 @@ by a child template that "extends" this file. + android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" > - {% endif %} + {% include "//brave/android/java/AndroidManifest.xml" %} {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1248,6 +1262,7 @@ by a child template that "extends" this file. +@@ -1239,6 +1253,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 cabd638c6aa6..74e3b3755a7d 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 cbb1abee4ee04e05ee2644c3f581ae6329c79f90..dc0433979c6393007a6db8aff0fadac7570c9305 100644 +index 8230cb72bc408777b756132673eb9bf779f3a171..fc5561d55fa03bb57fefedbca5036fed1c413081 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/AppHooks.java -@@ -72,7 +72,7 @@ public abstract class AppHooks { +@@ -71,7 +71,7 @@ public abstract class AppHooks { @CalledByNative public static AppHooks get() { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index 287455a0fc4c..f25548d09a7d 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 0f4d292493de356e2211f33d47b4be2c2f4c6ab5..a78e94f95980ad9f45a148c692d52266af2e7a25 100644 +index 89da7c89725c6a280c341b56af2c39087f3b6f28..967d5423d3d42c3eb1c2991f3fe65e0040afd294 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2292,6 +2292,7 @@ public class ChromeTabbedActivity extends ChromeActivity - private ShareRegistrationCoordinator mShareRegistrationCoordinator; +@@ -380,7 +380,7 @@ public abstract class ChromeActivity + private boolean mLastPictureInPictureModeForTesting; protected ChromeActivity() { - mIntentHandler = new IntentHandler(this, createIntentHandlerDelegate()); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch index d25f20e1d0d9..7b091460bff7 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java -index efa532570fd5ef0d32c0519a1ef1b1b5e57fff95..4e1401758dd9487888a874123b650211172023ac 100644 +index 6dc5ea9b7e3b3d26537fe4b94c9258a5124381ae..4e1d8af87bcad1bca184f06016b6a5b4f9c8d86d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java @@ -73,7 +73,7 @@ public class AndroidSyncSettings { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch index 54108b24a125..f9a0e7323d89 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -index 16bf72b806fedaf8f8ef99e2d37837f24a87f288..1854a7a2d33752d3ada8f5a535adf91747063eb4 100644 +index c2ce9a70d95d002a116a488a0a2a22584b881745..27eb84ce696bef6939dc58c704df10e6521c8a8f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java @@ -25,7 +25,7 @@ import androidx.appcompat.app.AppCompatActivity; @@ -11,7 +11,7 @@ index 16bf72b806fedaf8f8ef99e2d37837f24a87f288..1854a7a2d33752d3ada8f5a535adf917 import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; -@@ -366,7 +366,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat +@@ -364,7 +364,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat IdentityServicesProvider.get() .getIdentityManager(Profile.getLastUsedRegularProfile()) .getPrimaryAccountInfo(ConsentLevel.SYNC)); 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 a17144095d72..e3abf049deba 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,5 +1,5 @@ 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 ff4b27194a5ec8113fb5885593b4113ad103c866..5323439759637c9ea0f2ffc718da447d7150067a 100644 +index 79aa3045baac3fd510603c56dc7b7004ce8e4879..47fa489bcdbe90baa7fe3bd4a65203aec8b26ecc 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 @@ -488,13 +488,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve @@ -18,7 +18,7 @@ index ff4b27194a5ec8113fb5885593b4113ad103c866..5323439759637c9ea0f2ffc718da447d appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mWindowAndroid, (focus, type) -> setUrlBarFocus(focus, type), -@@ -935,7 +935,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve +@@ -929,7 +929,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled, boolean isTabGroupsAndroidContinuationEnabled) { // clang-format off diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 182b09c930f8..e4a11e501d9f 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 29691cfbd621cb6fab1c22ad8e344ea8bfda863d..dcb59ce12922a79665c7716317c0aa74b119b143 100644 +index 62430f9f3ce6767280d888b43e62d629092788e3..a5ab63a5177ee370f44de4af72ed6c9cdadc8a9a 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2465,6 +2465,7 @@ static_library("browser") { +@@ -2459,6 +2459,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 92c9b6f5181a..6730f284560f 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 20d44cff308d4d2709e407c195c2d5647516358c..775b653c397f93c0f9a34cba1d95614d7e1c2b01 100644 +index c9ff48cda4087e8471679fc771a52f9f40366a07..9a738f179b2b9244e0852a4aee7460120312cf88 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -309,14 +309,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -310,14 +310,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -21,7 +21,7 @@ index 20d44cff308d4d2709e407c195c2d5647516358c..775b653c397f93c0f9a34cba1d95614d const FeatureEntry::Choice kPassiveListenersChoices[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -7213,6 +7213,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7202,6 +7202,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-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index b0f19831f889..5e7954252a0a 100644 --- a/patches/chrome-browser-browser_process_impl.h.patch +++ b/patches/chrome-browser-browser_process_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h -index e9c1273a3aa8372efce98520e63469a832f97e32..56a639eccbf49c983f290d583f6d22cb3589f133 100644 +index 2bb0b1ec912b007dec568400cfc16c534b2fe3fc..f5e635d621b5f251e347d719e7d26f75ab378bb3 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -209,6 +209,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -214,6 +214,7 @@ class BrowserProcessImpl : public BrowserProcess, static void RegisterPrefs(PrefRegistrySimple* registry); private: diff --git a/patches/chrome-browser-chrome_content_browser_client.h.patch b/patches/chrome-browser-chrome_content_browser_client.h.patch index 8f1711493387..ea3f98466b22 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 0dd59b011e8b5a2244caa0950f275a3ff52230f0..59687cad37b019d998e11d7db095e0ee73e08515 100644 +index 54a66b71f8e60bb59f217274816f398b9d49ed84..be40e2d055dd94138db39567a2f27e37de2f75b7 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -752,6 +752,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -751,6 +751,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: 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 b0c4e31510e9..1c80036de978 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,5 +1,5 @@ diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc -index f9d62291a24a56ee8410562c8ec0a77d51fd7ee9..26ec609bbac2d93ef5995b0ec43601062ddc6098 100644 +index 0947c538f3a4603f49205d112237e6bf38522660..e140ca5fc2e18d75cdda4eb83ea8ec1ea9239b25 100644 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc @@ -144,6 +144,7 @@ ChromeComponentExtensionResourceManager::Data::Data() { diff --git a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch index 347892283121..ef9c2aba6ad1 100644 --- a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch +++ b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc -index f928df6fa6c181a12dbf290d7f032e814b421d3f..c0015d3dabb8302400888a8329a906fbe834038e 100644 +index cc9106acff5044cfda3913313f64ad9e1a2b1daa..68fdaf4f538dc43ff0e685bc3c04937d92ebdf2b 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc -@@ -313,7 +313,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( +@@ -310,7 +310,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( // Always allow the hard-coded allowed schemes. for (size_t i = 0; i < base::size(kAllowedSchemes); ++i) { if (kAllowedSchemes[i] == scheme) 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 661df8f0033e..b0e0ea827995 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 f204c09ed3f3df33bc0c0fecd2d399321b7df0e1..d77b5d00d68cb49c74fc42479a3e3ad92d5a82f5 100644 +index c4f1cc0c6e6b2865b36ad9e89dae82a0bdb69201..500a69af529e7474413d1d9903cfb38438e6ed87 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -315,6 +315,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -317,6 +317,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { 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 6ccfd36b70f5..f377eca89980 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index 9188fe30570113da715f4f8a9bba73216d67855f..e1f048d7523faf4e6b192a0a9f821898704599fb 100644 +index 7910033624475cb719e326f92c9f225e175fc7cd..1f20c5301d3898f74a6c400e1ac452c99be15e20 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc @@ -224,7 +224,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem diff --git a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch index 5d6a2833ddc1..cae03ec220d9 100644 --- a/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch +++ b/patches/chrome-browser-notifications-notification_display_service_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_display_service_impl.cc b/chrome/browser/notifications/notification_display_service_impl.cc -index d124bf1760849a9862e7ce4834b7fe83eb7cac61..9bde4a1e5e09410608fc8c128ef1e38918594898 100644 +index d45145fc4cbf41d7bed267445c1e9c891c6f50ae..481647979c8b6e4634a9f854ccd7e246d2cf2676 100644 --- a/chrome/browser/notifications/notification_display_service_impl.cc +++ b/chrome/browser/notifications/notification_display_service_impl.cc -@@ -117,6 +117,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile) +@@ -115,6 +115,7 @@ NotificationDisplayServiceImpl::NotificationDisplayServiceImpl(Profile* profile) std::make_unique()); } #endif diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 57d3106f2318..84cd2c3a231e 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 72de75a0d5f6400f3613663d5550432318dcc352..84436cc2475ef70c55fd851604facedbdbafbee4 100644 +index 7c2f450bce18c8c03fa7612475248c0ff888bdb9..c36763629d6b4015fb8782da97dba276d48b62c4 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -943,6 +943,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -949,6 +949,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 72de75a0d5f6400f3613663d5550432318dcc352..84436cc2475ef70c55fd851604facedb // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1231,6 +1232,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1238,6 +1239,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); 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 d1ccf919f7f9..562bfff4d9ff 100644 --- a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch +++ b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc -index 4c341c734d5111a5ddf35b9a967352d273b6214f..6edac57248ef73d14f945dda0c3618776e4e3449 100644 +index 91c228daacbab333cbc4623a80d1950353e45a60..c09372511af314990eb7156b1eddae9d46be8b63 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc @@ -345,7 +345,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index 76cd37986c9e..50e110ca35e1 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 3fd507a3ed6f760b6fd37368360049fa0a488fc1..b605d0b44f388974d399f2c7412e7f4cddeb9fa2 100644 +index 9bd7f952e93ca1154cbdfeea58ec054b71ab2f1f..bdfda250966fed88dadc4def7eb093f405bd738a 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -407,7 +407,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, diff --git a/patches/chrome-browser-profiles-profile_impl.h.patch b/patches/chrome-browser-profiles-profile_impl.h.patch index b94bf6bc8e7e..469f9d0fea61 100644 --- a/patches/chrome-browser-profiles-profile_impl.h.patch +++ b/patches/chrome-browser-profiles-profile_impl.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h -index 4b6af2494038528ebf86a61507ed8d405970ce1d..440d8509d4cb737da2e89c7c8e823483e7ffc2b7 100644 +index 30293e97a41e5d13118a4271393887bf221c48d0..e45cd691abd5fcc49f0d715239fc404f5a2cc986 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h @@ -165,6 +165,7 @@ class ProfileImpl : public Profile { diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch index 816da03f5311..e042c6821f2f 100644 --- a/patches/chrome-browser-profiles-profile_manager.h.patch +++ b/patches/chrome-browser-profiles-profile_manager.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h -index cd6fdbba9b4354c849a52cfe6194fb9843d524f2..80e3dc69398d0de4fc55eb0d2b484fa0d12e4233 100644 +index 1384f548a282780f9b7b08aa11ec902c3f680aca..bc9bf6056afd0935a1a885d1987476bfb417ddb8 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h -@@ -278,6 +278,7 @@ class ProfileManager : public Profile::Delegate { +@@ -281,6 +281,7 @@ class ProfileManager : public Profile::Delegate { void set_do_final_services_init(bool do_final_services_init) { do_final_services_init_ = do_final_services_init; } diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index 3944561c0eff..8713ee16f45a 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h -index f4bc78469e2ebca0f6f57eb25767c9d42ee2078a..75e7809633522bcad3578edbeffdf3b27c69ea67 100644 +index b0b04af937235ab583e5c827694acb19598c470b..0168fe2acdb59ed0eb3388d182c0233580de0ca7 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -120,6 +120,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, +@@ -116,6 +116,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { // Returns true if keyboard lock is active and requires the user to press and // hold escape to exit exclusive access mode. bool IsPressAndHoldEscRequiredToExitFullscreen() const; diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch index 3d7fecfa9045..7f13009fd386 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 bae9844d79099b625f39423cfaaa2a5296456eab..9c21ff78077e61474d27f8b19a4f700ec99bdc69 100644 +index adc3a4d40e41c8c51689e314018ad22742de34fb..d941348814b7e641b863e8af71c715e07ef266fc 100644 --- a/chrome/browser/resources/extensions/BUILD.gn +++ b/chrome/browser/resources/extensions/BUILD.gn @@ -33,6 +33,7 @@ if (optimize_webui) { diff --git a/patches/chrome-browser-resources-history-history_toolbar.ts.patch b/patches/chrome-browser-resources-history-history_toolbar.ts.patch index e061aed8fae7..8054aeb546f2 100644 --- a/patches/chrome-browser-resources-history-history_toolbar.ts.patch +++ b/patches/chrome-browser-resources-history-history_toolbar.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/history/history_toolbar.ts b/chrome/browser/resources/history/history_toolbar.ts -index 498b0e97dafda77d2c0ed2a89911b7bdf2d97592..3766cae26bbddb08ec678de3dda2024638198b94 100644 +index 223a15ac3e3fe41a2dd65d2fdce94710faf78355..c95262fccacdd35e5524b7f8ea459bcb733f6796 100644 --- a/chrome/browser/resources/history/history_toolbar.ts +++ b/chrome/browser/resources/history/history_toolbar.ts -@@ -8,6 +8,7 @@ import './strings.m.js'; +@@ -7,6 +7,7 @@ import './strings.m.js'; import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; diff --git a/patches/chrome-browser-resources-pdf-manifest.json.patch b/patches/chrome-browser-resources-pdf-manifest.json.patch index 32df29b268d6..b341fb6200df 100644 --- a/patches/chrome-browser-resources-pdf-manifest.json.patch +++ b/patches/chrome-browser-resources-pdf-manifest.json.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/pdf/manifest.json b/chrome/browser/resources/pdf/manifest.json -index bd9d36beddbde98d349fd121fe3a95d11f5e68f3..fc4e94967a1f68ee168226497bb88316e1c82ed7 100644 +index dbe8dd5bfef358c099a9b7e214be014f57171ceb..ba5fe4153e0e1edc985f65192623a513b377e9f3 100644 --- a/chrome/browser/resources/pdf/manifest.json +++ b/chrome/browser/resources/pdf/manifest.json @@ -8,6 +8,7 @@ @@ -10,7 +10,7 @@ index bd9d36beddbde98d349fd121fe3a95d11f5e68f3..fc4e94967a1f68ee168226497bb88316 "chrome://resources/", "contentSettings", "metricsPrivate", -@@ -17,6 +18,6 @@ +@@ -18,6 +19,6 @@ "mime_types": [ "application/pdf" ], diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch index 88d886d99f45..dce92961d51e 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js -index a9d1f77376620e77b449a9909b2a35d03649f7af..8319e88ed61d39e12ed3083ca8f37ca7b3a56e80 100644 +index 2aeed8b82e6a1ad25746c25a0064dbbe3f69c76e..49d5b2aadb1dc032226405b97288d150287aee44 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.js +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js @@ -18,6 +18,7 @@ import '../site_settings/settings_category_default_radio_group.js'; diff --git a/patches/chrome-browser-resources-tools-optimize_webui.gni.patch b/patches/chrome-browser-resources-tools-optimize_webui.gni.patch index fbb15e1580fd..761b4ce0232b 100644 --- a/patches/chrome-browser-resources-tools-optimize_webui.gni.patch +++ b/patches/chrome-browser-resources-tools-optimize_webui.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/tools/optimize_webui.gni b/chrome/browser/resources/tools/optimize_webui.gni -index f21fbd980f438872099497c6910d964c0cb57379..500cfe4921197cca006933508cdd79a5f7dd9dde 100644 +index 8b4098da7a728d233d85b90bd8fe248d417b5b88..7bdca098e738195704ef94903d4dae6c5cae0323 100644 --- a/chrome/browser/resources/tools/optimize_webui.gni +++ b/chrome/browser/resources/tools/optimize_webui.gni -@@ -48,6 +48,7 @@ template("optimize_webui") { +@@ -50,6 +50,7 @@ template("optimize_webui") { "chrome://resources/polymer/v3_0/|$polymer_path", "chrome://resources/|$resources_path", ] diff --git a/patches/chrome-browser-resources-tools-optimize_webui.py.patch b/patches/chrome-browser-resources-tools-optimize_webui.py.patch index ae2a58693b9d..8c3632960c42 100644 --- a/patches/chrome-browser-resources-tools-optimize_webui.py.patch +++ b/patches/chrome-browser-resources-tools-optimize_webui.py.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/tools/optimize_webui.py b/chrome/browser/resources/tools/optimize_webui.py -index 32c4bba30ecd5c96db87aeb73b3e83537232ac20..454f8e9bd05acbdc72c3a7e84b2164b05bdbb456 100755 +index ddbdbf34e886c52136bf9cc8e344da2a858589ac..84fa404d251d14c1e2231e0ca5b2fb22ec486542 100755 --- a/chrome/browser/resources/tools/optimize_webui.py +++ b/chrome/browser/resources/tools/optimize_webui.py @@ -26,6 +26,7 @@ import node_modules @@ -10,8 +10,8 @@ index 32c4bba30ecd5c96db87aeb73b3e83537232ac20..454f8e9bd05acbdc72c3a7e84b2164b0 for excluded_file in [ 'resources/polymer/v1_0/web-animations-js/web-animations-next-lite.min.js', 'resources/css/roboto.css', -@@ -50,6 +51,8 @@ def _request_list_path(out_path, host_url): - return os.path.join(out_path, host + '_requestlist.txt') +@@ -52,6 +53,8 @@ def _request_list_path(out_path, target_name): + return os.path.join(out_path, target_name + '_requestlist.txt') def _get_dep_path(dep, host_url, in_path): + for brave_host_url in ['chrome://brave-resources/', '//brave-resources/']: diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 07338a0f0448..899706f2ae54 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 71c55fc44dc45fbf2fecd24b4fe326137424caaf..39c70bc6a2e7f28ee6b2cbce20c9bb0cb6ad0f99 100644 +index 22b262f802319f70b4f9b2b204bf7a74c37743f7..46ae79bb9e97af45f502103ad458ba4113512408 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn @@ -603,6 +603,7 @@ static_library("ui") { @@ -10,7 +10,7 @@ index 71c55fc44dc45fbf2fecd24b4fe326137424caaf..39c70bc6a2e7f28ee6b2cbce20c9bb0c # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -3412,10 +3413,13 @@ static_library("ui") { +@@ -3422,10 +3423,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index 3a3bda720cc9..5e602d19657f 100644 --- a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn -index dee5afb4a336f1df86748123dc4fdbdb6480c5fc..3fa48c5d44663cbf0b60d210abff7d5ead42446e 100644 +index c1693edf429d1428f750ba1dd5a5ebd33943d7d0..117525b001ff51caf730519bfa169be3f513c659 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn @@ -66,6 +66,7 @@ android_library("java") { diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 2d25365984ef..78c874408659 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 335611dcad36ab2bf058015321a9a72d8f77989b..d0034ed4502d72d467800361011703dfed1261bd 100644 +index a850e0d28bc9a9f54ba17b04a6cc08d1de7c53c0..ebd536cfc9bdae5bc5dd1ab11db7758b86c12613 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -442,6 +442,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { +@@ -441,6 +441,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { // static Browser* Browser::Create(const CreateParams& params) { CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -10,7 +10,7 @@ index 335611dcad36ab2bf058015321a9a72d8f77989b..d0034ed4502d72d467800361011703df return new Browser(params); } -@@ -453,7 +454,7 @@ Browser::Browser(const CreateParams& params) +@@ -452,7 +453,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 3c96e55361c8..f56f0467daa2 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 25422f4bbe93f0bb31f88c2e11cd79e95d1845dd..1ce47d1d0d392d62f4880b771cccef922c1a5dd1 100644 +index 682e706b4d73f862241d441de4314b65cb78253d..ea6610c9a8db8f379d26d80d4890639c90372abb 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h -@@ -697,6 +697,7 @@ class Browser : public TabStripModelObserver, +@@ -703,6 +703,7 @@ class Browser : public TabStripModelObserver, StatusBubble* GetStatusBubbleForTesting(); 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 42880ca74aa2..43e50154d4d7 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 eb05e1b9fe54aba80bcd4d8cc52e11349bc5d9c3..5cd403df73226e60248a2ab7960d0246426905a9 100644 +index 91dc7d09f1849b8677ea385b9edccbc92d832b8f..5eedfa53194443469a38be75d7ca5cf5128c3e80 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -375,6 +375,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -376,6 +376,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( #if !BUILDFLAG(IS_CHROMEOS_ASH) welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); diff --git a/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch b/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch index 4388e3b6a573..bdba087fc3e4 100644 --- a/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch +++ b/patches/chrome-browser-ui-startup-startup_tab_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/startup/startup_tab_provider.cc b/chrome/browser/ui/startup/startup_tab_provider.cc -index d3b1e2ee6275761ae93a96f0d07bce085e30b897..65a73b5c8c2f4ed85ff6be0b882fe4509d937f22 100644 +index c9ac90ae77b58eec5bbd077606a2ddae21e1c17d..4433f4ee61b0e2d2d28d95bd09fbbab7af54b769 100644 --- a/chrome/browser/ui/startup/startup_tab_provider.cc +++ b/chrome/browser/ui/startup/startup_tab_provider.cc -@@ -145,6 +145,7 @@ StartupTabs StartupTabProviderImpl::GetExtensionCheckupTabs( +@@ -147,6 +147,7 @@ StartupTabs StartupTabProviderImpl::GetExtensionCheckupTabs( bool StartupTabProviderImpl::CanShowWelcome(bool is_signin_allowed, bool is_supervised_user, bool is_force_signin_enabled) { 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 ef07a6eee354..5b39cdfc1c6b 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 b7258e2d3563da0d71736c65b03769e765dc8641..7e32575a6f96586439db337bcba09dd60b7afe3e 100644 +index d34e48c787831d45c6ac461261345cd19a1a19bd..c4350aabdc540ec6cb8bb89ff6e70deb845be26c 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -601,6 +601,7 @@ class TabStripModel : public TabGroupController { +@@ -600,6 +600,7 @@ class TabStripModel : public TabGroupController { // Serialise this object into a trace. void WriteIntoTrace(perfetto::TracedValue context) const; diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch index 8ca8e46f812d..2b572bd11856 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h -index 3d7bcc4cc03b5aca03c6069be3d675032cbf046e..15d3475091f5241958fc1f885a7c5445f41ea52e 100644 +index e2d52f4385d8f71bfa4bf928c88542532f5ca445..96f0a49f90dba716d8b5bf112c1f8c53d2871d33 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h -@@ -75,6 +75,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel, +@@ -81,6 +81,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel, bool GetURLAndTitleForItemAtIndex(int index, std::string* url, std::u16string* title); 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 9a662660e869..afa992d64737 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 ddebb0b6bb41eb76fd10d45b92d037dd4b5d69af..c00722a2472a35876d59b540b67aa55df9ed4e3d 100644 +index 515fdba2943aa6ac801621cc62688a69a02fb27a..6ba49454fa9bbc07810ef346466d2f01df9dc25b 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -832,6 +832,7 @@ void BookmarkBarView::Layout() { +@@ -835,6 +835,7 @@ void BookmarkBarView::Layout() { x = next_x; } } diff --git a/patches/chrome-browser-ui-views-download-download_item_view.h.patch b/patches/chrome-browser-ui-views-download-download_item_view.h.patch index 4854e4bbbdd2..c321c8d39e50 100644 --- a/patches/chrome-browser-ui-views-download-download_item_view.h.patch +++ b/patches/chrome-browser-ui-views-download-download_item_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h -index c41a92af76c6d86742290b9227bab1d6586bc327..7622cb3e57e374cb11bd967bda4b5bc0b6e41ed1 100644 +index 3eda50fb7312cd3dd7c0b3ececc18b5bfe41baa0..adc0e3cdbf7a3f213a57644dcb56b1c10feb69a9 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h @@ -115,6 +115,7 @@ class DownloadItemView : public views::View, diff --git a/patches/chrome-browser-ui-views-frame-browser_view.h.patch b/patches/chrome-browser-ui-views-frame-browser_view.h.patch index 47ec3644666a..6361603c7eb3 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view.h.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h -index 17968cd66f158e7cb6feffc467d171f89bd93164..fbabc97e79caae93eb1e6bbb2b285c5f1b64e1f8 100644 +index 25b8b8290f9b19596de7a03f77a74ad16de1a52a..d343e4f9d9a1dda6387bea599fb9f2a66b5e4033 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h @@ -650,6 +650,7 @@ class BrowserView : public BrowserWindow, diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index 6648da7e51d7..60d3f2300c42 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index 3b8aba7878df24459057b67c07eeaf87d372cca1..a47ee58036be3edb674ed63d3f04863a1808f17d 100644 +index 43fca087e6f6e455f26e001279641eed93808599..40b02ba5118804c882cc99fa4edb4d374840fb44 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -596,6 +596,7 @@ void LocationBarView::Layout() { +@@ -650,6 +650,7 @@ void LocationBarView::Layout() { } }; diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch index d196091d8ad0..f1bd143b9b22 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h -index f460e9bda9240c408f635221d241450938256064..f0f2e7563b86289395f508ad5c0b7e69e4635125 100644 +index 884f10b13baf146a8d990e4b9bde1674e9dc25a0..fe3079303ff0f14bdfabc591dbad7e53a7bf831c 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -109,6 +109,7 @@ class LocationBarView : public LocationBar, @@ -10,7 +10,7 @@ index f460e9bda9240c408f635221d241450938256064..f0f2e7563b86289395f508ad5c0b7e69 void Init(); // True if this instance has been initialized by calling Init, which can only -@@ -166,6 +167,7 @@ class LocationBarView : public LocationBar, +@@ -168,6 +169,7 @@ class LocationBarView : public LocationBar, // Updates the controller, and, if |contents| is non-null, restores saved // state that the tab holds. @@ -18,7 +18,7 @@ index f460e9bda9240c408f635221d241450938256064..f0f2e7563b86289395f508ad5c0b7e69 void Update(content::WebContents* contents); // Clears the location bar's state for |contents|. -@@ -247,6 +249,7 @@ class LocationBarView : public LocationBar, +@@ -249,6 +251,7 @@ class LocationBarView : public LocationBar, std::vector& GetContentSettingViewsForTest() { return content_setting_views_; } diff --git a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch index 32c2d74ce427..db9ba659d241 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc -index 29d0784df09c61fa11d181623976aa27facc5308..15796712ce2c221fd2ae000f04c61fe8261dcc0e 100644 +index e9bcbf5b4827b63c5dd2597649b035fa33fd5de8..536ef3326e4ef953823685789643793ab9642387 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc -@@ -144,6 +144,7 @@ bool LocationIconView::GetShowText() const { +@@ -145,6 +145,7 @@ bool LocationIconView::GetShowText() const { const auto* location_bar_model = delegate_->GetLocationBarModel(); const GURL& url = location_bar_model->GetURL(); if (url.SchemeIs(content::kChromeUIScheme) || diff --git a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch index 3d5f6953cbb4..dfbbac3b3303 100644 --- a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch +++ b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -index be7f0388a76d75fb1276616f65c335036d0d7031..bb236d454caff063fc230ae868547908160cedc4 100644 +index 4d5512e5710c6d23938897bb9e1ba8ee0364deb7..00742d568657f46def6ce1a9cd67768dab65d47e 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h @@ -78,6 +78,7 @@ class AvatarToolbarButton : public ToolbarButton, diff --git a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch index 8e62e581cb10..76aca37470c5 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc -index 1874999a68ab392469ee16085679a38ead3d6ada..066fddd528c7899871cce8b0d68d6af8823918c0 100644 +index aa22593d7e38b10444243991a37d832f6aecfb4a..e131e92167e3ac81007cc9e253b32baac38ec0f1 100644 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc +++ b/chrome/browser/ui/views/tabs/tab_style_views.cc @@ -68,6 +68,7 @@ class GM2TabStyle : public TabStyleViews { @@ -27,7 +27,7 @@ index 1874999a68ab392469ee16085679a38ead3d6ada..066fddd528c7899871cce8b0d68d6af8 separator_size.width(), separator_size.height()); separator_bounds.trailing = separator_bounds.leading; -@@ -897,12 +899,16 @@ void GM2TabStyle::PaintSeparators(gfx::Canvas* canvas) const { +@@ -898,12 +900,16 @@ void GM2TabStyle::PaintSeparators(gfx::Canvas* canvas) const { SK_AlphaOPAQUE)); }; diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch index 3e43c55491a4..fad45e3e3bcc 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h -index c232c1c70350012e3da51564c40623d09a3be6de..3fcbc68d6f45aaba8772f3dba731d45787343b15 100644 +index 89ab036296e5b20963f321f62ec55915d5adb518..45e3bcfa8e89bd45da83a6b7b453af1fd2f90530 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar/toolbar_view.h -@@ -97,12 +97,14 @@ class ToolbarView : public views::AccessiblePaneView, +@@ -96,12 +96,14 @@ class ToolbarView : public views::AccessiblePaneView, ~ToolbarView() override; // Create the contents of the Browser Toolbar. @@ -17,7 +17,7 @@ index c232c1c70350012e3da51564c40623d09a3be6de..3fcbc68d6f45aaba8772f3dba731d457 void Update(content::WebContents* tab); // Updates the visibility of the custom tab bar, potentially animating the -@@ -133,6 +135,7 @@ class ToolbarView : public views::AccessiblePaneView, +@@ -132,6 +134,7 @@ class ToolbarView : public views::AccessiblePaneView, IntentPickerResponse callback); // Shows a bookmark bubble and anchors it appropriately. @@ -25,7 +25,7 @@ index c232c1c70350012e3da51564c40623d09a3be6de..3fcbc68d6f45aaba8772f3dba731d457 void ShowBookmarkBubble(const GURL& url, bool already_bookmarked, bookmarks::BookmarkBubbleObserver* observer); -@@ -197,6 +200,7 @@ class ToolbarView : public views::AccessiblePaneView, +@@ -196,6 +199,7 @@ class ToolbarView : public views::AccessiblePaneView, friend class AvatarToolbarButtonBrowserTest; protected: @@ -33,7 +33,7 @@ index c232c1c70350012e3da51564c40623d09a3be6de..3fcbc68d6f45aaba8772f3dba731d457 // This controls Toolbar, LocationBar and CustomTabBar visibility. // If we don't set all three, tab navigation from the app menu breaks // on Chrome OS. -@@ -247,6 +251,7 @@ class ToolbarView : public views::AccessiblePaneView, +@@ -246,6 +250,7 @@ class ToolbarView : public views::AccessiblePaneView, void OnChromeLabsPrefChanged(); // Loads the images for all the child views. diff --git a/patches/chrome-browser-ui-webui-about_ui.cc.patch b/patches/chrome-browser-ui-webui-about_ui.cc.patch index 11550c028765..d2a96047ea52 100644 --- a/patches/chrome-browser-ui-webui-about_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-about_ui.cc.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc -index a199e567d216242d41708e68e7b1e0ec18808d76..a62460e53511bfa6047371ca26756aca8f608c78 100644 +index a199e567d216242d41708e68e7b1e0ec18808d76..ac4493c4ddc6e73bb40e8ebb2711189194e881ec 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -579,6 +579,7 @@ std::string ChromeURLs() { html += "\n"; AppendFooter(&html); -+ CHROME_INTERNAL_URLS_TO_BRAVE ++ CHROME_INTERNAL_URLS_TO_BRAVE return html; } 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 8a6e1bfd8dff..69a4ed404ab5 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 8be071404bfff0f204f390d037d41352ce3b4d76..9102779d792d4914b1f2417e3cfdc47537cefe67 100644 +index 07fd8d25427876d9f56d106b2eb7ff3b373da11e..9422cab367477feb756fd7f589ec04088e2bab2a 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc @@ -1181,6 +1181,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( 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 81e91ac3e443..dbbaa08c21c4 100644 --- a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc -index 35113af5b7de4af12803fb5f941a68e4ef308219..db32ddb1d39a4fa203f33cc2cb5e6f2e440f21f9 100644 +index c18f918ae8338026f0550afa3f74770f61495619..15eabe253e26f8a245d5bd18962949751610da0a 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -862,6 +862,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { +@@ -821,6 +821,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { void PeopleHandler::BeforeUnloadDialogCancelled() { // The before unload dialog is only shown during the first sync setup. @@ -10,7 +10,7 @@ index 35113af5b7de4af12803fb5f941a68e4ef308219..db32ddb1d39a4fa203f33cc2cb5e6f2e DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount( signin::ConsentLevel::kSync)); syncer::SyncService* service = GetSyncService(); -@@ -912,6 +913,7 @@ std::unique_ptr PeopleHandler::GetSyncStatusDictionary() +@@ -871,6 +872,7 @@ std::unique_ptr PeopleHandler::GetSyncStatusDictionary() service && !disallowed_by_policy && service->IsSetupInProgress() && !service->GetUserSettings()->IsFirstSetupComplete() && identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)); @@ -18,7 +18,7 @@ index 35113af5b7de4af12803fb5f941a68e4ef308219..db32ddb1d39a4fa203f33cc2cb5e6f2e const sync_ui_util::StatusLabels status_labels = sync_ui_util::GetStatusLabels(profile_); -@@ -1064,6 +1066,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { +@@ -1023,6 +1025,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { } bool PeopleHandler::IsProfileAuthNeededOrHasErrors() { 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 ac411322721b..dcf937765671 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 ea433770e4d8723289b450e4551df7688343f65c..a86dc8ab2c11b668715bd0b0c4cff11961d880fa 100644 +index 674c3559b910e2a6c1a8c1c96256e418b425536e..5f27a8aa98611f94fe6177e744766b7d43f4f8cc 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2685,6 +2685,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2705,6 +2705,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 7d75a207f9d2..7346bb704f3f 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 783168496a670a06aa83f11a5f058ecc526896ad..8834cfb9f93465ec63dab8a90a0cec94392193ba 100644 +index 3a156ea256e0760bf9bcb12e9722bae9a5ec812c..a98bf0fca1ba7908778157c6fa1e65b1a50a5ab6 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc @@ -159,6 +159,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index adde5c1f37cb..01d4e06fb92d 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -10,7 +10,7 @@ index 195f082ff6d37c19e37d18170909126c0a8fc47b..4003c4e1ada82097969f7a78eaefc36e } source_set("ini_parser") { -@@ -545,6 +546,7 @@ static_library("non_code_constants") { +@@ -546,6 +548,7 @@ static_library("non_code_constants") { "//printing/buildflags", "//ui/base:buildflags", ] diff --git a/patches/chrome-installer-linux-BUILD.gn.patch b/patches/chrome-installer-linux-BUILD.gn.patch index bb52febb20ad..fa4d07ff0f0d 100644 --- a/patches/chrome-installer-linux-BUILD.gn.patch +++ b/patches/chrome-installer-linux-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/linux/BUILD.gn b/chrome/installer/linux/BUILD.gn -index 8fc934acfddeb4f4c9551dbc1ccac75f6397a4fd..f007b861b7c59a7c97b19df7751f83fc342e4615 100644 +index 338fc080cc43ffc8ada98ed2015230d5c1c79764..9fcee95c8bcfc8ff927590a4b818525ebf9949a2 100644 --- a/chrome/installer/linux/BUILD.gn +++ b/chrome/installer/linux/BUILD.gn -@@ -75,6 +75,8 @@ if (enable_swiftshader) { +@@ -79,6 +79,8 @@ if (enable_swiftshader) { ] } @@ -11,7 +11,7 @@ index 8fc934acfddeb4f4c9551dbc1ccac75f6397a4fd..f007b861b7c59a7c97b19df7751f83fc packaging_files_binaries = packaging_files_executables + packaging_files_shlibs copy("swiftshader_libs") { -@@ -176,7 +178,9 @@ strip_binary("strip_chrome_binary") { +@@ -180,7 +182,9 @@ strip_binary("strip_chrome_binary") { binary_input = "$root_out_dir/chrome" symbol_output = "$root_out_dir/chrome.debug" stripped_binary_output = "$root_out_dir/chrome.stripped" @@ -21,7 +21,7 @@ index 8fc934acfddeb4f4c9551dbc1ccac75f6397a4fd..f007b861b7c59a7c97b19df7751f83fc } # This target builds all "normal" Linux installers. You must set -@@ -225,6 +229,7 @@ copy("common_packaging_files") { +@@ -229,6 +233,7 @@ copy("common_packaging_files") { } sources += [ "//buildtools/third_party/eu-strip/bin/eu-strip" ] @@ -29,7 +29,7 @@ index 8fc934acfddeb4f4c9551dbc1ccac75f6397a4fd..f007b861b7c59a7c97b19df7751f83fc outputs = [ "$root_out_dir/installer/common/{{source_file_part}}" ] } -@@ -321,6 +326,7 @@ group("installer_deps") { +@@ -325,6 +330,7 @@ group("installer_deps") { "//sandbox/linux:chrome_sandbox", "//third_party/crashpad/crashpad/handler:crashpad_handler", ] @@ -37,7 +37,7 @@ index 8fc934acfddeb4f4c9551dbc1ccac75f6397a4fd..f007b861b7c59a7c97b19df7751f83fc if (enable_nacl) { public_deps += [ "//components/nacl/loader:nacl_helper", -@@ -359,6 +365,9 @@ group("installer_deps") { +@@ -366,6 +372,9 @@ group("installer_deps") { template("linux_package") { assert(defined(invoker.channel)) channel = invoker.channel @@ -47,7 +47,7 @@ index 8fc934acfddeb4f4c9551dbc1ccac75f6397a4fd..f007b861b7c59a7c97b19df7751f83fc if (is_chrome_branded) { package = "google-chrome" -@@ -522,3 +531,6 @@ linux_package("beta") { +@@ -529,3 +538,6 @@ linux_package("beta") { linux_package("unstable") { channel = "unstable" } diff --git a/patches/chrome-installer-mini_installer-chrome.release.patch b/patches/chrome-installer-mini_installer-chrome.release.patch index 3a7d9a2583d0..3d8627fff766 100644 --- a/patches/chrome-installer-mini_installer-chrome.release.patch +++ b/patches/chrome-installer-mini_installer-chrome.release.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release -index 76c93f844b5e43e91e744e7b24ddf7b5d1cc3b15..7ca0f9c030bd7a061d7f28e053c954c819deaec7 100644 +index ca2528d6c94870e638282971737728c245f0dcea..e5d4bbfd53fce076dec90ae0e78b513041571e0d 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -6,7 +6,7 @@ @@ -26,7 +26,7 @@ index 76c93f844b5e43e91e744e7b24ddf7b5d1cc3b15..7ca0f9c030bd7a061d7f28e053c954c8 chrome_elf.dll: %(VersionDir)s\ chrome_pwa_launcher.exe: %(VersionDir)s\ d3dcompiler_47.dll: %(VersionDir)s\ -@@ -66,6 +71,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\ +@@ -67,6 +72,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\ [HIDPI] chrome_200_percent.pak: %(VersionDir)s\ diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index 86b4c60951d9..d5c90283c9f1 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 9b520e164c548bc48c2d0e2b861b74c8532a3952..095954a794f94d51f7546b1ad199e63743899402 100644 +index feb4521500860956705f0db11ac0e740c488b901..7c0b5266437ee6522990782260eeac92da61f528 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -518,7 +518,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -517,7 +517,7 @@ void ChromeContentRendererClient::RenderFrameCreated( ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = diff --git a/patches/chrome-services-qrcode_generator-qrcode_generator_service_impl.cc.patch b/patches/chrome-services-qrcode_generator-qrcode_generator_service_impl.cc.patch deleted file mode 100644 index caea86b0060b..000000000000 --- a/patches/chrome-services-qrcode_generator-qrcode_generator_service_impl.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/services/qrcode_generator/qrcode_generator_service_impl.cc b/chrome/services/qrcode_generator/qrcode_generator_service_impl.cc -index ad9469445ff4b7665ef78b29982e6d2b998657a1..21cc4b9939f6a1cb4798234e56b0a2653aed5c6b 100644 ---- a/chrome/services/qrcode_generator/qrcode_generator_service_impl.cc -+++ b/chrome/services/qrcode_generator/qrcode_generator_service_impl.cc -@@ -78,7 +78,7 @@ void QRCodeGeneratorServiceImpl::DrawDino(SkCanvas* canvas, - const int dino_border_px, - const SkPaint& paint_foreground, - const SkPaint& paint_background) { -- int dino_width_px = pixels_per_dino_tile * dino_image::kDinoHeight; -+ int dino_width_px = pixels_per_dino_tile * dino_image::kDinoWidth; - int dino_height_px = pixels_per_dino_tile * dino_image::kDinoHeight; - - // If we request too big a dino, we'll clip. In practice the dino size diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 5000c1aa3803..5fec4e9f8615 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 1d849f6140e7a8f1d39bb3161644fbbdddeca833..14cb243f68877e74089ab808c7131f1198d53cfe 100644 +index c8712d952d90bd6366c59047988a50578627922e..1f1a200cd9f6324b78b4af89462c6189ca3b5d25 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1229,6 +1229,7 @@ if (!is_android) { +@@ -1230,6 +1230,7 @@ if (!is_android) { "//v8", ] diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch index bc7a17009c5d..f20d68d61763 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 0976a68da300b0ac06888709e16b3443b5995bb3..e324977bb6d8e9981c4bc297650b67feddb87cba 100644 +index 1cc9403039be4060509a05f6ab8190bc541b8e74..fd0104a1d12101d58ea0245e59e73ac9e390e1df 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn @@ -65,6 +65,8 @@ static_library("utility") { diff --git a/patches/components-bookmarks-browser-bookmark_model.h.patch b/patches/components-bookmarks-browser-bookmark_model.h.patch index fc8cb7ddf428..1143da6ce1c1 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 2aa13d864864ae5c8a3a80df9574e7ae18c05d09..48760a10176359c5a6b3ffe71baaf3071f66e96c 100644 +index 4864b2bbe0c5409ff18ac3b6c768e1d2155e746e..20a7ed1886f24782e123c0ef0165c577a2d85bd4 100644 --- a/components/bookmarks/browser/bookmark_model.h +++ b/components/bookmarks/browser/bookmark_model.h -@@ -304,6 +304,7 @@ class BookmarkModel : public BookmarkUndoProvider, +@@ -306,6 +306,7 @@ class BookmarkModel : public BookmarkUndoProvider, return weak_factory_.GetWeakPtr(); } 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 c9ef87b661e5..55f763684465 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 7d55a3442633ec45f57a41f5d236156ddfa359ba..eb0cbd02261e0b7685f86a22f912cdc0175091c3 100644 +index 25e4f27a67d4e58b83304f80a5ac2c224a7a9894..d534dd41bbdfe8444382d0bb82e541614e8b81ad 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc @@ -425,6 +425,7 @@ bool PageSpecificContentSettings::IsContentBlocked( diff --git a/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch b/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch index 9183b4b792f1..c0f232b28cf8 100644 --- a/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch +++ b/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc -index 3ef8da910ced0910ce666a85edce2d2168124304..49bc070c0cc79f3fae0155927ed347418d1a1c7c 100644 +index ae9907bf2b85f5bb79c01e8cd2a91b2d5cc93b85..91ade721da1190ac0d2f63d13a2ca8de697aac9e 100644 --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -461,6 +461,7 @@ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const { +@@ -458,6 +458,7 @@ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const { const WebDocument& document = render_frame()->GetWebFrame()->GetDocument(); WebSecurityOrigin origin = document.GetSecurityOrigin(); WebURL document_url = document.Url(); diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch index 98990b2bff19..e5101d143f24 100644 --- a/patches/components-history-core-browser-history_types.h.patch +++ b/patches/components-history-core-browser-history_types.h.patch @@ -1,5 +1,5 @@ diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h -index 395d15352fc42127ff6c340a8620f677f949dc4c..560ec5bc2a8b53e52987f2c675654787017053db 100644 +index 66f2e3e36cb8945c4f0a15d10e61dbc89e9e4ee8..1f1b058f7f0115eabf38c69ab8d0357519158655 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h @@ -49,6 +49,8 @@ enum VisitSource { diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index f67ddef129e6..6bb26a92e463 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index f6dc97575d3efb03657b130dc7f57c15fbaf905c..f72d615fc2760ccf8667c50faa6acade880a2e0c 100644 +index 62ef6cabd2fd33535d8f9bf7d31a632dd4de007b..b04d53d39746dd0ba610cb54da73cb95a47e1d78 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -272,6 +272,7 @@ static_library("browser") { diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index 0662bb2659ee..471fd835d467 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index 82cf0320fe3c81d4c3b166b4f864a87e0d3ee765..d1a9ed87965d0bc07411bed0c36cc7910853b1e8 100644 +index c21247aa84608a3304981eeeba5c688b21bdab0d..b9dd630314ab12c7cd63f66a23fbf1e35c40c7b0 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc @@ -289,6 +289,7 @@ AutocompleteController::AutocompleteController( diff --git a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index 7441471e5ead..f7555d0c44b3 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index 2d2836753c43bc7788fdf48045c824a48b298a4a..5a34b8618824ccfa7617f27eedec55c9d14e13b5 100644 +index f4aafdb4818c075816fa953471c3612f34ef1cec..689384851aa07a3b005ff66828c0387cb89db6b4 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc @@ -359,6 +359,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, diff --git a/patches/components-page_info-BUILD.gn.patch b/patches/components-page_info-BUILD.gn.patch index 762867ec9e21..2bdbfab6967e 100644 --- a/patches/components-page_info-BUILD.gn.patch +++ b/patches/components-page_info-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/page_info/BUILD.gn b/components/page_info/BUILD.gn -index 1de931eaf7a402141f800e28e3d9ba3407878599..5c3db37ec280592a7cf459824c8ecd536c5f25bb 100644 +index 17371dc77e439256ec1adad5d993ab7e3778cdaa..a3aea553872c6eca70d9fa09618ccce97beb4b8c 100644 --- a/components/page_info/BUILD.gn +++ b/components/page_info/BUILD.gn -@@ -42,6 +42,7 @@ static_library("page_info") { +@@ -43,6 +43,7 @@ static_library("page_info") { "//services/device/public/cpp:device_features", "//services/metrics/public/cpp:ukm_builders", ] diff --git a/patches/components-page_info-page_info_ui.cc.patch b/patches/components-page_info-page_info_ui.cc.patch index 304b0a7ed9d3..6da8306311c6 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 96f6941c4b1b229d2511000421bd654fe25debc9..6e885627e1b9600a3b60d58502f22a25908444de 100644 +index 38ebccd57d3b915344eff4b061d1abb2f28e698a..92b60cc14895776e64eaea71e23a4bd295e80158 100644 --- a/components/page_info/page_info_ui.cc +++ b/components/page_info/page_info_ui.cc -@@ -622,6 +622,7 @@ const ui::ImageModel PageInfoUI::GetPermissionIcon( +@@ -626,6 +626,7 @@ const ui::ImageModel PageInfoUI::GetPermissionIcon( const PageInfo::PermissionInfo& info) { 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 bab1e7bf1a79..22c8cfd40b4f 100644 --- a/patches/components-password_manager-core-browser-login_database.cc.patch +++ b/patches/components-password_manager-core-browser-login_database.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/password_manager/core/browser/login_database.cc b/components/password_manager/core/browser/login_database.cc -index b1840173d7351e18eaa9a4e1421c21ca7e07a559..5d9faf5fdbcbc8e672108a5fc119ebcc1959d6d9 100644 +index 624b0f54d004f8cf32789212754621473c758395..0125ee6e7c082278cf6de906351f3772a9c3eb90 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc @@ -2037,6 +2037,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index 21f29a9b366b..90d372690579 100644 --- a/patches/components-permissions-BUILD.gn.patch +++ b/patches/components-permissions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn -index 3545bd19a5c45da16e3acb55405da4a99bbcb413..12e3fe8e8294a00496e954bf42688522c5f5b308 100644 +index 4724a5c0ceb16934ee859397e651ce28411566dc..282f2e851fe675933626701afd0cea7287fb7362 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn -@@ -108,6 +108,7 @@ source_set("permissions") { +@@ -112,6 +112,7 @@ source_set("permissions") { "//ui/base", "//url", ] diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index db016d533b2b..e536e4163c9e 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 f8d4e6c52972db1dee3adf2e123516deeb0735a3..ceaeb207df0351e884233f5fc57763760ae07e3c 100644 +index c696aa7507554706837cc57cf009db810722fa57..7c6edf7c478befbda09733b568fa78314bf95286 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc @@ -107,6 +107,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) { diff --git a/patches/components-permissions-request_type.cc.patch b/patches/components-permissions-request_type.cc.patch index 7aef0d10bd6b..a7387327cb50 100644 --- a/patches/components-permissions-request_type.cc.patch +++ b/patches/components-permissions-request_type.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/request_type.cc b/components/permissions/request_type.cc -index 7e70c3b195ed2daa118dab140e6323e94b81e8d8..ec1756b47338be4de0cddd79a6fc0ed96b97fe64 100644 +index be6afd15393928afda071aa07c06687c15761c96..d7c1fdb0638fa694c7a2ef57f5d51cc1d26aeea2 100644 --- a/components/permissions/request_type.cc +++ b/components/permissions/request_type.cc @@ -235,6 +235,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch index bb8591a8fc41..4f38f9029586 100644 --- a/patches/components-policy-tools-generate_policy_source.py.patch +++ b/patches/components-policy-tools-generate_policy_source.py.patch @@ -1,8 +1,8 @@ diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py -index e59592e6e41b47fd6fe730931671d29b1c4ef641..ac1ea91b5cae82ac0e105cbe81ccb8fe9eed4f7d 100755 +index f582b5bf4c4cd6163aae55b477f924c5d1c85e68..b326e157aeeb07033c375ee3a565726c3048bc04 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py -@@ -54,6 +54,7 @@ PLATFORM_STRINGS = { +@@ -52,6 +52,7 @@ PLATFORM_STRINGS = { 'chrome.win7': ['win'] } @@ -10,7 +10,7 @@ index e59592e6e41b47fd6fe730931671d29b1c4ef641..ac1ea91b5cae82ac0e105cbe81ccb8fe class PolicyDetails: """Parses a policy template and caches all its details.""" -@@ -365,6 +366,7 @@ def main(): +@@ -363,6 +364,7 @@ def main(): chrome_major_version = ParseVersionFile(version_path) template_file_contents = _LoadJSONFile(template_file_name) diff --git a/patches/components-search_engines-BUILD.gn.patch b/patches/components-search_engines-BUILD.gn.patch index 985fdbbbb012..a0f458864b27 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 c2b09f071782eb1a9a3a7cbadc25b66a651cb89e..261310df1f7e24421230e897a22e767a4740cc98 100644 +index 6cd8400300b1c3774eb0a2abf524f0972f6eed93..64fd9061b52599d5ee5aed9e1764537edc5babe1 100644 --- a/components/search_engines/BUILD.gn +++ b/components/search_engines/BUILD.gn -@@ -197,6 +197,7 @@ json_to_struct("prepopulated_engines") { +@@ -198,6 +198,7 @@ json_to_struct("prepopulated_engines") { schema_file = "prepopulated_engines_schema.json" namespace = "TemplateURLPrepopulateData" deps = [ ":search_engine_type" ] diff --git a/patches/components-security_interstitials-content-cert_report_helper.cc.patch b/patches/components-security_interstitials-content-cert_report_helper.cc.patch index a222a825181c..98690ec5b51e 100644 --- a/patches/components-security_interstitials-content-cert_report_helper.cc.patch +++ b/patches/components-security_interstitials-content-cert_report_helper.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/security_interstitials/content/cert_report_helper.cc b/components/security_interstitials/content/cert_report_helper.cc -index 798e94ef953e20c5e058d3b3d6dbe6339335929d..ecf643ee8d8daf9dde86d1dcdc5bc1217ada9816 100644 +index da1876ef2370fb448c3e1dade4a32ec804b00756..09d0786f7f93126455804d796108d0c426f767fa 100644 --- a/components/security_interstitials/content/cert_report_helper.cc +++ b/components/security_interstitials/content/cert_report_helper.cc @@ -204,6 +204,7 @@ bool CertReportHelper::ShouldShowEnhancedProtectionMessage() { diff --git a/patches/components-sync-driver-BUILD.gn.patch b/patches/components-sync-driver-BUILD.gn.patch index 3d272bc5877d..45cd37a2e5b8 100644 --- a/patches/components-sync-driver-BUILD.gn.patch +++ b/patches/components-sync-driver-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/driver/BUILD.gn b/components/sync/driver/BUILD.gn -index a70a0cd53d6ca4fcc5ae7782061339ef29e067a8..d77b88576d80145f586cff4980de11e89733630e 100644 +index 99b3b2f091337d84c4f638f28792fb277e83dffe..5549461bf726d55376be216cddc2f5684e5c3ef9 100644 --- a/components/sync/driver/BUILD.gn +++ b/components/sync/driver/BUILD.gn @@ -107,6 +107,7 @@ static_library("driver") { diff --git a/patches/components-sync-driver-sync_service_impl.h.patch b/patches/components-sync-driver-sync_service_impl.h.patch index 504db8b48168..fb9378a905ef 100644 --- a/patches/components-sync-driver-sync_service_impl.h.patch +++ b/patches/components-sync-driver-sync_service_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/driver/sync_service_impl.h b/components/sync/driver/sync_service_impl.h -index 8595f8ffb3a1ce1a5529aea209058f846c935d0d..a1d6b2ffd9ea44d45475efeab2f9bef990cca5a2 100644 +index a0282dfe66c8d29a46173f3e074f7cad14d0b638..0161ae54f9fc7f61716be0cc9641d9f46a3a82f7 100644 --- a/components/sync/driver/sync_service_impl.h +++ b/components/sync/driver/sync_service_impl.h -@@ -254,6 +254,7 @@ class SyncServiceImpl : public SyncService, +@@ -253,6 +253,7 @@ class SyncServiceImpl : public SyncService, SyncClient* GetSyncClientForTest(); diff --git a/patches/components-translate-core-browser-BUILD.gn.patch b/patches/components-translate-core-browser-BUILD.gn.patch index 8c4598bab95f..a4170089f4f2 100644 --- a/patches/components-translate-core-browser-BUILD.gn.patch +++ b/patches/components-translate-core-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/translate/core/browser/BUILD.gn b/components/translate/core/browser/BUILD.gn -index b3464b30ea80b665ce0d705a591741192ff2d6eb..878dd86466c26b14b0b1cd5353ac5c998901d576 100644 +index c9415a06f38e7120244ea91ddb0cb87bdba2fa3f..c55f49c5e239b2fd19fffecd64bf7a4795cce09d 100644 --- a/components/translate/core/browser/BUILD.gn +++ b/components/translate/core/browser/BUILD.gn @@ -86,6 +86,7 @@ static_library("browser") { diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index c945f12d4673..b76468f1b480 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 756ed3dd4e78ce17bcd281636cfb1bdde2451528..2cb7255d262e7766599e4a1e5ac462e611aef522 100644 +index 2e80beaed696a62a0405036bea16db1a2ff104b0..523fa76aa6ca2aa12198d1858c52c78f81acd2e9 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3134,16 +3134,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3153,16 +3153,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 6cf13fbb150d..b83a4ebf0f99 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 8974f4ea4041c9ed75b833f3c063f857ba85fc00..dd0eda6820ea828785043b5e85f982a4aad8c25e 100644 +index 81d5b4fcca62c20b7f0085cfbc15a25b3aa7c759..8c7620f8125416c5cf75fe8dddbd84ae89eec533 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2157,6 +2157,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2158,6 +2158,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 8974f4ea4041c9ed75b833f3c063f857ba85fc00..dd0eda6820ea828785043b5e85f982a4 common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -3329,6 +3330,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -3327,6 +3328,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index a6772f7a1f56..08540b4c5392 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 e49ee5420a686e6d1c544452b4d202dfc7093236..f52dad852fe415b027bfb50f01b6e68da37ea5ab 100644 +index e70a3ce7e6cef0c456641178051352043002b8d3..02d51a7698cda2a1ab2d5dddbc3b7a66f3f6d17d 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -42,6 +42,7 @@ source_set("common") { diff --git a/patches/content-common-user_agent.cc.patch b/patches/content-common-user_agent.cc.patch index 49c18770218c..ccd3f389c3eb 100644 --- a/patches/content-common-user_agent.cc.patch +++ b/patches/content-common-user_agent.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc -index 3b0305e66c0897262c89c24cc822a85ea86f23d0..a0653d655a799dba752626475fdcada08937d565 100644 +index 72ff8e17cf1ade6c6c3bf68b924c4bb627ebd977..08bea775e9591641e16822cf8291d8749f1c26c5 100644 --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc -@@ -300,6 +300,7 @@ std::string GetAndroidOSInfo( +@@ -297,6 +297,7 @@ std::string GetAndroidOSInfo( // Send information about the device. bool semicolon_inserted = false; diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index a7b284b3491f..4a3fe8e41a3d 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 7dd2b78088759ffdd80c33cd529adbb93215334f..ce5dc0599e3dc166a9e7b9c61ade3bf9f6a9fb30 100644 +index 89f07fd6a1062fcf5cfd175b93e52f5d7165ceca..f5424e168614fdd66646b06c1c67f7c68883585e 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -1868,6 +1868,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1860,6 +1860,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 294f8e6415b8..a62a86601d52 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 031f052207aaec4bfde791e7d5b54ef982834559..2d1a7cf9ab59519f8f60223ddc97ea848f4c750a 100644 +index 8eff548967d161be9238402cdb7d574aa078d984..a745ca529b20fe8c44054cec40d0a13cfacfb535 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4338,6 +4338,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4327,6 +4327,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index bb3d214feec6..987fec77e374 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 32dd9d006c4d4301fc2272e2e942f0a46ebd4060..98cc75fdc3941d703f51139af85d6f1ff6a8e79b 100644 +index 3a5834f68dadd0de9071c8e7c7bd416d59d40d55..bb2e2a4a88dca2bfc78c156ddf6670a3394bde4a 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -949,6 +949,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { 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 5a7407275ade..7e647074b53b 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,5 +1,5 @@ diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc -index b7d804c359ff4943c81a817e730df9a637d3c2ee..b0bdcf52fd78ad5f7f6f7fa039ca77ce08fb3494 100644 +index 0e2f0e28f15c9172c0621e70c34f752662c2a478..de819f5428982ce83f9a08ac81b25ea7853f7fb0 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc @@ -1300,6 +1300,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( diff --git a/patches/extensions-browser-sandboxed_unpacker.cc.patch b/patches/extensions-browser-sandboxed_unpacker.cc.patch index 840273e4428c..5adf42aae0e7 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 6338be4528333a179bcde56b28de376991d890d0..37fb6479cb0ed7f358b840caf11850a2cdb1b259 100644 +index 5b7ec4d374c179496ac097250b29f07596eafb9f..4a025b4b2a6d81dafd779f32602788e126ab6047 100644 --- a/extensions/browser/sandboxed_unpacker.cc +++ b/extensions/browser/sandboxed_unpacker.cc -@@ -983,6 +983,7 @@ absl::optional SandboxedUnpacker::RewriteManifestFile( +@@ -991,6 +991,7 @@ absl::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/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index a5f75e63dd52..084f1b94c1f2 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 1f228f8cd35c0dd149044a625567616ef74f8bed..e42b2562696f1d74643740e2003e1bec58c0cd72 100644 +index 53b11eb73639f117777527faf5270126487d3072..544118c497bd1848a7c3a6095ce75cb5c530c212 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1138,6 +1138,7 @@ component("net") { +@@ -1137,6 +1137,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 3fe50221fa05..4dfadfffe3b9 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 adba3eca12f3c8738c78811a293fad6544d005c0..a13f6fc90be3a9c107b02f49cb81d67b70225c7f 100644 +index d99dc66115fb46625289af3388f4a9bf941a22c6..098c44421c53ca333ccbdc764fc582465b86cfc7 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc -@@ -452,6 +452,7 @@ std::unique_ptr CanonicalCookie::Create( +@@ -459,6 +459,7 @@ std::unique_ptr CanonicalCookie::Create( // Get the port, this will get a default value if a port isn't provided. int source_port = url.EffectiveIntPort(); diff --git a/patches/net-dns-BUILD.gn.patch b/patches/net-dns-BUILD.gn.patch index 45877f26c25f..7d42dac338fa 100644 --- a/patches/net-dns-BUILD.gn.patch +++ b/patches/net-dns-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/net/dns/BUILD.gn b/net/dns/BUILD.gn -index c398d8ac69b2f0b49a61eb7209c1f55497bfd888..0bcbb15ee81f5510b026701e6f748874315c32af 100644 +index 851032d5ca9493d8f301ba8bed20f6fb17cae1d7..07d614db48a5bbc734cb1d3a907799c53988a143 100644 --- a/net/dns/BUILD.gn +++ b/net/dns/BUILD.gn @@ -23,6 +23,7 @@ source_set("dns") { diff --git a/patches/third_party-blink-common-client_hints-client_hints.cc.patch b/patches/third_party-blink-common-client_hints-client_hints.cc.patch index f252947db324..f82cb2bc69c9 100644 --- a/patches/third_party-blink-common-client_hints-client_hints.cc.patch +++ b/patches/third_party-blink-common-client_hints-client_hints.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc -index 7d195ffcd7ea282acdf52373745402c230939a25..b0aaf3f5fe521b2ef84dd6d8186cbdf2a315e48b 100644 +index 4eefbeaef02891be61ed0c9cb607cde2839caf00..bfa3985493043c7943f3ab98c3ae9b56d09ba020 100644 --- a/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc @@ -132,6 +132,7 @@ absl::optional> FilterAcceptCH( 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 62e8f6995989..3ca7575369b3 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 de24a1e063974f7776e101cbaf6e077ad339568a..5b86dd08dc189f7a2c3bcbd577c10eecd6028d43 100644 +index 2c8828fcf90ea1ef77eb876fd679638f3df0ee2a..78a112605c39c4bb0da78cdc0a8af6d411166de0 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2434,6 +2434,7 @@ generated_interface_sources_in_modules = [ +@@ -2450,6 +2450,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.h", ] diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index ffa337e8fe66..9c17a152922e 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 b601c941d70f8b7b3c971aefb9a3034f527783a3..5bebd1231025c640150051ab949fc847ebb1f7c2 100644 +index 6564708d81f9b5d3b43659faea1b3738c375ae00..172782b18379063305cddd8a291da88385aed162 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -174,6 +174,7 @@ component("core") { 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 89fae985d4db..c14586e72d1b 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 b522be2f5e5f06146e4d980000bddcc4e4b389c7..606b1db93f1a55a1f3507ac2906623281287aadc 100644 +index fae49ea712b9af2ff78807e3f7c52d47c38bf284..70116ff76de311c25ee1db98874dde691a9d8979 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 -@@ -929,6 +929,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -920,6 +920,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch index 0df5ca95cba3..e877f9bab1eb 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h -index 1d10cd7e27735a3b1333114d0e5a235fee1a6d9b..02c74b76860426e17bf26885f5edea8357776e51 100644 +index 4e4876dc0ec679467cb7010e90f0e8a61f5c067d..7915c8f1876ca00cc4d347a49bf93c155ec80fb2 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h @@ -323,6 +323,7 @@ class CORE_EXPORT HTMLCanvasElement final diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.idl.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.idl.patch index 2ad8b964c3af..33ae489c9d56 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.idl.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.idl.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl b/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl -index d8f04c404a25a54637f432cae35c415ff5e6310b..9b499947255a823de46ea37ba4c6e645a385383b 100644 +index 3a6ff316fd3971fe47e9afffada3057c4aa80645..1fd685843fd7269dd027fabf8b19084486fed827 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.idl @@ -36,7 +36,7 @@ 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 b2636c084b4e..49706b8cfcb6 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 3289e29049fd0bd1c7bf30143a81ac1ac25da1eb..c31d78fed943288ce1993411029da9cc4b375c8a 100644 +index 492e480960d3f49f2090c0116e4f327bd0cee240..2795be971f2be74c4ddf74c68743f830380615c1 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 -@@ -1847,6 +1847,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -1875,6 +1875,7 @@ ImageData* BaseRenderingContext2D::getImageData( } ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index 3289e29049fd0bd1c7bf30143a81ac1ac25da1eb..c31d78fed943288ce1993411029da9cc int sx, int sy, int sw, -@@ -1964,6 +1965,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -1992,6 +1993,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } 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 665191d2aa87..52348d8a8ada 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 2ff888c70b38c8897573c7d2d96f7bf8da7a35f2..2061d1ab6a9eaebf487888b872d6b9904dc83d77 100644 +index 11762acc65d27b0cdcdabf5d58d88d249d9fe900..6d36b45499659ff0b04c3bec7456b63ec4beb4b2 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 -@@ -965,6 +965,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -962,6 +962,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { if (!canvas()->GetDocument().GetFrame()) return MakeGarbageCollected(); diff --git a/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch b/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch index d262e7148686..d355d3143d42 100644 --- a/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch +++ b/patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc -index 73c8f6578d730e572a0227bf88deb8774be5a509..06d3f7d2f372ee169aaeeee8316d34df2d354cb6 100644 +index 606ca6e6730a5be8261ddd6e2dc44ab02970c8c9..672554790fe16ba8411c75e6753d60a0060d682b 100644 --- a/third_party/blink/renderer/modules/cookie_store/cookie_store.cc +++ b/third_party/blink/renderer/modules/cookie_store/cookie_store.cc -@@ -82,6 +82,7 @@ std::unique_ptr ToCanonicalCookie( +@@ -83,6 +83,7 @@ std::unique_ptr ToCanonicalCookie( base::Time expires = options->hasExpiresNonNull() ? base::Time::FromJavaTime(options->expiresNonNull()) : base::Time(); 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 a6c8126a9910..23550cb25657 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,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/mediastream/media_devices.cc b/third_party/blink/renderer/modules/mediastream/media_devices.cc -index 6ced1a42748a334d9b5777db9bc0c15586ea5f4f..88bb0200f7879af207129ca58dbad7fd83922e54 100644 +index 49f1459db8c8fa2d1489a7faccb042da2d00aa66..1f8585010faaa7c4cdb4c516fb15a7e7cffbb19e 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc @@ -478,6 +478,8 @@ void MediaDevices::DevicesEnumerated( 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 732a34e97d1f..456c9590731d 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,5 +1,5 @@ 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 02015211ecd4f692df5c54c1c7afba70dab456aa..b8b963bbd1d9405f359599ef9223dee983fb363d 100644 +index 649be40f02084f449ea33c349f52941a683a7f5a..806059b4e1ef927957a424b5bc1605c71bae34ee 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 @@ -5245,6 +5245,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, 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 eaaad859c3d3..01921f0ab96c 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 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa75061f98a674 100644 +index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb63455891be3601f 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 -@@ -2939,6 +2939,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -2927,6 +2927,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -2970,6 +2971,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -2958,6 +2959,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -3000,6 +3002,7 @@ absl::optional>> +@@ -2988,6 +2990,7 @@ absl::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return absl::nullopt; @@ -26,7 +26,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -3014,6 +3017,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3002,6 +3005,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3047,6 +3051,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3035,6 +3039,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 switch (pname) { case GL_BUFFER_USAGE: { -@@ -3183,6 +3188,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3171,6 +3176,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -50,7 +50,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3584,6 +3590,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3572,6 +3578,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 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3599,6 +3606,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3587,6 +3594,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 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3691,6 +3699,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3679,6 +3687,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3746,6 +3755,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3734,6 +3743,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3756,6 +3766,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3744,6 +3754,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3807,6 +3818,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3795,6 +3806,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3838,6 +3850,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3826,6 +3838,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3868,6 +3881,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3856,6 +3869,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSample( -@@ -3880,6 +3894,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3868,6 +3882,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 return EnsureNotNull(shader->Source()); } -@@ -3909,6 +3924,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3897,6 +3912,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3943,6 +3959,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3931,6 +3947,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4202,6 +4219,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4190,6 +4207,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4226,6 +4244,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4214,6 +4232,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4303,6 +4322,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4291,6 +4310,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 3fa001a0421d199de6d4c781b2558b31108eaf61..e63413a01cda9f0c2c900e1259aa7506 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4650,6 +4670,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4638,6 +4658,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch b/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch index 2af766f203c1..765bca5b2194 100644 --- a/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch +++ b/patches/third_party-crashpad-crashpad-snapshot-win-process_snapshot_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc -index 4be203326f93472916245c31d4dbe17eaf6f589d..696c01d5c2b2cf5222c89489dd556c7209e9a345 100644 +index 21df191a5d5a82e3ad815f6d67030f5acf10c87f..437c49baa3434da0d6415865c470b8739bb1e1d9 100644 --- a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc +++ b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc @@ -523,6 +523,7 @@ void ProcessSnapshotWin::AddMemorySnapshotForLdrLIST_ENTRY( diff --git a/patches/third_party-crashpad-crashpad-util-net-http_transport_win.cc.patch b/patches/third_party-crashpad-crashpad-util-net-http_transport_win.cc.patch index 2e037bc866d6..2ab5cd7941ff 100644 --- a/patches/third_party-crashpad-crashpad-util-net-http_transport_win.cc.patch +++ b/patches/third_party-crashpad-crashpad-util-net-http_transport_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/crashpad/crashpad/util/net/http_transport_win.cc b/third_party/crashpad/crashpad/util/net/http_transport_win.cc -index 9618fbefbd53ca891a6651e7f2b0073aec9551a2..0766cddb38fb61eaaa5d0a49644632eb3a9a5678 100644 +index a91d2d2239a724880dd963080062489adb09dcf8..ed1a3e52dfd7c66d412cabd6bec27ca544dcb68d 100644 --- a/third_party/crashpad/crashpad/util/net/http_transport_win.cc +++ b/third_party/crashpad/crashpad/util/net/http_transport_win.cc @@ -156,6 +156,8 @@ bool HTTPTransportWin::ExecuteSynchronously(std::string* response_body) { diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index 778570d060b7..c381b930fd31 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 699091dadd3aa262df4d81387851fda479a48457..1d215813d636ceaec0bb3e9b7f16ddf5831ed0a4 100644 +index 5b357dc8e522ade6bae00396db62ef6fac2867bb..607453c720568d603e866185a1200ec31c19bec3 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -47,6 +47,9 @@ @@ -12,7 +12,7 @@ index 699091dadd3aa262df4d81387851fda479a48457..1d215813d636ceaec0bb3e9b7f16ddf5 "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -475,6 +478,9 @@ +@@ -479,6 +482,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 8fc319246a6d..50e8a1344b4b 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 0ed9790d2882f000e831ee222d14a5e23da618d9..fab4e8d9babb91789a5d80882e440ba20d032782 100644 +index 52106340cd742f6e941021eccfd0e9842f4c196f..2d1e4afb73e8f357e2af6ae58168f7a85746123b 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -14370,6 +14370,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -14391,6 +14391,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. diff --git a/patches/ui-views-controls-button-md_text_button.cc.patch b/patches/ui-views-controls-button-md_text_button.cc.patch index 6d287074adf2..68cdc9dff9ce 100644 --- a/patches/ui-views-controls-button-md_text_button.cc.patch +++ b/patches/ui-views-controls-button-md_text_button.cc.patch @@ -1,8 +1,8 @@ diff --git a/ui/views/controls/button/md_text_button.cc b/ui/views/controls/button/md_text_button.cc -index 55345eb74c4223b05f90ea2e451be7cd2efb6c14..71a3368822872288484f66123bdb7ee254c200c7 100644 +index 821faa5047f4078491f49617a1f6895ed1d0fa8c..6e9bebd693edbb792b6d3e57dbe1049532573beb 100644 --- a/ui/views/controls/button/md_text_button.cc +++ b/ui/views/controls/button/md_text_button.cc -@@ -261,6 +261,7 @@ void MdTextButton::UpdateColors() { +@@ -265,6 +265,7 @@ void MdTextButton::UpdateColors() { UpdateTextColor(); UpdateBackgroundColor(); SchedulePaint(); diff --git a/patches/ui-webui-resources-cr_elements-cr_toolbar-cr_toolbar_selection_overlay.html.patch b/patches/ui-webui-resources-cr_elements-cr_toolbar-cr_toolbar_selection_overlay.html.patch index a1b8052c96e8..46b007b291ca 100644 --- a/patches/ui-webui-resources-cr_elements-cr_toolbar-cr_toolbar_selection_overlay.html.patch +++ b/patches/ui-webui-resources-cr_elements-cr_toolbar-cr_toolbar_selection_overlay.html.patch @@ -1,5 +1,5 @@ diff --git a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_selection_overlay.html b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_selection_overlay.html -index 2cd069ff2f489f8662cc9ca30008e6bbd3fab539..e284948ec7aff079f266579b7c6d5c88876c54c9 100644 +index 90174e562491c6182064ee8099e29a09f3de0c6a..b2122faf74409ebc9f419af2e3684ecfb6cf8a8c 100644 --- a/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_selection_overlay.html +++ b/ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar_selection_overlay.html @@ -1,3 +1,4 @@ From 6ed6e8b7cf338ba84d938556676c26e5774332c9 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 16:58:51 +0200 Subject: [PATCH 038/205] Conflict-resolved patches from Chromium 93.0.4535.3 to Chromium 93.0.4542.2. --- patches/chrome-VERSION.patch | 6 +++--- ...settings-privacy_page-privacy_page.html.patch | 16 ++++++++-------- ...i-toolbar-recent_tabs_sub_menu_model.cc.patch | 7 ++++--- ...d-internal-common-download_item_impl.cc.patch | 6 +++--- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 2773e150ec1d..c9723cf5836c 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 95625b9ac001706a254beaa380eb488985ce509f..c5cfdaaa37bdde933d93e031426a28b7344a3a94 100644 +index ac8a64ec2770554cbddd624070472eb8e0a21faa..c5cfdaaa37bdde933d93e031426a28b7344a3a94 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=93 -MINOR=0 --BUILD=4535 --PATCH=3 +-BUILD=4542 +-PATCH=2 +MINOR=1 +BUILD=30 +PATCH=30 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 3ea665fb73f0..77e3ee66f043 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 58796d8f4f0bd414dd265c66fdd3b20ad586bde0..50256eb76f0d25dc0ff0f58f18c299e77495297f 100644 +index e6238e92375ced17d849fd54239ee25c9787e2c3..d76abffca422a6358d04e4cf3659de8a53d81c45 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 @@ @@ -7,10 +7,10 @@ index 58796d8f4f0bd414dd265c66fdd3b20ad586bde0..50256eb76f0d25dc0ff0f58f18c299e7 focus-config="[[focusConfig_]]">

+ - + @@ -18,7 +18,7 @@ index 58796d8f4f0bd414dd265c66fdd3b20ad586bde0..50256eb76f0d25dc0ff0f58f18c299e7 @@ -26,7 +26,7 @@ index 58796d8f4f0bd414dd265c66fdd3b20ad586bde0..50256eb76f0d25dc0ff0f58f18c299e7 diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch index 7a8ea9137d68..093c58b30594 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch @@ -1,11 +1,12 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc -index a6fe4b749442283b5d83ef257bd666a0550e6808..72ce3ea89d0af3241d20a1adfd44cd12e8469f01 100644 +index 4181f927ce4542a0ebfa58f10dcaf05de0492a82..48e3719fff4e6821a651c16a17792362bb37b71c 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc -@@ -585,6 +585,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { +@@ -469,6 +469,8 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { + ++k) { BuildOtherDevicesTabItem(session_tag, *tabs_in_session[k]); } // for all tabs in one session - ++ + BRAVE_BUILD_TABS_FROM_OTHER_DEVICES ++num_sessions_added; } // for all sessions diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch index 80646b7a0723..e31aaad7eebf 100644 --- a/patches/components-download-internal-common-download_item_impl.cc.patch +++ b/patches/components-download-internal-common-download_item_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc -index 29db91f855e383b1414ead95bb78338bb3e5ccbd..4c433e5c447f134fa88ecfa7f36969a1a484dc7b 100644 +index 697dadd5969d79b7fb049faa117fee5cc7842511..a6d2f901d8a839100e970fdb1cca78a4a8a42632 100644 --- a/components/download/internal/common/download_item_impl.cc +++ b/components/download/internal/common/download_item_impl.cc -@@ -1981,8 +1981,8 @@ void DownloadItemImpl::OnDownloadCompleting() { +@@ -1991,8 +1991,8 @@ void DownloadItemImpl::OnDownloadCompleting() { base::Unretained(download_file_.get()), GetTargetFilePath(), delegate_->GetApplicationClientIdForFileScanning(), @@ -10,6 +10,6 @@ index 29db91f855e383b1414ead95bb78338bb3e5ccbd..4c433e5c447f134fa88ecfa7f36969a1 - delegate_->IsOffTheRecord() ? GURL() : GetReferrerUrl(), + GURL(), // Never leak download URLs in metadata. + GURL(), // See brave-browser#2766. - std::move(quarantine), std::move(callback))); + std::move(quarantine), std::move(rename_callback))); } From 564b813798d042bad9862d001dd36df118ab5e2d Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 16:59:16 +0200 Subject: [PATCH 039/205] Update patches to JS files now migrated to TypeScript Chromium change: https://chromium.googlesource.com/chromium/src/+/8f7c30fadd05304173e12a997e9ed0450ab1aded commit 8f7c30fadd05304173e12a997e9ed0450ab1aded Author: dpapad Date: Mon Jun 7 16:10:48 2021 +0000 Extensions: Migrate to TypeScript, part3. Migrating all remaining files except for the activity_log/ folder, which will be migrated in the next (and last) part. Bug: 1189595 --- ...e-browser-resources-extensions-item_list.js.patch | 12 ------------ ...e-browser-resources-extensions-item_list.ts.patch | 12 ++++++++++++ ...me-browser-resources-extensions-manager.ts.patch} | 8 ++++---- ...me-browser-resources-extensions-toolbar.ts.patch} | 8 ++++---- 4 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 patches/chrome-browser-resources-extensions-item_list.js.patch create mode 100644 patches/chrome-browser-resources-extensions-item_list.ts.patch rename patches/{chrome-browser-resources-extensions-manager.js.patch => chrome-browser-resources-extensions-manager.ts.patch} (61%) rename patches/{chrome-browser-resources-extensions-toolbar.js.patch => chrome-browser-resources-extensions-toolbar.ts.patch} (61%) diff --git a/patches/chrome-browser-resources-extensions-item_list.js.patch b/patches/chrome-browser-resources-extensions-item_list.js.patch deleted file mode 100644 index 5caabf794e38..000000000000 --- a/patches/chrome-browser-resources-extensions-item_list.js.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/chrome/browser/resources/extensions/item_list.js b/chrome/browser/resources/extensions/item_list.js -index 5d6a46444e43d229c34654d87e3eb1ee7d4238e4..016a8d930714eca663a03e2d2d1f18fe9c1168c6 100644 ---- a/chrome/browser/resources/extensions/item_list.js -+++ b/chrome/browser/resources/extensions/item_list.js -@@ -14,6 +14,7 @@ import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-annou - import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; - - import {ItemDelegate} from './item.js'; -+import './brave_item_list_more_items.js' - - /** - * @constructor diff --git a/patches/chrome-browser-resources-extensions-item_list.ts.patch b/patches/chrome-browser-resources-extensions-item_list.ts.patch new file mode 100644 index 000000000000..3471a18532eb --- /dev/null +++ b/patches/chrome-browser-resources-extensions-item_list.ts.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/resources/extensions/item_list.ts b/chrome/browser/resources/extensions/item_list.ts +index 28e38e6fe3dd61f68c4413f837ac4d78017e6573..de00bada1eb37208bbec552185f7bc5f6031b95b 100644 +--- a/chrome/browser/resources/extensions/item_list.ts ++++ b/chrome/browser/resources/extensions/item_list.ts +@@ -14,6 +14,7 @@ import {IronA11yAnnouncer} from 'chrome://resources/polymer/v3_0/iron-a11y-annou + import {html, mixinBehaviors, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; + + import {ExtensionsItemElement, ItemDelegate} from './item.js'; ++import './brave_item_list_more_items.js' + + type Filter = (info: chrome.developerPrivate.ExtensionInfo) => boolean; + diff --git a/patches/chrome-browser-resources-extensions-manager.js.patch b/patches/chrome-browser-resources-extensions-manager.ts.patch similarity index 61% rename from patches/chrome-browser-resources-extensions-manager.js.patch rename to patches/chrome-browser-resources-extensions-manager.ts.patch index 7ce2f7813100..b3241edb9667 100644 --- a/patches/chrome-browser-resources-extensions-manager.js.patch +++ b/patches/chrome-browser-resources-extensions-manager.ts.patch @@ -1,7 +1,7 @@ -diff --git a/chrome/browser/resources/extensions/manager.js b/chrome/browser/resources/extensions/manager.js -index 969b3e9335f9ea272a2060da9b9741211b8ce61b..9478bd84fc14e64b948b12dbc65894a2115ead51 100644 ---- a/chrome/browser/resources/extensions/manager.js -+++ b/chrome/browser/resources/extensions/manager.js +diff --git a/chrome/browser/resources/extensions/manager.ts b/chrome/browser/resources/extensions/manager.ts +index e107d64743637f1195e72a59bc65b2ec9d28fad3..e1bacadecdb8bb2ee3bad14db160fc85c016f3fd 100644 +--- a/chrome/browser/resources/extensions/manager.ts ++++ b/chrome/browser/resources/extensions/manager.ts @@ -5,7 +5,6 @@ import 'chrome://resources/cr_elements/cr_drawer/cr_drawer.js'; import 'chrome://resources/cr_elements/cr_lazy_render/cr_lazy_render.m.js'; diff --git a/patches/chrome-browser-resources-extensions-toolbar.js.patch b/patches/chrome-browser-resources-extensions-toolbar.ts.patch similarity index 61% rename from patches/chrome-browser-resources-extensions-toolbar.js.patch rename to patches/chrome-browser-resources-extensions-toolbar.ts.patch index 7f6c7c6a5e82..e2027ff0cce4 100644 --- a/patches/chrome-browser-resources-extensions-toolbar.js.patch +++ b/patches/chrome-browser-resources-extensions-toolbar.ts.patch @@ -1,7 +1,7 @@ -diff --git a/chrome/browser/resources/extensions/toolbar.js b/chrome/browser/resources/extensions/toolbar.js -index 182a0927cb15c0c0575fe5dd43850b5b4674895f..bc01b71335b8bd50cc35fcc78302c446abf796b4 100644 ---- a/chrome/browser/resources/extensions/toolbar.js -+++ b/chrome/browser/resources/extensions/toolbar.js +diff --git a/chrome/browser/resources/extensions/toolbar.ts b/chrome/browser/resources/extensions/toolbar.ts +index f8dd45f2b4851cd4ec476e34d2d27acca25bb88d..537540599d03baa613c6228633fdabf3d4aaa33f 100644 +--- a/chrome/browser/resources/extensions/toolbar.ts ++++ b/chrome/browser/resources/extensions/toolbar.ts @@ -4,7 +4,7 @@ import 'chrome://resources/cr_elements/cr_button/cr_button.m.js'; From d619b3925dd688f22f13a11ea8676cdb86d2f7fc Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 16:59:44 +0200 Subject: [PATCH 040/205] Adapt to relocation of safe_browsing_network_context.cc It moved from //components/safe_browsing/core/browser to //components/safe_browsing/content/browser, so we need to adapt the patches and the chromium_src override. Chromium change: https://chromium.googlesource.com/chromium/src/+/3cacd06c63f0c2506f375bf3597d22110efe9647 commit 3cacd06c63f0c2506f375bf3597d22110efe9647 Author: Colin Blundell Date: Wed Jun 9 10:11:18 2021 +0000 [Safe Browsing] Move SafeBrowsingNetworkContext from core/ to content/ This CL moves safe_browsing_network_context.*, which depends on //content/public, from its current architecturally-incorrect //components/safe_browsing/core/browser location to //components/safe_browsing/content/browser. Bug: 1216341 --- .../safe_browsing/{core => content}/browser/DEPS | 2 +- .../browser/safe_browsing_network_context.cc | 3 ++- ...ent-browser-safe_browsing_network_context.cc.patch} | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) rename chromium_src/components/safe_browsing/{core => content}/browser/DEPS (66%) rename chromium_src/components/safe_browsing/{core => content}/browser/safe_browsing_network_context.cc (74%) rename patches/{components-safe_browsing-core-browser-safe_browsing_network_context.cc.patch => components-safe_browsing-content-browser-safe_browsing_network_context.cc.patch} (50%) diff --git a/chromium_src/components/safe_browsing/core/browser/DEPS b/chromium_src/components/safe_browsing/content/browser/DEPS similarity index 66% rename from chromium_src/components/safe_browsing/core/browser/DEPS rename to chromium_src/components/safe_browsing/content/browser/DEPS index 4cf9c2dd6302..230802f8e32d 100644 --- a/chromium_src/components/safe_browsing/core/browser/DEPS +++ b/chromium_src/components/safe_browsing/content/browser/DEPS @@ -1,5 +1,5 @@ include_rules = [ - "+../../../../../../components/safe_browsing/core/browser", + "+../../../../../../components/safe_browsing/content/browser", "+components/safe_browsing/core/browser", "+brave/services/network/public/cpp/system_request_handler.h", ] diff --git a/chromium_src/components/safe_browsing/core/browser/safe_browsing_network_context.cc b/chromium_src/components/safe_browsing/content/browser/safe_browsing_network_context.cc similarity index 74% rename from chromium_src/components/safe_browsing/core/browser/safe_browsing_network_context.cc rename to chromium_src/components/safe_browsing/content/browser/safe_browsing_network_context.cc index dec2c661dc0f..4cad0cb632fd 100644 --- a/chromium_src/components/safe_browsing/core/browser/safe_browsing_network_context.cc +++ b/chromium_src/components/safe_browsing/content/browser/safe_browsing_network_context.cc @@ -4,4 +4,5 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "brave/services/network/public/cpp/system_request_handler.h" -#include "../../../../../../components/safe_browsing/core/browser/safe_browsing_network_context.cc" // NOLINT + +#include "../../../../../../components/safe_browsing/content/browser/safe_browsing_network_context.cc" // NOLINT diff --git a/patches/components-safe_browsing-core-browser-safe_browsing_network_context.cc.patch b/patches/components-safe_browsing-content-browser-safe_browsing_network_context.cc.patch similarity index 50% rename from patches/components-safe_browsing-core-browser-safe_browsing_network_context.cc.patch rename to patches/components-safe_browsing-content-browser-safe_browsing_network_context.cc.patch index 3746d7f02b30..6e489178004b 100644 --- a/patches/components-safe_browsing-core-browser-safe_browsing_network_context.cc.patch +++ b/patches/components-safe_browsing-content-browser-safe_browsing_network_context.cc.patch @@ -1,10 +1,10 @@ -diff --git a/components/safe_browsing/core/browser/safe_browsing_network_context.cc b/components/safe_browsing/core/browser/safe_browsing_network_context.cc -index 1a3e3a87f17d8391f23edea4b45dc3a000bc4644..23617cd428c7e072c87cbfd9978e1c3562fd1aec 100644 ---- a/components/safe_browsing/core/browser/safe_browsing_network_context.cc -+++ b/components/safe_browsing/core/browser/safe_browsing_network_context.cc +diff --git a/components/safe_browsing/content/browser/safe_browsing_network_context.cc b/components/safe_browsing/content/browser/safe_browsing_network_context.cc +index 7e6ac170419864574c2a17c44b8d7ed622b726fa..e91ff2096c6a37106fdeac00554875c9842c92ea 100644 +--- a/components/safe_browsing/content/browser/safe_browsing_network_context.cc ++++ b/components/safe_browsing/content/browser/safe_browsing_network_context.cc @@ -76,8 +76,8 @@ class SafeBrowsingNetworkContext::SharedURLLoaderFactory override { - DCHECK(CurrentlyOnThread(ThreadID::UI)); + DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); GetURLLoaderFactory()->CreateLoaderAndStart( - std::move(loader), request_id, options, request, std::move(client), - traffic_annotation); From 4aa61ce1a700a08ef31428c95c3ab045db7260a6 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 17:00:03 +0200 Subject: [PATCH 041/205] Adapt to relocation of //media/blink into Blink Files live under //third_party/blink/renderer/platform/media now. Chromium change: https://chromium.googlesource.com/chromium/src/+/b56c921dc8c64ae3d7b5a3a04b168e7773dc77d6 commit b56c921dc8c64ae3d7b5a3a04b168e7773dc77d6 Author: Henrique Ferreiro Date: Wed Jun 9 17:53:59 2021 +0000 Move media/blink/ to Blink media/blink/ files are being moved to public/platform/media/ and renderer/platform/media/, depending on the private/public status of the file as mentioned in this table: https://docs.google.com/document/d/1p0OuzArDNZHT_aOm75oOWh3qR-mT6Zq-qKxxKYT-jYI/edit#bookmark=kix.2v0uvunkva0g The move includes renaming files as described in the first table at https://docs.google.com/document/d/1p0OuzArDNZHT_aOm75oOWh3qR-mT6Zq-qKxxKYT-jYI/edit#heading=h.jqrzzxjh40df where underscores are added to be consistent with the camel-case naming of the classes defined in the renamed files. //media/blink:media_blink_unittests is split with all files but one being moved to blink_platform_unittests. web_media_player_impl_unittest.cc uses WebView, so it requires a Platform object and, as such, should be moved into //third_party/blink/renderer/platform:unit_tests which is part of blink_unittests. This makes the android bots fail, as they find no tests to run. Because of this, this CL leaves this test in place, which will be removed in a follow-up, together with all of media/blink/. Only the header guards and the export macros are updated. Namespace changes and other Blink coding conventions (GURL => KURL, Blink mojom includes, etc.) are left for follow-ups. Because of the latter, this CL fails the Blink-variant mojom presubmit check. No-Presubmit: true Bug: 1198341 --- .../media-blink-key_system_config_selector.cc.patch | 12 ------------ ...latform-media-key_system_config_selector.cc.patch | 12 ++++++++++++ 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 patches/media-blink-key_system_config_selector.cc.patch create mode 100644 patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch diff --git a/patches/media-blink-key_system_config_selector.cc.patch b/patches/media-blink-key_system_config_selector.cc.patch deleted file mode 100644 index 716b2266fb3a..000000000000 --- a/patches/media-blink-key_system_config_selector.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc -index 462550a600b8a9c611a154bc9ffffd8c7b31202e..9dc203212d9f69f182682cfe1772d8e7c6732745 100644 ---- a/media/blink/key_system_config_selector.cc -+++ b/media/blink/key_system_config_selector.cc -@@ -994,6 +994,7 @@ void KeySystemConfigSelector::SelectConfig( - - key_systems_->UpdateIfNeeded(); - -+ KeySystems::GetInstance(); - std::string key_system_ascii = key_system.Ascii(); - if (!key_systems_->IsSupportedKeySystem(key_system_ascii)) { - std::move(cb).Run(Status::kUnsupportedKeySystem, nullptr, nullptr); diff --git a/patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch b/patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch new file mode 100644 index 000000000000..877a68e6591a --- /dev/null +++ b/patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch @@ -0,0 +1,12 @@ +diff --git a/third_party/blink/renderer/platform/media/key_system_config_selector.cc b/third_party/blink/renderer/platform/media/key_system_config_selector.cc +index 32cf756a08aaef366e8e70050746f39d729d40d3..b1563ecc155bbff8e03ae0b879c99bf91e1a5485 100644 +--- a/third_party/blink/renderer/platform/media/key_system_config_selector.cc ++++ b/third_party/blink/renderer/platform/media/key_system_config_selector.cc +@@ -994,6 +994,7 @@ void KeySystemConfigSelector::SelectConfig( + + key_systems_->UpdateIfNeeded(); + ++ KeySystems::GetInstance(); + std::string key_system_ascii = key_system.Ascii(); + if (!key_systems_->IsSupportedKeySystem(key_system_ascii)) { + std::move(cb).Run(Status::kUnsupportedKeySystem, nullptr, nullptr); From 2e3be9ddce96a0f9764cbdedb63986c4bd756b85 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 17:00:15 +0200 Subject: [PATCH 042/205] Adapt chromium override to change in ui/views/controls/focus_ring.cc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One of the two blocks our chromium_src override was modifying has now moved up in the file. Chromium change: https://chromium.googlesource.com/chromium/src/+/85d65333b8b9a73c7e2cc3f0db6ec47c9513d418 commit 85d65333b8b9a73c7e2cc3f0db6ec47c9513d418 Author: Peter Boström Date: Tue Jun 8 19:34:10 2021 +0000 Paint FocusRing aura with same path as its ring This fixes a rendering bug where the focus aura is incorrectly offset from the focus ring (probably by not being translated to the same coordinate space?). Bug: 1213390, 1210419 --- patches/ui-views-controls-focus_ring.cc.patch | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/ui-views-controls-focus_ring.cc.patch b/patches/ui-views-controls-focus_ring.cc.patch index 4ff896086881..ba355e0391ff 100644 --- a/patches/ui-views-controls-focus_ring.cc.patch +++ b/patches/ui-views-controls-focus_ring.cc.patch @@ -1,8 +1,16 @@ diff --git a/ui/views/controls/focus_ring.cc b/ui/views/controls/focus_ring.cc -index 699c15fe76528e557b08c1c0027a1a63a4791df0..a781de1543c3c0a893b723d82e95be4ef722c1fd 100644 +index c54adbeabbd7afd44f8b17b824972940357c7a0a..24c2bb77120b2fd425df8e04aa2fac7c1734273b 100644 --- a/ui/views/controls/focus_ring.cc +++ b/ui/views/controls/focus_ring.cc -@@ -180,6 +180,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { +@@ -197,6 +197,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { + flags.setAntiAlias(true); + flags.setColor(GetNativeTheme()->GetSystemColor( + ui::NativeTheme::kColorId_FocusAuraColor)); ++ BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_FOCUS_AURA + flags.setStyle(cc::PaintFlags::kFill_Style); + + canvas->sk_canvas()->drawRRect(ring_rect, flags); +@@ -205,6 +206,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { cc::PaintFlags paint; paint.setAntiAlias(true); paint.setColor(color_.value_or(GetColor(this, !invalid_))); @@ -10,11 +18,3 @@ index 699c15fe76528e557b08c1c0027a1a63a4791df0..a781de1543c3c0a893b723d82e95be4e paint.setStyle(cc::PaintFlags::kStroke_Style); paint.setStrokeWidth(PlatformStyle::kFocusHaloThickness); -@@ -201,6 +202,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { - flags.setAntiAlias(true); - flags.setColor(GetNativeTheme()->GetSystemColor( - ui::NativeTheme::kColorId_FocusAuraColor)); -+ BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_FOCUS_AURA - flags.setStyle(cc::PaintFlags::kFill_Style); - canvas->DrawPath(path, flags); - } From e25e2d48f497e518f7369cab2dfc19c4d5a0d9e4 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 17:00:25 +0200 Subject: [PATCH 043/205] Add CallWith=ScriptState to both definitions of getImageData() There used to be only one definition, but now there are two. Chromium change: https://chromium.googlesource.com/chromium/src/+/98b30255228997bc8cf30f8bfbdbb1fcbd7d5ed5 commit 98b30255228997bc8cf30f8bfbdbb1fcbd7d5ed5 Author: Christopher Cameron Date: Thu Jun 10 19:03:03 2021 +0000 CanvasColorManagement: Move back behind a flag I enabled CanvasColorManagement by un-guarding the stable parts of the spec. This was not the right way to do things. Change the still-very-experimental parts of the spec to be behind a CanvasColorManagementV2 flag, and move the parts intended for shipping behind a CanvasColorManagement flag. This patch is intended to be a no-op, so leave CanvasColorManagement as "stable" to accomplish this. A follow-on patch will change the label to experimental and update other settings that will not be no-ops. Bug: 1218419 --- ...anvas2d-canvas_rendering_context_2d.idl.patch | 16 +++++++++------- ...fscreen_canvas_rendering_context_2d.idl.patch | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) 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 1c4b133891e0..81764187e6f4 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,8 +1,8 @@ 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 8e2b35d1ab1d2987a31ed109594d9e836b4a6f0e..2002e63f0cfdda60a9f07618e8ea613973e73502 100644 +index 634afcccad4c563f46458c876fdf4f8ce828a9e6..b4e35b16eb44f33dd67516bfe97d75fe6a7830f3 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 -@@ -118,9 +118,13 @@ interface CanvasRenderingContext2D { +@@ -121,9 +121,13 @@ interface CanvasRenderingContext2D { [RuntimeEnabled=Canvas2dScrollPathIntoView] void scrollPathIntoView(optional Path2D path); void clip(optional CanvasFillRule winding); void clip(Path2D path, optional CanvasFillRule winding); @@ -16,12 +16,14 @@ index 8e2b35d1ab1d2987a31ed109594d9e836b4a6f0e..2002e63f0cfdda60a9f07618e8ea6139 boolean isPointInStroke(Path2D path, unrestricted double x, unrestricted double y); // text (see also the CanvasDrawingStyles interface) -@@ -144,7 +148,7 @@ interface CanvasRenderingContext2D { - // pixel manipulation +@@ -148,8 +152,8 @@ interface CanvasRenderingContext2D { [RaisesException] ImageData createImageData(ImageData imagedata); - [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, optional ImageDataSettings imageDataSettings = {}); -- [RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, optional ImageDataSettings imageDataSettings = {}); -+ [CallWith=ScriptState, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, optional ImageDataSettings imageDataSettings = {}); + [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh); + [RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); +- [RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh); +- [RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); ++ [CallWith=ScriptState, RaisesException] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh); ++ [CallWith=ScriptState, RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData([EnforceRange] long sx, [EnforceRange] long sy, [EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); [RaisesException] void putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy); [RaisesException] void putImageData(ImageData imagedata, [EnforceRange] long dx, [EnforceRange] long dy, [EnforceRange] long dirtyX, [EnforceRange] long dirtyY, [EnforceRange] long dirtyWidth, [EnforceRange] long dirtyHeight); 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 6bdd1753edd7..e9ffdf988545 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,8 +1,8 @@ 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 9783aef36a0ee9f764c88b120092b201cfa8ba63..14ace4b01219c3c2c6b2ca2912949299dc10d311 100644 +index 1d56039e8040d4fa7c5444ec465752f0dda1ddeb..2d2720532044ff16a32f1095c472d4a40834b485 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 -@@ -75,10 +75,10 @@ +@@ -76,10 +76,10 @@ void stroke(Path2D path); void clip(optional CanvasFillRule winding); void clip(Path2D path, optional CanvasFillRule winding); @@ -17,12 +17,14 @@ index 9783aef36a0ee9f764c88b120092b201cfa8ba63..14ace4b01219c3c2c6b2ca2912949299 // text (see also the CanvasDrawingStyles interface) void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth); -@@ -93,7 +93,7 @@ - // pixel manipulation +@@ -95,8 +95,8 @@ [RaisesException] ImageData createImageData(ImageData imagedata); - [RaisesException] ImageData createImageData(long sw, long sh, optional ImageDataSettings imageDataSettings = {}); -- [HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData(long sx, long sy, long sw, long sh, optional ImageDataSettings imageDataSettings = {}); -+ [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData(long sx, long sy, long sw, long sh, optional ImageDataSettings imageDataSettings = {}); + [RaisesException] ImageData createImageData(long sw, long sh); + [RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData createImageData(long sw, long sh, ImageDataSettings imageDataSettings); +- [HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData(long sx, long sy, long sw, long sh); +- [HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData(long sx, long sy, long sw, long sh, ImageDataSettings imageDataSettings); ++ [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException] ImageData getImageData(long sx, long sy, long sw, long sh); ++ [CallWith=ScriptState, HighEntropy, MeasureAs=OffscreenCanvasGetImageData, RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData getImageData(long sx, long sy, long sw, long sh, ImageDataSettings imageDataSettings); [RaisesException] void putImageData(ImageData imagedata, long dx, long dy); [RaisesException] void putImageData(ImageData imagedata, long dx, long dy, long dirtyX, long dirtyY, long dirtyWidth, long dirtyHeight); From ce1d7cb8cb9485c99a2fd00694459fc4cc05fe61 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 21 Jun 2021 12:22:09 +0200 Subject: [PATCH 044/205] Adapt to new getImageData() method without ImageDataSettings parameter We need to adapt the chromium_src overrides for this new method. Chromium change: https://chromium.googlesource.com/chromium/src/+/98b30255228997bc8cf30f8bfbdbb1fcbd7d5ed5 commit 98b30255228997bc8cf30f8bfbdbb1fcbd7d5ed5 Author: Christopher Cameron Date: Thu Jun 10 19:03:03 2021 +0000 CanvasColorManagement: Move back behind a flag I enabled CanvasColorManagement by un-guarding the stable parts of the spec. This was not the right way to do things. Change the still-very-experimental parts of the spec to be behind a CanvasColorManagementV2 flag, and move the parts intended for shipping behind a CanvasColorManagement flag. This patch is intended to be a no-op, so leave CanvasColorManagement as "stable" to accomplish this. A follow-on patch will change the label to experimental and update other settings that will not be no-ops. Bug: 1218419 --- .../canvas2d/base_rendering_context_2d.cc | 21 +++++++++++++++++++ .../canvas2d/base_rendering_context_2d.h | 4 ++++ 2 files changed, 25 insertions(+) diff --git a/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc index 3146cf89afae..1818395682d9 100644 --- a/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc @@ -44,6 +44,16 @@ bool AllowFingerprintingFromScriptState(blink::ScriptState* script_state) { namespace blink { +ImageData* BaseRenderingContext2D::getImageData( + int sx, + int sy, + int sw, + int sh, + ExceptionState& exception_state) { + NOTREACHED(); + return nullptr; +} + ImageData* BaseRenderingContext2D::getImageData( int sx, int sy, @@ -77,6 +87,17 @@ ImageData* BaseRenderingContext2D::getImageDataInternal_Unused( return nullptr; } +ImageData* BaseRenderingContext2D::getImageData( + ScriptState* script_state, + int sx, + int sy, + int sw, + int sh, + ExceptionState& exception_state) { + return getImageDataInternal(script_state, sx, sy, sw, sh, + /*image_data_settings=*/nullptr, exception_state); +} + ImageData* BaseRenderingContext2D::getImageData( ScriptState* script_state, int sx, diff --git a/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h b/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h index c4f0b8d15cd0..00b1356f9140 100644 --- a/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h +++ b/chromium_src/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.h @@ -16,8 +16,12 @@ ImageDataSettings*, ExceptionState&); \ ImageData* getImageDataInternal(int sx, int sy, int sw, int sh, \ ImageDataSettings*, ExceptionState&); \ + ImageData* getImageData(ScriptState*, int sx, int sy, int sw, int sh, \ + ExceptionState&); \ ImageData* getImageData(ScriptState*, int sx, int sy, int sw, int sh, \ ImageDataSettings*, ExceptionState&); \ + ImageData* getImageData_Unused(int sx, int sy, int sw, int sh, \ + ExceptionState&); \ ImageData* getImageData_Unused(int sx, int sy, int sw, int sh, \ ImageDataSettings*, ExceptionState&); \ \ From 4ead6cfdacf32c3b48cf2454aeaa73dad4e1ad89 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 18:15:57 +0200 Subject: [PATCH 045/205] Migrate subclasses of SecurityInterstitialPage to base::Value The PopulateInterstitialStrings() prototype's signature has changed to expect a base::Value instead of a base::DictionaryValue now. Chromium change: https://chromium.googlesource.com/chromium/src/+/6093cddab725b5ba15d790d2b45a640cbb93549d commit 6093cddab725b5ba15d790d2b45a640cbb93549d Author: Sylvain Defresne Date: Wed Jun 9 11:45:12 2021 +0000 Convert //components/security_interstitials to use base::Value The base::DictionaryValue class is deprecated in favor of simply using base::Value (and the API that internally check the stored value to be a dictionary). Bug: 1187061 --- .../browser/domain_block_page.cc | 21 +++++----- .../brave_shields/browser/domain_block_page.h | 3 +- .../decentralized_dns_opt_in_page.cc | 22 +++++----- .../decentralized_dns_opt_in_page.h | 7 +++- components/ipfs/ipfs_not_connected_page.cc | 18 ++++----- components/ipfs/ipfs_not_connected_page.h | 3 +- components/ipfs/ipfs_onboarding_page.cc | 40 +++++++++---------- components/ipfs/ipfs_onboarding_page.h | 3 +- 8 files changed, 58 insertions(+), 59 deletions(-) diff --git a/components/brave_shields/browser/domain_block_page.cc b/components/brave_shields/browser/domain_block_page.cc index 99b3197a61f0..f1f7e5c58ca0 100644 --- a/components/brave_shields/browser/domain_block_page.cc +++ b/components/brave_shields/browser/domain_block_page.cc @@ -64,29 +64,28 @@ void DomainBlockPage::CommandReceived(const std::string& command) { } } -void DomainBlockPage::PopulateInterstitialStrings( - base::DictionaryValue* load_time_data) { - load_time_data->SetString("tabTitle", - l10n_util::GetStringUTF16(IDS_DOMAIN_BLOCK_TITLE)); - load_time_data->SetString( +void DomainBlockPage::PopulateInterstitialStrings(base::Value* load_time_data) { + load_time_data->SetStringKey( + "tabTitle", l10n_util::GetStringUTF16(IDS_DOMAIN_BLOCK_TITLE)); + load_time_data->SetStringKey( "heading", l10n_util::GetStringUTF16(IDS_DOMAIN_BLOCK_HEADING)); - load_time_data->SetString( + load_time_data->SetStringKey( "primaryParagraph", l10n_util::GetStringUTF16(IDS_DOMAIN_BLOCK_PRIMARY_PARAGRAPH)); - load_time_data->SetString("domain", request_url().GetOrigin().spec()); - load_time_data->SetString( + load_time_data->SetStringKey("domain", request_url().GetOrigin().spec()); + load_time_data->SetStringKey( "explanationParagraph", l10n_util::GetStringUTF16(IDS_DOMAIN_BLOCK_EXPLANATION)); - load_time_data->SetString( + load_time_data->SetStringKey( "dontWarnAgainText", l10n_util::GetStringUTF16(IDS_DOMAIN_BLOCK_DONT_WARN_AGAIN_BUTTON)); - load_time_data->SetString( + load_time_data->SetStringKey( "proceedAnywayText", l10n_util::GetStringUTF16(IDS_DOMAIN_BLOCK_PROCEED_ANYWAY_BUTTON)); - load_time_data->SetString( + load_time_data->SetStringKey( "goBackText", l10n_util::GetStringUTF16(IDS_DOMAIN_BLOCK_GO_BACK_BUTTON)); } diff --git a/components/brave_shields/browser/domain_block_page.h b/components/brave_shields/browser/domain_block_page.h index e98c0f360a0c..47b2bcf4471b 100644 --- a/components/brave_shields/browser/domain_block_page.h +++ b/components/brave_shields/browser/domain_block_page.h @@ -53,8 +53,7 @@ class DomainBlockPage protected: // SecurityInterstitialPage:: overrides - void PopulateInterstitialStrings( - base::DictionaryValue* load_time_data) override; + void PopulateInterstitialStrings(base::Value* load_time_data) override; int GetHTMLTemplateId() override; }; diff --git a/components/decentralized_dns/decentralized_dns_opt_in_page.cc b/components/decentralized_dns/decentralized_dns_opt_in_page.cc index 311389445913..f0ded10057f8 100644 --- a/components/decentralized_dns/decentralized_dns_opt_in_page.cc +++ b/components/decentralized_dns/decentralized_dns_opt_in_page.cc @@ -65,7 +65,7 @@ void DecentralizedDnsOptInPage::CommandReceived(const std::string& command) { } void DecentralizedDnsOptInPage::PopulateInterstitialStrings( - base::DictionaryValue* load_time_data) { + base::Value* load_time_data) { const std::vector message_params = { u" + + To continue saving passwords in your Brave sync chain, verify it’s you + Make sure you can always access your sync data @@ -8485,8 +8491,7 @@ Please help our engineers fix this problem. Tell us what happened right before y Data is encrypted with your sync passphrase. This doesn't include payment methods and addresses from Brave Pay. - Data was encrypted with your sync passphrase on - $1Sept 1, 2012. This doesn't include payment methods and addresses from Brave Pay. + Data was encrypted with your sync passphrase on $1Sept 1, 2012. This doesn't include payment methods and addresses from Brave Pay. diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index 188053397458..b9da4525e90f 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -221,7 +221,7 @@ {COUNT, plural, - =1 {1 Brave sync chain added} + =1 {1 Brave sync chain} other {$22 Brave sync chains}} @@ -1171,6 +1171,15 @@ Press an assigned switch to remove assignment. To get started, please make sure your USB or Bluetooth switch is connected to your Bravebook. You can also use keyboard keys. + + Auto-scan enabled + + + Auto-scan will automatically cycle through and focus on items on the screen. When an item is focused, press the "Select" key you just assigned to activate it. + + + Activate the Next button to continue the setup or the Previous button to change the "Select" switch assignment. + Do you want to assign additional switches? @@ -2303,9 +2312,6 @@ Press an assigned switch to remove assignment. Join $1WiFi network - - Searching for mobile networks - Known Networks @@ -2384,9 +2390,6 @@ Press an assigned switch to remove assignment. VPN service - - Automatically connect to this network - Hidden network @@ -3274,7 +3277,7 @@ Press an assigned switch to remove assignment. Never - Sunset to Sunrise + Sunset to sunrise Start time diff --git a/app/profiles_strings.grdp b/app/profiles_strings.grdp index 5208685a8291..21e538e832ac 100644 --- a/app/profiles_strings.grdp +++ b/app/profiles_strings.grdp @@ -43,17 +43,11 @@ Error - $1User: Sync isn't working - - - $1User: Password sync isn't working + $1User: $2Sync isn't working Paused - - $1User: Sync paused - $1Markus (Account for kids) diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index 7c547a1a40d7..d8a8110511b1 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -501,12 +501,6 @@ Search passwords - - Show password - - - Hide password - Password details @@ -1305,6 +1299,14 @@ More + + + Privacy and security review + + + Review the most important privacy and security controls in one place + + Safety check @@ -1754,6 +1756,9 @@ Default search engines + + Your search engines + Other search engines @@ -3279,7 +3284,7 @@ If you forgot your passphrase or want to change this setting, <a href="$1" target="_blank" rel="noopener noreferrer"><a href="$1" target="_blank">reset sync</a></a>. - Control how your browsing history is used to personalize Search, ads, and more + Control how your browsing history is used to personalize Search and more diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index f188f96d5f26..d6a8f8b9c708 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -271,12 +271,6 @@ CHAR_LIMIT guidelines: Sign in to Brave - - Sync and Brave services - - - You are currently customizing your Sync and Brave service settings. To finish turning on sync, tap the Confirm button near the bottom of the screen. Navigate up - You are currently customizing your Sync settings. To finish turning on sync, tap the Confirm button near the bottom of the screen. Navigate up @@ -286,9 +280,6 @@ CHAR_LIMIT guidelines: Sync and personalize across devices - - Sync is on - Disabled by the administrator of this device @@ -296,7 +287,7 @@ CHAR_LIMIT guidelines: Brave activity controls - Control how your browsing history is used to personalize Search, ads, and more + Control how your browsing history is used to personalize Search and more Control how your browsing history is used to personalize Search and more @@ -314,15 +305,6 @@ CHAR_LIMIT guidelines: Sync - - Sync your Brave data - - - Manage sync - - - Other Brave services - Brave services @@ -1616,8 +1598,11 @@ Your Brave account may have other forms of browsing history like searches and ac Android system sync disabled - - Sync is off + + On + + + Off No data selected to sync @@ -2217,15 +2202,9 @@ To change this setting, <resetlink>reset sync

Translate image with Brave Lens <new>New</new> - - Shop similar products <new>New</new> - Shop image with Brave Lens <new>New</new> - - Search similar products <new>New</new> - Search %1$sBrave for this image @@ -2673,7 +2652,7 @@ To change this setting, <resetlink>reset sync

- Brave may use your history to personalize Search, ads, and other Brave services + Brave may use your history to personalize Search and other Brave services Brave may use your history to personalize Search and other Brave services @@ -4111,6 +4090,18 @@ To change this setting, <resetlink>reset sync

Active today + + device + + + phone + + + computer + + + Page sent. To see it, open Brave on your %1$sphone + @@ -4742,6 +4733,34 @@ To change this setting, <resetlink>reset sync

Results from\n%1$s + + + + Create a %1$sairbnb.com account + + + Create a %1$sairbnb.com account… + + + List of accounts to be selected. + + + List of accounts to be selected opened at half height. + + + List of accounts to be selected opened at full height. + + + List of accounts to be selected is closed. + + + + + Stylized highlight %1$s2020-09-16 + + + chrome_stylized_highlight_ + diff --git a/components/arc_strings.grdp b/components/arc_strings.grdp index f56026ba56f5..4edaeaa36f2e 100644 --- a/components/arc_strings.grdp +++ b/components/arc_strings.grdp @@ -20,8 +20,8 @@ Tablet - - Maximized + + Resizable Settings @@ -38,4 +38,12 @@ Settings + + + + App icon + + + App launching throbber + diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index caded3b4b70d..2096fce84f69 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp @@ -502,19 +502,50 @@ Virtual number: - Month/Year: + Expiration date: + + + Name on card: CVC: - - View virtual card details + View your virtual card number Virtual card + + Something went wrong + + + Virtual card not available + + + Virtual card is not available right now, please try again later + + + Virtual card is not available right now, please contact your bank + + + Not eligible for virtual card + + + This card is not eligible for virtual card number. + + + Close + + + + Your virtual card number is applied. + + + View virtual card + + Remember your UPI ID? @@ -552,14 +583,4 @@ See details - - - - - Your virtual card number is applied. - - - View virtual card - - diff --git a/components/management_strings.grdp b/components/management_strings.grdp index 3a22af2609e5..cb1e6caf5432 100644 --- a/components/management_strings.grdp +++ b/components/management_strings.grdp @@ -118,6 +118,9 @@ Actions taken with data flagged as confidential + + Device login/logout history, including timestamps and failed attempts + Linux apps installed and when they were last used diff --git a/components/new_or_sad_tab_strings.grdp b/components/new_or_sad_tab_strings.grdp index 01925b0d4478..451e5c5eeca3 100644 --- a/components/new_or_sad_tab_strings.grdp +++ b/components/new_or_sad_tab_strings.grdp @@ -117,6 +117,9 @@ New Tab + + New Private Tab + You’ve gone Private diff --git a/components/new_or_sad_tab_strings_override.grdp b/components/new_or_sad_tab_strings_override.grdp index cc714fda536f..f86ed3d0870d 100644 --- a/components/new_or_sad_tab_strings_override.grdp +++ b/components/new_or_sad_tab_strings_override.grdp @@ -41,6 +41,9 @@ + + New Private Tab + You’ve gone Private diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp index 6da703564567..857598218493 100644 --- a/components/page_info_strings.grdp +++ b/components/page_info_strings.grdp @@ -65,6 +65,17 @@ Attackers sometimes mimic sites by making hard-to-see changes to the web address. + + + Is this website accurate? + + + Learn more + + + Ignore + + You're viewing a local or shared file @@ -74,6 +85,9 @@ Your information (for example, passwords or credit card numbers) is private when it is sent to this site. + + The site's connection is secure unless Brave tells you otherwise. + Attackers might be able to see the images you’re looking at on this site and trick you by modifying them. diff --git a/components/policy_strings.grdp b/components/policy_strings.grdp index cce5cbfc58b3..cb1c0d074283 100644 --- a/components/policy_strings.grdp +++ b/components/policy_strings.grdp @@ -176,6 +176,9 @@ This field should not have more than $1100 entries. All further entries will be discarded. + + This field should not have more than $11000 entries. All further entries will be ignored. + Key "$1ProxyMode": $2Must be specified. From ea6bf63499eec9af1615eab831c6a95df91cb130 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 18:26:38 +0200 Subject: [PATCH 047/205] Adapt to views::Button::ink_drop() -> views::InkDrop::Get(view) change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We should now use a class method instead of an instance one. Chromium change: https://chromium.googlesource.com/chromium/src/+/a61eda05062d20ec0f592415f3a145cdf1dce095 commit a61eda05062d20ec0f592415f3a145cdf1dce095 Author: Peter Boström Date: Mon Jun 7 18:20:22 2021 +0000 Make InkDrop a View class property Removes views::Button::ink_drop() in favor of views::InkDrop::Get(view), which works equally for all Views (not just Buttons). The InkDrop is removed in the destructor for all classes that override Add/RemoveLayerBeneathView() to prevent using the wrong overrides during ~View() when class properties destruct. This also removes the `destroying_` bool from InkDropHost so that layers can be properly removed on InkDropHost destruction, as the View may still live after this point on. Bug: 931964 --- .../brave_actions/brave_rewards_action_stub_view.cc | 7 ++++--- browser/ui/views/brave_ads/padded_image_button.cc | 9 +++++---- browser/ui/views/location_bar/ipfs_location_view.cc | 5 +++-- browser/ui/views/location_bar/onion_location_view.cc | 6 ++++-- browser/ui/views/speedreader/speedreader_icon_view.cc | 7 +++++-- chromium_src/ui/views/controls/button/md_text_button.cc | 5 +++-- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc index d49cdfec8b7d..67d3d585eb7d 100644 --- a/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc +++ b/browser/ui/views/brave_actions/brave_rewards_action_stub_view.cc @@ -62,14 +62,15 @@ BraveRewardsActionStubView::BraveRewardsActionStubView( std::u16string()), profile_(profile), delegate_(delegate) { - ink_drop()->SetMode(views::InkDropHost::InkDropMode::ON); - ink_drop()->SetBaseColorCallback(base::BindRepeating( + auto* ink_drop = views::InkDrop::Get(this); + ink_drop->SetMode(views::InkDropHost::InkDropMode::ON); + ink_drop->SetBaseColorCallback(base::BindRepeating( [](views::View* host) { return GetToolbarInkDropBaseColor(host); }, this)); SetHasInkDropActionOnClick(true); SetHorizontalAlignment(gfx::ALIGN_CENTER); - ink_drop()->SetVisibleOpacity(kToolbarInkDropVisibleOpacity); + ink_drop->SetVisibleOpacity(kToolbarInkDropVisibleOpacity); // Create badge-and-image source like an extension icon would auto preferred_size = GetPreferredSize(); ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); diff --git a/browser/ui/views/brave_ads/padded_image_button.cc b/browser/ui/views/brave_ads/padded_image_button.cc index aaddb7201721..140fff01d64e 100644 --- a/browser/ui/views/brave_ads/padded_image_button.cc +++ b/browser/ui/views/brave_ads/padded_image_button.cc @@ -36,7 +36,8 @@ const float kVisibleOpacity = 0.12f; PaddedImageButton::PaddedImageButton(PressedCallback callback) : views::ImageButton(callback) { - views::InkDrop::UseInkDropForSquareRipple(ink_drop(), + auto* ink_drop = views::InkDrop::Get(this); + views::InkDrop::UseInkDropForSquareRipple(ink_drop, /*highlight_on_hover=*/false, /*highlight_on_focus=*/false); @@ -46,8 +47,8 @@ PaddedImageButton::PaddedImageButton(PressedCallback callback) SetAnimateOnStateChange(false); - ink_drop()->SetMode(views::InkDropHost::InkDropMode::ON); - ink_drop()->SetVisibleOpacity(kVisibleOpacity); + ink_drop->SetMode(views::InkDropHost::InkDropMode::ON); + ink_drop->SetVisibleOpacity(kVisibleOpacity); SetHasInkDropActionOnClick(true); } @@ -69,7 +70,7 @@ void PaddedImageButton::OnThemeChanged() { const SkColor background_color = GetNativeTheme()->GetSystemColor( ui::NativeTheme::kColorId_WindowBackground); - ink_drop()->SetBaseColor( + views::InkDrop::Get(this)->SetBaseColor( color_utils::GetColorWithMaxContrast(background_color)); } diff --git a/browser/ui/views/location_bar/ipfs_location_view.cc b/browser/ui/views/location_bar/ipfs_location_view.cc index 2e3350fadfb2..0dc055c1b128 100644 --- a/browser/ui/views/location_bar/ipfs_location_view.cc +++ b/browser/ui/views/location_bar/ipfs_location_view.cc @@ -78,11 +78,12 @@ class IPFSLocationButtonView : public views::LabelButton { SetEnabledTextColors(kTextColor); SetHorizontalAlignment(gfx::ALIGN_RIGHT); SetImageLabelSpacing(6); - ink_drop()->SetMode(views::InkDropHost::InkDropMode::ON); + auto* ink_drop = views::InkDrop::Get(this); + ink_drop->SetMode(views::InkDropHost::InkDropMode::ON); SetBorder(views::CreateEmptyBorder( GetLayoutInsets(LOCATION_BAR_ICON_INTERIOR_PADDING))); SetHasInkDropActionOnClick(true); - ink_drop()->SetVisibleOpacity(kToolbarInkDropVisibleOpacity); + ink_drop->SetVisibleOpacity(kToolbarInkDropVisibleOpacity); UpdateBorder(); // Ensure focus ring follows border views::HighlightPathGenerator::Install( diff --git a/browser/ui/views/location_bar/onion_location_view.cc b/browser/ui/views/location_bar/onion_location_view.cc index 2a10372f81bb..795cdf6d2fa4 100644 --- a/browser/ui/views/location_bar/onion_location_view.cc +++ b/browser/ui/views/location_bar/onion_location_view.cc @@ -94,11 +94,13 @@ class OnionLocationButtonView : public views::LabelButton { SetEnabledTextColors(kTextColor); SetHorizontalAlignment(gfx::ALIGN_RIGHT); SetImageLabelSpacing(6); - ink_drop()->SetMode(views::InkDropHost::InkDropMode::ON); + + auto* ink_drop = views::InkDrop::Get(this); + ink_drop->SetMode(views::InkDropHost::InkDropMode::ON); SetBorder(views::CreateEmptyBorder( GetLayoutInsets(LOCATION_BAR_ICON_INTERIOR_PADDING))); SetHasInkDropActionOnClick(true); - ink_drop()->SetVisibleOpacity(kToolbarInkDropVisibleOpacity); + ink_drop->SetVisibleOpacity(kToolbarInkDropVisibleOpacity); UpdateBorder(); // Ensure focus ring follows border views::HighlightPathGenerator::Install( diff --git a/browser/ui/views/speedreader/speedreader_icon_view.cc b/browser/ui/views/speedreader/speedreader_icon_view.cc index fa48e11089d5..15b9cf843a53 100644 --- a/browser/ui/views/speedreader/speedreader_icon_view.cc +++ b/browser/ui/views/speedreader/speedreader_icon_view.cc @@ -24,6 +24,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/base/theme_provider.h" +#include "ui/views/animation/ink_drop.h" #include "ui/views/animation/ink_drop_host_view.h" #include "ui/views/animation/ink_drop_state.h" @@ -55,8 +56,10 @@ void SpeedreaderIconView::UpdateImpl() { return; } - if (ink_drop()->GetHighlighted() && !IsBubbleShowing()) - ink_drop()->AnimateToState(views::InkDropState::HIDDEN, nullptr); + if (views::InkDrop::Get(this)->GetHighlighted() && !IsBubbleShowing()) { + views::InkDrop::Get(this)->AnimateToState(views::InkDropState::HIDDEN, + nullptr); + } const ui::ThemeProvider* theme_provider = GetThemeProvider(); const DistillState state = GetDistillState(); diff --git a/chromium_src/ui/views/controls/button/md_text_button.cc b/chromium_src/ui/views/controls/button/md_text_button.cc index e85477a08e1d..e2558b55136d 100644 --- a/chromium_src/ui/views/controls/button/md_text_button.cc +++ b/chromium_src/ui/views/controls/button/md_text_button.cc @@ -76,10 +76,11 @@ MdTextButton::MdTextButton(PressedCallback callback, SetCornerRadius(100); views::HighlightPathGenerator::Install( this, std::make_unique()); - views::InkDrop::UseInkDropForFloodFillRipple(ink_drop(), + auto* ink_drop = views::InkDrop::Get(this); + views::InkDrop::UseInkDropForFloodFillRipple(ink_drop, /*highlight_on_hover=*/false, /*highlight_on_focus=*/true); - ink_drop()->SetCreateHighlightCallback(base::BindRepeating( + ink_drop->SetCreateHighlightCallback(base::BindRepeating( [](Button* host) { const SkColor fill_color = SK_ColorTRANSPARENT; gfx::RectF boundsF(host->GetLocalBounds()); From 91d8859415cc2ad35e4580994e6cb3125c933686 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 18:31:17 +0200 Subject: [PATCH 048/205] IWYU: base/logging.h --- browser/brave_stats/brave_stats_updater_params.cc | 1 + components/permissions/permission_lifetime_manager.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/browser/brave_stats/brave_stats_updater_params.cc b/browser/brave_stats/brave_stats_updater_params.cc index eadfd78a92bb..7c88e7d1be35 100644 --- a/browser/brave_stats/brave_stats_updater_params.cc +++ b/browser/brave_stats/brave_stats_updater_params.cc @@ -8,6 +8,7 @@ #include "brave/browser/brave_stats/brave_stats_updater_params.h" #include "brave/components/brave_referrals/buildflags/buildflags.h" +#include "base/logging.h" #include "base/strings/string_util.h" #include "base/system/sys_info.h" #include "base/threading/thread_restrictions.h" diff --git a/components/permissions/permission_lifetime_manager.cc b/components/permissions/permission_lifetime_manager.cc index bd33697dbcf1..247c9cc90e46 100644 --- a/components/permissions/permission_lifetime_manager.cc +++ b/components/permissions/permission_lifetime_manager.cc @@ -10,6 +10,7 @@ #include "base/auto_reset.h" #include "base/containers/contains.h" +#include "base/logging.h" #include "base/threading/sequenced_task_runner_handle.h" #include "brave/components/permissions/permission_lifetime_pref_names.h" #include "components/content_settings/core/browser/content_settings_registry.h" From 95e75285bc45bcb05767a8085d0323985c254d44 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 18:55:12 +0200 Subject: [PATCH 049/205] Migrate away from base::AdaptCallbackForRepeating() In this particular case we should use the new SplitOnceCallback utility, so that there's guaranteed that only one of them is called at runtime. Chromium change: https://chromium.googlesource.com/chromium/src/+/c7069e96999fe58a182ea4d339b7ccec9c67dfef commit c7069e96999fe58a182ea4d339b7ccec9c67dfef Author: danakj Date: Tue May 18 18:35:55 2021 +0000 Replace AdaptCallbackForRepeating with SplitOnceCallback in chrome/browser chrome/browser/profiles/ chrome/browser/sync_file_system/ chrome/browser/ui/ SplitOnceCallback keeps the types correct, with 2 OnceCallbacks, and ensures only one of the two is called at runtime. Also changes KeyedServiceShutdownNotifier to hold OnceCallbacks since they are called once, at shutdown. R=avi@chromium.org Bug: 730593 Change-Id: Ieac72bab8133233adae6dee8df1358051a133272 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2894709 Reviewed-by: Colin Blundell Reviewed-by: Avi Drissman Commit-Queue: danakj Cr-Commit-Position: refs/heads/master@{#884027} commit 06e5791cb03d31285675f45cbb4dcae06b94ef92 Author: Joshua Bell Date: Tue Jun 8 17:24:15 2021 +0000 Remove base::AdaptCallbackForRepeating All usages have been removed from the codebase. \o/ * Remove implementation/tests from base/ * Remove clang rewriter from tools/ Bug: 730593 --- browser/net/brave_proxying_url_loader_factory.cc | 9 ++++----- browser/profiles/brave_profile_manager.cc | 3 ++- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/net/brave_proxying_url_loader_factory.cc b/browser/net/brave_proxying_url_loader_factory.cc index 784bd0dfa4c6..9ec6bd9aae76 100644 --- a/browser/net/brave_proxying_url_loader_factory.cc +++ b/browser/net/brave_proxying_url_loader_factory.cc @@ -577,15 +577,14 @@ void BraveProxyingURLLoaderFactory::InProgressRequest:: override_headers_ = nullptr; redirect_url_ = GURL(); - net::CompletionRepeatingCallback copyable_callback = - base::AdaptCallbackForRepeating(std::move(continuation)); + auto split_once_callback = base::SplitOnceCallback(std::move(continuation)); if (request_.url.SchemeIsHTTPOrHTTPS()) { ctx_ = brave::BraveRequestInfo::MakeCTX(request_, render_process_id_, frame_tree_node_id_, request_id_, browser_context_, ctx_); int result = factory_->request_handler_->OnHeadersReceived( - ctx_, copyable_callback, current_response_->headers.get(), - &override_headers_, &redirect_url_); + ctx_, std::move(split_once_callback.first), + current_response_->headers.get(), &override_headers_, &redirect_url_); if (result == net::ERR_BLOCKED_BY_CLIENT) { OnRequestError(network::URLLoaderCompletionStatus(result)); @@ -605,7 +604,7 @@ void BraveProxyingURLLoaderFactory::InProgressRequest:: DCHECK_EQ(net::OK, result); } - copyable_callback.Run(net::OK); + std::move(split_once_callback.second).Run(net::OK); } void BraveProxyingURLLoaderFactory::InProgressRequest::OnRequestError( diff --git a/browser/profiles/brave_profile_manager.cc b/browser/profiles/brave_profile_manager.cc index f1cc42c60c0b..58c148bbf3f5 100644 --- a/browser/profiles/brave_profile_manager.cc +++ b/browser/profiles/brave_profile_manager.cc @@ -72,7 +72,8 @@ BraveProfileManager::~BraveProfileManager() { for (Profile* profile : profiles) { if (brave::IsSessionProfile(profile)) { // passing false for `success` removes the profile from the info cache - OnProfileCreated(profile, false, false); + OnProfileCreationFinished(profile, Profile::CREATE_MODE_ASYNCHRONOUS, + false, false); } } RemoveObserver(this); From 2ada5a3537a7ebd74b2194ef458c59805c906538 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 18:58:43 +0200 Subject: [PATCH 050/205] Adapt to rename of ProfileSyncServiceBundle -> SyncServiceImplBundle Chromium change: https://chromium.googlesource.com/chromium/src/+/eed724832ecc7ebb808749dca4be4d3dd948bd44 commit eed724832ecc7ebb808749dca4be4d3dd948bd44 Author: Victor Hugo Vianna Silva Date: Tue Jun 8 07:34:43 2021 +0000 Rename last references to ProfileSyncService in components/sync/ No behavior is changed. This CL does the following renamings: - ProfileSyncServiceBundle -> SyncServiceImplBundle - profile_sync_service_startup_unittest.cc -> sync_service_impl_startup_unittest.cc R=jkrcal@chromium.org Bug: 1201272 --- ...brave_sync_profile_sync_service_unittest.cc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components/sync/driver/brave_sync_profile_sync_service_unittest.cc b/components/sync/driver/brave_sync_profile_sync_service_unittest.cc index 1e12db43651f..1af2bf072915 100644 --- a/components/sync/driver/brave_sync_profile_sync_service_unittest.cc +++ b/components/sync/driver/brave_sync_profile_sync_service_unittest.cc @@ -13,7 +13,7 @@ #include "components/sync/driver/data_type_manager_impl.h" #include "components/sync/driver/fake_data_type_controller.h" #include "components/sync/driver/fake_sync_api_component_factory.h" -#include "components/sync/driver/profile_sync_service_bundle.h" +#include "components/sync/driver/sync_service_impl_bundle.h" #include "components/sync/test/engine/fake_sync_engine.h" #include "components/sync/test/engine/fake_sync_manager.h" #include "content/public/test/browser_task_environment.h" @@ -45,12 +45,12 @@ class ProfileSyncServiceDelegateMock : public ProfileSyncServiceDelegate { class BraveProfileSyncServiceTest : public testing::Test { public: BraveProfileSyncServiceTest() - : brave_sync_prefs_(profile_sync_service_bundle_.pref_service()), - sync_prefs_(profile_sync_service_bundle_.pref_service()) { - profile_sync_service_bundle_.identity_test_env() + : brave_sync_prefs_(sync_service_impl_bundle_.pref_service()), + sync_prefs_(sync_service_impl_bundle_.pref_service()) { + sync_service_impl_bundle_.identity_test_env() ->SetAutomaticIssueOfAccessTokens(true); brave_sync::Prefs::RegisterProfilePrefs( - profile_sync_service_bundle_.pref_service()->registry()); + sync_service_impl_bundle_.pref_service()->registry()); } ~BraveProfileSyncServiceTest() override { sync_service_->Shutdown(); } @@ -64,12 +64,12 @@ class BraveProfileSyncServiceTest : public testing::Test { } std::unique_ptr sync_client = - profile_sync_service_bundle_.CreateSyncClientMock(); + sync_service_impl_bundle_.CreateSyncClientMock(); ON_CALL(*sync_client, CreateDataTypeControllers(_)) .WillByDefault(Return(ByMove(std::move(controllers)))); sync_service_ = std::make_unique( - profile_sync_service_bundle_.CreateBasicInitParams( + sync_service_impl_bundle_.CreateBasicInitParams( start_behavior, std::move(sync_client)), std::make_unique()); } @@ -81,7 +81,7 @@ class BraveProfileSyncServiceTest : public testing::Test { BraveProfileSyncService* brave_sync_service() { return sync_service_.get(); } FakeSyncApiComponentFactory* component_factory() { - return profile_sync_service_bundle_.component_factory(); + return sync_service_impl_bundle_.component_factory(); } FakeSyncEngine* engine() { @@ -90,7 +90,7 @@ class BraveProfileSyncServiceTest : public testing::Test { private: content::BrowserTaskEnvironment task_environment_; - ProfileSyncServiceBundle profile_sync_service_bundle_; + SyncServiceImplBundle sync_service_impl_bundle_; brave_sync::Prefs brave_sync_prefs_; SyncPrefs sync_prefs_; std::unique_ptr sync_service_; From 151004b0e0ab1d3669a5ec46c28ab8392f5d61c0 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 19:05:24 +0200 Subject: [PATCH 051/205] Adapt to ProfileManager::{OnProfileCreated->OnProfileCreationFinished} We also need to specify a CreateMode now, which should be asynchronous by default. Chromium change: https://chromium.googlesource.com/chromium/src/+/9750cf2e2a24cf7c0dd006ef39c24a29e7f73556 commit 9750cf2e2a24cf7c0dd006ef39c24a29e7f73556 Author: Nicolas Ouellet-Payeur Date: Mon Jun 7 18:36:21 2021 +0000 Allow ScopedProfileKeepAlive during Profile construction CL crrev.com/c/2867585 creates a ScopedProfileKeepAlive during Profile construction, before the Profile is registered with the ProfileManager. This caused issues in tests, where Profile* is constructed synchronously. Store keepalive states in a separate map, keyed by Profile* pointer. This way we can already increment/decrement the counters, even before the Profile* is added to `profiles_info'. Bug: 1209192 --- browser/profiles/brave_profile_impl.cc | 3 ++- .../sync/driver/brave_sync_profile_sync_service_unittest.cc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/browser/profiles/brave_profile_impl.cc b/browser/profiles/brave_profile_impl.cc index 4bbfc374df32..4ddf04c5a95d 100644 --- a/browser/profiles/brave_profile_impl.cc +++ b/browser/profiles/brave_profile_impl.cc @@ -54,5 +54,6 @@ void BraveProfileImpl::OnProfileWillBeDestroyed(Profile* profile) { // this only happens when a profile is deleted because the profile manager // ensures that session profiles are destroyed before their parents // passing false for `success` removes the profile from the info cache - g_browser_process->profile_manager()->OnProfileCreated(this, false, false); + g_browser_process->profile_manager()->OnProfileCreationFinished( + this, Profile::CREATE_MODE_ASYNCHRONOUS, false, false); } diff --git a/components/sync/driver/brave_sync_profile_sync_service_unittest.cc b/components/sync/driver/brave_sync_profile_sync_service_unittest.cc index 1af2bf072915..774867901a7b 100644 --- a/components/sync/driver/brave_sync_profile_sync_service_unittest.cc +++ b/components/sync/driver/brave_sync_profile_sync_service_unittest.cc @@ -69,8 +69,8 @@ class BraveProfileSyncServiceTest : public testing::Test { .WillByDefault(Return(ByMove(std::move(controllers)))); sync_service_ = std::make_unique( - sync_service_impl_bundle_.CreateBasicInitParams( - start_behavior, std::move(sync_client)), + sync_service_impl_bundle_.CreateBasicInitParams(start_behavior, + std::move(sync_client)), std::make_unique()); } From 83d3573acf36002fd8d5d6a199351c77bad77d33 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 19:09:02 +0200 Subject: [PATCH 052/205] IWYU: base/feature_list.h --- .../brave_shields/browser/domain_block_navigation_throttle.cc | 1 + .../browser/ntp_background_images_service.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/components/brave_shields/browser/domain_block_navigation_throttle.cc b/components/brave_shields/browser/domain_block_navigation_throttle.cc index 8cccd63b2dac..07efa0c5e141 100644 --- a/components/brave_shields/browser/domain_block_navigation_throttle.cc +++ b/components/brave_shields/browser/domain_block_navigation_throttle.cc @@ -9,6 +9,7 @@ #include #include "base/bind.h" +#include "base/feature_list.h" #include "base/metrics/histogram_macros.h" #include "base/task/post_task.h" #include "base/threading/thread_task_runner_handle.h" diff --git a/components/ntp_background_images/browser/ntp_background_images_service.cc b/components/ntp_background_images/browser/ntp_background_images_service.cc index 519783b9553a..0a1370a2216e 100644 --- a/components/ntp_background_images/browser/ntp_background_images_service.cc +++ b/components/ntp_background_images/browser/ntp_background_images_service.cc @@ -10,6 +10,7 @@ #include "base/bind.h" #include "base/command_line.h" +#include "base/feature_list.h" #include "base/files/file_util.h" #include "base/json/json_reader.h" #include "base/path_service.h" From 1b91ec9ad14859673b895e4aaa694015c5057ce4 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 19:32:33 +0200 Subject: [PATCH 053/205] Adapt to using GetTabVectorForCommandId() Instead of the now removed CommandIdToTabVectorIndex() function. Chromium change: https://chromium.googlesource.com/chromium/src/+/bc0b2f2f6f640641b9f4ea299b851c79704a63c1 commit bc0b2f2f6f640641b9f4ea299b851c79704a63c1 Author: Emily Shack Date: Tue Jun 8 22:31:21 2021 +0000 Allow for unbounded app menu history submenus * Modifies the command id structure used by RecentTabsSubMenuModel to avoid bounded id buckets. Instead, shares the unbounded ids held by the bookmarks menu by each using every other id. This allows for the window and tab group submenus within the app menu history to display all tabs within, regardless of length. * Also addresses any clang-tiny warnings in the touched files. * There is a known bug in RecentTabsSubMenuModel::GetLabelFontListAt due to it only taking in an index, rather than model and index. This causes the second menu item in a group/window submenu to be bold, and causes a crash if group/window submenus are longer than the parent menu. Will address in a follow-up, as the crash trigger is behind a feature flag anyways and this CL is already on the larger side. Bug: 1205646 --- .../chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/chromium_src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chromium_src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc index 77531699538a..ab7bbb27497d 100644 --- a/chromium_src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chromium_src/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc @@ -49,9 +49,8 @@ BraveRecentTabsSubMenuModel::~BraveRecentTabsSubMenuModel() {} void BraveRecentTabsSubMenuModel::ExecuteCommand(int command_id, int event_flags) { if (IsTabModelCommandId(command_id)) { - TabNavigationItems* tab_items = NULL; - int tab_items_idx = CommandIdToTabVectorIndex(command_id, &tab_items); - const TabNavigationItem& item = (*tab_items)[tab_items_idx]; + TabNavigationItems* tab_items = GetTabVectorForCommandId(command_id); + const TabNavigationItem& item = (*tab_items)[command_id]; DCHECK(item.tab_id.is_valid() && item.url.is_valid()); if (item.session_tag == kBraveStubSessionTag) { From 45f60cedbeff3a383bdf3b0ca6313b21293d029c Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 19:37:56 +0200 Subject: [PATCH 054/205] Adapt to param's type change content::WebContents::{OnceGetter->Getter} The signature of ChromeContentBrowserClient::HandleExternalProtocol() has changed the type of its second parameter. Chromium change: https://chromium.googlesource.com/chromium/src/+/111cdbb5ef8c56fc8add40ad3cb805e32051b066 commit 111cdbb5ef8c56fc8add40ad3cb805e32051b066 Author: Jeremy Roman Date: Thu Jun 10 19:42:52 2021 +0000 Use WebContents::Getter instead of RVH routing ID in external protocol handler. The caller has a getter that looks it up by the FrameTreeNode ID. The RenderViewHost process and routing ID can change on navigation (if the navigation ends up changing the renderer hosting the main frame). This is more concise and consistent and, additionally, removes WebContents::GetRenderViewHost calls which are potentially problematic for MPArch (supporting bfcache, prerendering and portals evolution). --- browser/brave_content_browser_client.cc | 27 +++++++++---------- browser/brave_content_browser_client.h | 2 +- .../browser/content_browser_client_helper.h | 21 +++++++-------- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/browser/brave_content_browser_client.cc b/browser/brave_content_browser_client.cc index 63cb1aed35f6..6695c24795e1 100644 --- a/browser/brave_content_browser_client.cc +++ b/browser/brave_content_browser_client.cc @@ -352,7 +352,7 @@ void BraveContentBrowserClient::RegisterBrowserInterfaceBindersForFrame( bool BraveContentBrowserClient::HandleExternalProtocol( const GURL& url, - content::WebContents::OnceGetter web_contents_getter, + content::WebContents::Getter web_contents_getter, int child_id, int frame_tree_node_id, content::NavigationUIData* navigation_data, @@ -363,49 +363,46 @@ bool BraveContentBrowserClient::HandleExternalProtocol( mojo::PendingRemote* out_factory) { #if BUILDFLAG(ENABLE_BRAVE_WEBTORRENT) if (webtorrent::IsMagnetProtocol(url)) { - webtorrent::HandleMagnetProtocol(url, std::move(web_contents_getter), - page_transition, has_user_gesture, - initiating_origin); + webtorrent::HandleMagnetProtocol(url, web_contents_getter, page_transition, + has_user_gesture, initiating_origin); return true; } #endif if (brave_rewards::IsRewardsProtocol(url)) { - brave_rewards::HandleRewardsProtocol(url, std::move(web_contents_getter), + brave_rewards::HandleRewardsProtocol(url, web_contents_getter, page_transition, has_user_gesture); return true; } #if BUILDFLAG(BINANCE_ENABLED) if (binance::IsBinanceProtocol(url)) { - binance::HandleBinanceProtocol(url, std::move(web_contents_getter), - page_transition, has_user_gesture, - initiating_origin); + binance::HandleBinanceProtocol(url, web_contents_getter, page_transition, + has_user_gesture, initiating_origin); return true; } #endif #if BUILDFLAG(GEMINI_ENABLED) if (gemini::IsGeminiProtocol(url)) { - gemini::HandleGeminiProtocol(url, std::move(web_contents_getter), - page_transition, has_user_gesture, - initiating_origin); + gemini::HandleGeminiProtocol(url, web_contents_getter, page_transition, + has_user_gesture, initiating_origin); return true; } #endif #if BUILDFLAG(ENABLE_FTX) if (ftx::IsFTXProtocol(url)) { - ftx::HandleFTXProtocol(url, std::move(web_contents_getter), page_transition, + ftx::HandleFTXProtocol(url, web_contents_getter, page_transition, has_user_gesture, initiating_origin); return true; } #endif return ChromeContentBrowserClient::HandleExternalProtocol( - url, std::move(web_contents_getter), child_id, frame_tree_node_id, - navigation_data, is_main_frame, page_transition, has_user_gesture, - initiating_origin, out_factory); + url, web_contents_getter, child_id, frame_tree_node_id, navigation_data, + is_main_frame, page_transition, has_user_gesture, initiating_origin, + out_factory); } void BraveContentBrowserClient::AppendExtraCommandLineSwitches( diff --git a/browser/brave_content_browser_client.h b/browser/brave_content_browser_client.h index 66272575ebe0..0f26f181b4b9 100644 --- a/browser/brave_content_browser_client.h +++ b/browser/brave_content_browser_client.h @@ -45,7 +45,7 @@ class BraveContentBrowserClient : public ChromeContentBrowserClient { bool HandleExternalProtocol( const GURL& url, - content::WebContents::OnceGetter web_contents_getter, + content::WebContents::Getter web_contents_getter, int child_id, int frame_tree_node_id, content::NavigationUIData* navigation_data, diff --git a/components/brave_webtorrent/browser/content_browser_client_helper.h b/components/brave_webtorrent/browser/content_browser_client_helper.h index 5049b51bcd54..05b43ad0423e 100644 --- a/components/brave_webtorrent/browser/content_browser_client_helper.h +++ b/components/brave_webtorrent/browser/content_browser_client_helper.h @@ -82,11 +82,11 @@ static bool HandleTorrentURLRewrite(GURL* url, static void LoadOrLaunchMagnetURL( const GURL& url, - content::WebContents::OnceGetter web_contents_getter, + content::WebContents::Getter web_contents_getter, ui::PageTransition page_transition, bool has_user_gesture, const absl::optional& initiating_origin) { - content::WebContents* web_contents = std::move(web_contents_getter).Run(); + content::WebContents* web_contents = web_contents_getter.Run(); if (!web_contents) return; @@ -94,10 +94,9 @@ static void LoadOrLaunchMagnetURL( web_contents->GetController().LoadURL(url, content::Referrer(), page_transition, std::string()); } else { - ExternalProtocolHandler::LaunchUrl( - url, web_contents->GetRenderViewHost()->GetProcess()->GetID(), - web_contents->GetRenderViewHost()->GetRoutingID(), page_transition, - has_user_gesture, initiating_origin); + ExternalProtocolHandler::LaunchUrl(url, web_contents_getter, + page_transition, has_user_gesture, + initiating_origin); } } @@ -113,15 +112,15 @@ static bool HandleMagnetURLRewrite(GURL* url, static void HandleMagnetProtocol( const GURL& url, - content::WebContents::OnceGetter web_contents_getter, + content::WebContents::Getter web_contents_getter, ui::PageTransition page_transition, bool has_user_gesture, const absl::optional& initiating_origin) { DCHECK(url.SchemeIs(kMagnetScheme)); - base::PostTask(FROM_HERE, {content::BrowserThread::UI}, - base::BindOnce(&LoadOrLaunchMagnetURL, url, - std::move(web_contents_getter), page_transition, - has_user_gesture, initiating_origin)); + base::PostTask( + FROM_HERE, {content::BrowserThread::UI}, + base::BindOnce(&LoadOrLaunchMagnetURL, url, web_contents_getter, + page_transition, has_user_gesture, initiating_origin)); } static bool IsMagnetProtocol(const GURL& url) { From 8c83b8731afc7b77fe949cededbc454fa3391aea Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 21 Jun 2021 13:00:51 +0200 Subject: [PATCH 055/205] Only include v8_storage_estimate.h to subclass access StorageEstimage Previously, the code generator used for v8_storage_estimate.h would not include the definition of the StorageEstimate class in the generated code, forcing us to include another generated file in the list of includes where it was defined: //t_p/b/r/m/quota/storage_estimate.h. However, recent changes in Chromium has changed this and now the StorageEstimate class is defined in v8_storage_estimate.h already, so we need to drop that other include from Brave-specific code. Chromium changes: https://chromium.googlesource.com/chromium/src/+/64e3501dc66a1465a5784e62deb2a32539d0d26c https://chromium.googlesource.com/chromium/src/+/4dec89481af5e69832b8a4c2f227e2ccd3da2f76 commit 64e3501dc66a1465a5784e62deb2a32539d0d26c Author: Yuki Shiino Date: Mon Jun 7 12:11:12 2021 +0000 bind-gen: Implement the new IDL dictionary (2nd ver) Implements the new implementation of the IDL dictionaries. The 2nd ver implementations are based on: 1) Reuse the techniques used to implement IDL unions. IDL unions are class objects and similar to IDL dictionaries. So the same implementation techniques can be applied to IDL dictionaries. 2) ToV8 was replaced with ToV8Traits::ToV8, so the implementation of this patch is based on ToV8Traits. This patch is yet behind a flag, and doesn't affect prod. Bug: 839389 commit 4dec89481af5e69832b8a4c2f227e2ccd3da2f76 Author: Yuki Shiino Date: Thu Jun 10 07:47:36 2021 +0000 bind-gen: Fix IDL enumeration implementation in two points Fixes the following two issues in the IDL enumeration implementation. 1. The default constructor was publicly accessible. This can be a cause of abuse of the construction in the invalid state (Empty state). Moves the default constructor to private:. 2. The string table was defined in *.h as constexpr, which allows compilers to make a copy of the string table in each translation unit. Moves the definition of the string table to *.cc so that there exists no copy of the string table. No copy means the strings in the table are interned strings. We can compare strings by the address of the strings. This optimization has already been used in operator==. Bug: 839389 --- .../third_party/blink/renderer/modules/quota/storage_manager.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/chromium_src/third_party/blink/renderer/modules/quota/storage_manager.cc b/chromium_src/third_party/blink/renderer/modules/quota/storage_manager.cc index b3f61a4a6eb9..de2c9be07477 100644 --- a/chromium_src/third_party/blink/renderer/modules/quota/storage_manager.cc +++ b/chromium_src/third_party/blink/renderer/modules/quota/storage_manager.cc @@ -3,7 +3,6 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "third_party/blink/renderer/modules/quota/storage_estimate.h" #include "third_party/blink/renderer/bindings/modules/v8/v8_storage_estimate.h" namespace blink { From ad992944b0e2645f6b996edaae0ecef980e94a09 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 21 Jun 2021 13:35:32 +0200 Subject: [PATCH 056/205] Use RenderFrame::GetMainRenderFrame() instead of RenderView's The method has been removed from RenderView in favour of the newly added one in RenderFrame. Chromium change: https://chromium.googlesource.com/chromium/src/+/a3f2d52bc842c320df2d8d648f7510225e43992a commit a3f2d52bc842c320df2d8d648f7510225e43992a Author: Dave Tapuska Date: Fri Jun 11 15:30:18 2021 +0000 Remove GetMainRenderFrame from RenderView. The MainFrame can be accessed off of WebView's API so there is no need to store it in RenderViewImpl. Provide a convenience method on RenderFrame to get the MainRenderFrame from the WebView. BUG=1155202 --- ...e_content_settings_agent_impl_autoplay_browsertest.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc b/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc index bf07de06006f..d3532a381d93 100644 --- a/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc +++ b/components/content_settings/renderer/brave_content_settings_agent_impl_autoplay_browsertest.cc @@ -104,9 +104,8 @@ class BraveContentSettingsAgentImplAutoplayBrowserTest // Unbind the ContentSettingsAgent interface that would be registered by // the ContentSettingsAgentImpl created when the render frame is created. - view_->GetMainRenderFrame() - ->GetAssociatedInterfaceRegistry() - ->RemoveInterface(mojom::ContentSettingsAgent::Name_); + GetMainRenderFrame()->GetAssociatedInterfaceRegistry()->RemoveInterface( + mojom::ContentSettingsAgent::Name_); } }; @@ -124,7 +123,7 @@ TEST_F(BraveContentSettingsAgentImplAutoplayBrowserTest, content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK)), std::string(), false)); - MockContentSettingsAgentImpl agent(view_->GetMainRenderFrame()); + MockContentSettingsAgentImpl agent(GetMainRenderFrame()); agent.SetContentSettingRules(&content_setting_rules); EXPECT_FALSE(agent.AllowAutoplay(true)); base::RunLoop().RunUntilIdle(); @@ -157,7 +156,7 @@ TEST_F(BraveContentSettingsAgentImplAutoplayBrowserTest, content_settings::ContentSettingToValue(CONTENT_SETTING_ALLOW)), std::string(), false)); - MockContentSettingsAgentImpl agent(view_->GetMainRenderFrame()); + MockContentSettingsAgentImpl agent(GetMainRenderFrame()); agent.SetContentSettingRules(&content_setting_rules); EXPECT_TRUE(agent.AllowAutoplay(true)); From 7671dd803772c3a46ebf1d259213fc482c73cb51 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Tue, 6 Jul 2021 18:31:22 +0200 Subject: [PATCH 057/205] [Ephemeral Storage] Adapt to removal of IsCookieAccessAllowed upstream We need to remove the chromium_src overrides for that method, no longer existing, as well as to do some changes into RestrictedCookieManager to make sure that the calls to AnnotateAndMoveUserBlockedCookies() do take into account whether Ephemeral Storage is enabled or not. This change fixes the following 11 browser tests: * EphemeralStorageBrowserTest.ClosingTabClearsEphemeralStorage * EphemeralStorageBrowserTest.EphemeralStorageDoesNotLeakBetweenProfiles * EphemeralStorageBrowserTest.FirstPartyNestedInThirdParty * EphemeralStorageBrowserTest.NavigatingClearsEphemeralStorageAfterKeepAlive * EphemeralStorageBrowserTest.ReloadDoesNotClearEphemeralStorage * EphemeralStorageBrowserTest.StorageIsPartitioned * EphemeralStorageDisabledTest.CrossSiteCookiesBlockedInitial * EphemeralStorageKeepAliveDisabledBrowserTest.NavigatingClearsEphemeralStorageWhenKeepAliveDisabled * EphemeralStorageTest.CrossSiteCookiesBlockedInitial * EphemeralStorageTest.CrossSiteCookiesBlockedThisPageDifferentSession * EphemeralStorageTest.CrossSiteCookiesBlockedThisPageSameSession Chromium change: https://chromium.googlesource.com/chromium/src/+/59f8a845e61de2ebbed367590b009abdf38eb450 commit 59f8a845e61de2ebbed367590b009abdf38eb450 Author: cfredric Date: Tue Jun 8 15:27:11 2021 +0000 Refactor CookieSettings to apply exclusion reasons directly. This clears the way for cookies to be blocked by CookieSettings individually, rather than on a per-header basis for cookie-sends. (Note that cookie-sets already occur on a per-cookie basis, though the cookie itself isn't referenced.) We will need to do this blocking individually in order to support the --sameparty-cookies-considered-first-party flag. Change-Id: I68b8e82c949f70cfe73e141e80e409da97bd27ca Bug: 1203706 --- .../core/common/cookie_settings_base.cc | 23 ------------------ .../core/common/cookie_settings_base.h | 5 ---- .../services/network/cookie_settings.cc | 24 ++++++++++++++++++- .../services/network/cookie_settings.h | 11 ++++++++- .../network/restricted_cookie_manager.cc | 9 +++---- 5 files changed, 38 insertions(+), 34 deletions(-) diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc index 3ea7a2911113..44859ea7343f 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc @@ -144,27 +144,12 @@ bool CookieSettingsBase::IsEphemeralCookieAccessAllowed( return IsFullCookieAccessAllowed(url, site_for_cookies, top_frame_origin); } -// TODO(mario): Remove once IsCookieAccessAllowed() gets removed upstream. -bool CookieSettingsBase::IsCookieAccessAllowed( - const GURL& url, - const GURL& first_party_url) const { - return IsFullCookieAccessAllowed(url, first_party_url); -} - bool CookieSettingsBase::IsFullCookieAccessAllowed( const GURL& url, const GURL& first_party_url) const { return IsFullCookieAccessAllowed(url, first_party_url, absl::nullopt); } -// TODO(mario): Remove once IsCookieAccessAllowed() gets removed upstream. -bool CookieSettingsBase::IsCookieAccessAllowed( - const GURL& url, - const GURL& site_for_cookies, - const absl::optional& top_frame_origin) const { - return IsFullCookieAccessAllowed(url, site_for_cookies, top_frame_origin); -} - bool CookieSettingsBase::IsFullCookieAccessAllowed( const GURL& url, const GURL& site_for_cookies, @@ -201,14 +186,6 @@ bool CookieSettingsBase::IsCookieAccessAllowedImpl( } // namespace content_settings -// TODO(mario): Remove once IsCookieAccessAllowed() gets removed upstream. -#define IsCookieAccessAllowed IsChromiumCookieAccessAllowed - #define IsFullCookieAccessAllowed IsChromiumFullCookieAccessAllowed - #include "../../../../../../components/content_settings/core/common/cookie_settings_base.cc" // NOLINT - #undef IsFullCookieAccessAllowed - -// TODO(mario): Remove once IsCookieAccessAllowed() gets removed upstream. -#undef IsCookieAccessAllowed diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.h b/chromium_src/components/content_settings/core/common/cookie_settings_base.h index 2092d7a69d16..531cdf17b927 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.h +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.h @@ -38,11 +38,6 @@ class ScopedEphemeralStorageAwareness { bool IsChromiumFullCookieAccessAllowed(const GURL& url, \ const GURL& first_party_url) const; \ bool IsChromiumFullCookieAccessAllowed( \ - const GURL& url, const GURL& site_for_cookies, \ - const absl::optional& top_frame_origin) const; \ - bool IsChromiumCookieAccessAllowed(const GURL& url, \ - const GURL& first_party_url) const; \ - bool IsChromiumCookieAccessAllowed( \ const GURL& url, const GURL& site_for_cookies, \ const absl::optional& top_frame_origin) const; \ \ diff --git a/chromium_src/services/network/cookie_settings.cc b/chromium_src/services/network/cookie_settings.cc index 94749421200b..11af9d058f96 100644 --- a/chromium_src/services/network/cookie_settings.cc +++ b/chromium_src/services/network/cookie_settings.cc @@ -5,6 +5,8 @@ #include "services/network/cookie_settings.h" +#include "url/origin.h" + namespace network { bool CookieSettings::IsEphemeralCookieAccessible( @@ -23,6 +25,26 @@ bool CookieSettings::IsEphemeralCookieAccessible( return IsCookieAccessible(cookie, url, site_for_cookies, top_frame_origin); } +bool CookieSettings::AnnotateAndMoveUserBlockedEphemeralCookies( + const GURL& url, + const GURL& site_for_cookies, + const url::Origin* top_frame_origin, + net::CookieAccessResultList& maybe_included_cookies, + net::CookieAccessResultList& excluded_cookies) const { + absl::optional top_frame_origin_opt; + if (top_frame_origin) + top_frame_origin_opt = *top_frame_origin; + + if (IsEphemeralCookieAccessAllowed(url, site_for_cookies, + top_frame_origin_opt)) { + return true; + } + + return AnnotateAndMoveUserBlockedCookies( + url, site_for_cookies, top_frame_origin, maybe_included_cookies, + excluded_cookies); +} + } // namespace network -#include "../../../../../../services/network/cookie_settings.cc" // NOLINT +#include "../../../../services/network/cookie_settings.cc" diff --git a/chromium_src/services/network/cookie_settings.h b/chromium_src/services/network/cookie_settings.h index d1bb761e76a0..b457d7751393 100644 --- a/chromium_src/services/network/cookie_settings.h +++ b/chromium_src/services/network/cookie_settings.h @@ -13,8 +13,17 @@ const absl::optional& top_frame_origin) const; \ bool IsCookieAccessible -#include "../../../../../../services/network/cookie_settings.h" +#define AnnotateAndMoveUserBlockedCookies \ + AnnotateAndMoveUserBlockedEphemeralCookies( \ + const GURL& url, const GURL& site_for_cookies, \ + const url::Origin* top_frame_origin, \ + net::CookieAccessResultList& maybe_included_cookies, \ + net::CookieAccessResultList& excluded_cookies) const; \ + bool AnnotateAndMoveUserBlockedCookies +#include "../../../../services/network/cookie_settings.h" + +#undef AnnotateAndMoveUserBlockedCookies #undef IsCookieAccessible #endif // BRAVE_CHROMIUM_SRC_SERVICES_NETWORK_COOKIE_SETTINGS_H_ diff --git a/chromium_src/services/network/restricted_cookie_manager.cc b/chromium_src/services/network/restricted_cookie_manager.cc index 396f844ee6cc..d47a24a93e54 100644 --- a/chromium_src/services/network/restricted_cookie_manager.cc +++ b/chromium_src/services/network/restricted_cookie_manager.cc @@ -14,19 +14,20 @@ #include "url/gurl.h" #include "url/origin.h" -// IsEphemeralCookieAccessible declared & defined via a chromium_src override -// for services/network/cookie_settings.{h,cc}. +// IsEphemeralCookieAccessible and AnnotateAndMoveUserBlockedCookies declared & +// defined via a chromium_src override for network/cookie_settings.{h,cc}. #define IsCookieAccessible IsEphemeralCookieAccessible +#define AnnotateAndMoveUserBlockedCookies \ + AnnotateAndMoveUserBlockedEphemeralCookies // IsEphemeralCookieAccessAllowed declared & defined via a chromium_src override // for components/content_settings/core/common/cookie_settings_base.{h,cc}. -#define IsCookieAccessAllowed IsEphemeralCookieAccessAllowed #define IsFullCookieAccessAllowed IsEphemeralCookieAccessAllowed #include "../../../../services/network/restricted_cookie_manager.cc" #undef IsFullCookieAccessAllowed -#undef IsCookieAccessAllowed +#undef AnnotateAndMoveUserBlockedCookies #undef IsCookieAccessible namespace network { From 0423fd8b953af2468e12da1ab48e2605031c4e85 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Mon, 21 Jun 2021 13:32:13 +0200 Subject: [PATCH 058/205] Fix rollup optimization failures due to new 'tsc' extension Adapt the expected dirname in |preprocessed_folder| to allow JavaScript files generated out of TypeScript files that include our Brave-specific modules to find them when doing the rollup optimization, at build time. This prevents this build error from happening on optimized builds: [!] Error: Could not resolve './brave_overrides/index.js' from gen/chrome/browser/resources/extensions/tsc/extensions.js Error: Could not resolve './brave_overrides/index.js' from gen/chrome/browser/resources/extensions/tsc/extensions.js at error (/home/mario/work/brave-rebases/brave-browser-next/src/third_party/node/node_modules/rollup/dist/rollup.js:10162:30) at ModuleLoader.handleMissingImports (/home/mario/work/brave-rebases/brave-browser-next/src/third_party/node/node_modules/rollup/dist/rollup.js:17237:17) at ModuleLoader. (/home/mario/work/brave-rebases/brave-browser-next/src/third_party/node/node_modules/rollup/dist/rollup.js:17288:26) at Generator.next () at fulfilled (/home/mario/work/brave-rebases/brave-browser-next/src/third_party/node/node_modules/rollup/dist/rollup.js:40:28) Ideally, Brave's JavaScript files should be migrated to TypeScript, but that should be done separate from the rebase, see GH issue #16553 [1]. [1] https://github.com/brave/brave-browser/issues/16553 the time being this quick hack will keep Brave building. --- browser/resources/extensions/BUILD.gn | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/resources/extensions/BUILD.gn b/browser/resources/extensions/BUILD.gn index 710dafcd3d76..493c6c7fe27f 100644 --- a/browser/resources/extensions/BUILD.gn +++ b/browser/resources/extensions/BUILD.gn @@ -5,7 +5,13 @@ import("//tools/grit/preprocess_if_expr.gni") import("//tools/polymer/polymer.gni") import("//ui/webui/resources/tools/generate_grd.gni") -preprocess_folder = "preprocessed" +# Due to the JavaScript -> TypeScript migration happening upstream, we can no +# longer use 'preprocessed' as the dirname below since generated files will be +# now placed under gen/chrome/browser/resources/extensions/tsc instead. Thus, +# let's adjust the preprocessed directory to match that expectation while our +# Brave-specific JavaScript files are not migrated to TypeScript. +# See https://github.com/brave/brave-browser/issues/16553 +preprocess_folder = "tsc" preprocess_manifest = "brave_preprocessed_manifest.json" preprocess_gen_manifest = "brave_preprocessed_gen_manifest.json" From e762e35637d3631f523cc731f55ba06be7ca2a3d Mon Sep 17 00:00:00 2001 From: samartnik Date: Tue, 22 Jun 2021 11:25:37 -0400 Subject: [PATCH 059/205] [Android] Adjustments for FeedSurfaceCoordinator code changes Chromium change: https://chromium.googlesource.com/chromium/src/+/c84e15f86da8a6f00920d4dd03087cc88b8970f5 More feed launch reliability logging * Log the "feed reloading" start event * Log a catch-all launch end event when the stream is unbound: more specific feed launch end conditions (user navigated away, switched tabs/apps, etc.) will be added in another CL * Use no-op logger in public builds or if reliability logging is disabled Bug: 1195940 --- .../feed/BraveFeedSurfaceCoordinator.java | 16 ++++++++++++---- android/java/apk_for_test.flags | 18 +++++++++++++++++- .../chrome/browser/ntp/BraveNewTabPage.java | 11 +++++++---- .../chromium/chrome/browser/BytecodeTest.java | 15 ++++++++++++--- ...raveFeedSurfaceCoordinatorClassAdapter.java | 5 +++-- 5 files changed, 51 insertions(+), 14 deletions(-) diff --git a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java index b47dffbaab78..46d2b05ca92f 100644 --- a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java +++ b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java @@ -21,6 +21,7 @@ import org.chromium.chrome.browser.ntp.ScrollableContainerDelegate; import org.chromium.chrome.browser.ntp.SnapScrollHelper; import org.chromium.chrome.browser.ntp.snippets.SectionHeaderView; +import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; @@ -31,8 +32,8 @@ import org.chromium.ui.base.WindowAndroid; public class BraveFeedSurfaceCoordinator extends FeedSurfaceCoordinator { - private Activity mActivity; - private ScrollView mScrollViewForPolicy; + // To delete in bytecode, members from parent class will be used instead. + private @Nullable ScrollView mScrollViewForPolicy; private View mNtpHeader; private FrameLayout mRootView; @@ -44,11 +45,14 @@ public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarMa boolean isPlaceholderShownInitially, BottomSheetController bottomSheetController, Supplier shareDelegateSupplier, @Nullable ScrollableContainerDelegate externalScrollableContainerDelegate, - TabModelSelector tabModelSelector, @NewTabPageLaunchOrigin int launchOrigin) { + TabModelSelector tabModelSelector, @NewTabPageLaunchOrigin int launchOrigin, + PrivacyPreferencesManagerImpl privacyPreferencesManager, + FeedLaunchReliabilityLoggingState launchReliabilityLoggingState) { super(activity, snackbarManager, windowAndroid, snapScrollHelper, ntpHeader, sectionHeaderView, showDarkBackground, delegate, pageNavigationDelegate, profile, isPlaceholderShownInitially, bottomSheetController, shareDelegateSupplier, - externalScrollableContainerDelegate, tabModelSelector, launchOrigin); + externalScrollableContainerDelegate, tabModelSelector, launchOrigin, + privacyPreferencesManager, launchReliabilityLoggingState); } @Override @@ -82,4 +86,8 @@ void createScrollViewForPolicy() { public boolean isEnhancedProtectionPromoEnabled() { return false; } + + public boolean isReliabilityLoggingEnabled() { + return false; + } } diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index c8d2d5f6f87b..c9daaa817893 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -321,4 +321,20 @@ -keep class org.chromium.chrome.browser.omnibox.status.BraveStatusMediator { public (...); -} \ No newline at end of file +} + +-keep class org.chromium.chrome.browser.feed.FeedSurfaceCoordinator { + *** mScrollViewForPolicy; + *** mNtpHeader; + *** mRootView; + *** isEnhancedProtectionPromoEnabled(...); + *** isReliabilityLoggingEnabled(...); +} + +-keep class org.chromium.chrome.browser.feed.BraveFeedSurfaceCoordinator { + *** mScrollViewForPolicy; + *** mNtpHeader; + *** mRootView; + *** isEnhancedProtectionPromoEnabled(...); + *** isReliabilityLoggingEnabled(...); +} diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java index 4e2097debdda..d2b661cc30ff 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java @@ -17,6 +17,7 @@ import org.chromium.chrome.browser.feed.shared.FeedFeatures; import org.chromium.chrome.browser.feed.shared.FeedSurfaceProvider; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; +import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab.Tab; @@ -37,7 +38,7 @@ public BraveNewTabPage(Activity activity, boolean isTablet, NewTabPageUma uma, boolean isInNightMode, NativePageHost nativePageHost, Tab tab, String url, BottomSheetController bottomSheetController, - ObservableSupplier shareDelegateSupplier, WindowAndroid windowAndroid) { + Supplier shareDelegateSupplier, WindowAndroid windowAndroid) { super(activity, browserControlsStateProvider, activityTabProvider, snackbarManager, lifecycleDispatcher, tabModelSelector, isTablet, uma, isInNightMode, nativePageHost, tab, url, bottomSheetController, shareDelegateSupplier, windowAndroid); @@ -52,8 +53,8 @@ public BraveNewTabPage(Activity activity, protected void initializeMainView(Activity activity, WindowAndroid windowAndroid, SnackbarManager snackbarManager, NewTabPageUma uma, boolean isInNightMode, BottomSheetController bottomSheetController, - ObservableSupplier shareDelegateSupplier, - TabModelSelector tabModelSelector, String url) { + Supplier shareDelegateSupplier, TabModelSelector tabModelSelector, + String url) { super.initializeMainView(activity, windowAndroid, snackbarManager, uma, isInNightMode, bottomSheetController, shareDelegateSupplier, tabModelSelector, url); // Override surface provider @@ -66,6 +67,8 @@ windowAndroid, new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout), mNewTabPageManager.getNavigationDelegate(), profile, /* isPlaceholderShownInitially= */ false, bottomSheetController, shareDelegateSupplier, /* externalScrollableContainerDelegate= */ null, - tabModelSelector, NewTabPageUtils.decodeOriginFromNtpUrl(url)); + tabModelSelector, NewTabPageUtils.decodeOriginFromNtpUrl(url), + PrivacyPreferencesManagerImpl.getInstance(), + /* FeedLaunchReliabilityLoggingState */ null); } } diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 0d7b92d63e42..00c9ee5176ba 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -86,6 +86,7 @@ public void testClassesExist() throws Exception { Assert.assertTrue(classExists("org/chromium/chrome/browser/LaunchIntentDispatcher")); Assert.assertTrue(classExists("org/chromium/chrome/browser/ntp/NewTabPageLayout")); Assert.assertTrue(classExists("org/chromium/chrome/browser/feed/FeedSurfaceCoordinator")); + Assert.assertTrue(classExists("org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator")); Assert.assertTrue(classExists("org/chromium/chrome/browser/ntp/NewTabPage")); Assert.assertTrue(classExists("org/chromium/chrome/browser/ntp/BraveNewTabPage")); Assert.assertTrue(classExists( @@ -261,6 +262,16 @@ public void testMethodsExist() throws Exception { Assert.assertTrue(methodExists( "org/chromium/chrome/browser/tasks/tab_management/BraveTabUiFeatureUtilities", "isTabGroupsAndroidEnabled", false, null)); + Assert.assertTrue(methodExists("org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", + "isEnhancedProtectionPromoEnabled", false, null)); + Assert.assertTrue(methodExists("org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", + "isReliabilityLoggingEnabled", false, null)); + Assert.assertTrue( + methodExists("org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator", + "isEnhancedProtectionPromoEnabled", false, null)); + Assert.assertTrue( + methodExists("org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator", + "isReliabilityLoggingEnabled", false, null)); } @Test @@ -348,7 +359,7 @@ public void testConstructorsExistAndMatch() throws Exception { BrowserControlsStateProvider.class, Supplier.class, SnackbarManager.class, ActivityLifecycleDispatcher.class, TabModelSelector.class, boolean.class, NewTabPageUma.class, boolean.class, NativePageHost.class, Tab.class, String.class, - BottomSheetController.class, ObservableSupplier.class, WindowAndroid.class)); + BottomSheetController.class, Supplier.class, WindowAndroid.class)); } @Test @@ -364,8 +375,6 @@ public void testFieldsExist() throws Exception { "org/chromium/chrome/browser/ntp/NewTabPageLayout", "mSiteSectionView")); Assert.assertTrue( fieldExists("org/chromium/chrome/browser/ntp/NewTabPageLayout", "mTileGroup")); - Assert.assertTrue(fieldExists( - "org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mActivity")); Assert.assertTrue(fieldExists( "org/chromium/chrome/browser/feed/FeedSurfaceCoordinator", "mScrollViewForPolicy")); Assert.assertTrue(fieldExists( diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java index 52f823e9ec10..769e98ecb3d0 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveFeedSurfaceCoordinatorClassAdapter.java @@ -19,8 +19,9 @@ public BraveFeedSurfaceCoordinatorClassAdapter(ClassVisitor visitor) { addMethodAnnotation(sBraveFeedSurfaceCoordinatorClassName, "isEnhancedProtectionPromoEnabled", "Ljava/lang/Override;"); - deleteField(sBraveFeedSurfaceCoordinatorClassName, "mActivity"); - makeProtectedField(sFeedSurfaceCoordinatorClassName, "mActivity"); + makePublicMethod(sFeedSurfaceCoordinatorClassName, "isReliabilityLoggingEnabled"); + addMethodAnnotation(sBraveFeedSurfaceCoordinatorClassName, "isReliabilityLoggingEnabled", + "Ljava/lang/Override;"); deleteField(sBraveFeedSurfaceCoordinatorClassName, "mScrollViewForPolicy"); makeProtectedField(sFeedSurfaceCoordinatorClassName, "mScrollViewForPolicy"); From fafc54defd51e9fd48dac8b71f2e800268a8dc7f Mon Sep 17 00:00:00 2001 From: samartnik Date: Tue, 22 Jun 2021 11:28:20 -0400 Subject: [PATCH 060/205] [Android] SyncService related changes Chromium change: https://chromium.googlesource.com/chromium/src/+/21667acc2a3c5fe6738899fb494248c583bcc230 Rename ProfileSyncService to SyncServiceImpl in Android code No behavior is changed. Do the following renamings: - ProfileSyncService.java -> SyncServiceImpl.java - profile_sync_service_android.h -> sync_service_android_bridge.h - FakeProfileSyncService.java -> FakeSyncServiceImpl.java (and corresponding *WithFakeProfileSyncService test files) Moreover - Update the documentation of *sync_service_android_bridge.h Bug: 1201272 --- .../chromium/chrome/browser/BraveSyncInformers.java | 4 ++-- .../informers/BraveAndroidSyncDisabledInformer.java | 4 ++-- .../browser/settings/BraveSyncScreensPreference.java | 10 +++++----- .../chrome/browser/signin/BraveSigninManager.java | 10 +++------- .../chrome/browser/sync/BraveAndroidSyncSettings.java | 4 ++-- browser/sync/brave_sync_devices_android.h | 1 - 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/BraveSyncInformers.java b/android/java/org/chromium/chrome/browser/BraveSyncInformers.java index b65f230a1220..692dd549db34 100644 --- a/android/java/org/chromium/chrome/browser/BraveSyncInformers.java +++ b/android/java/org/chromium/chrome/browser/BraveSyncInformers.java @@ -19,7 +19,7 @@ import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.settings.BraveSyncScreensPreference; import org.chromium.chrome.browser.settings.SettingsLauncherImpl; -import org.chromium.chrome.browser.sync.ProfileSyncService; +import org.chromium.chrome.browser.sync.SyncService; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.ui.messages.infobar.BraveSimpleConfirmInfoBarBuilder; import org.chromium.chrome.browser.ui.messages.infobar.SimpleConfirmInfoBarBuilder; @@ -43,7 +43,7 @@ private static void showSetupV2IfRequired() { return; } - boolean isV2User = ProfileSyncService.get() != null && ProfileSyncService.get().isFirstSetupComplete(); + boolean isV2User = SyncService.get() != null && SyncService.get().isFirstSetupComplete(); if (isV2User) { braveSyncWorker.setSyncV2MigrateNoticeDismissed(true); return; diff --git a/android/java/org/chromium/chrome/browser/informers/BraveAndroidSyncDisabledInformer.java b/android/java/org/chromium/chrome/browser/informers/BraveAndroidSyncDisabledInformer.java index 9a1544102bae..a6d08ffc59d9 100644 --- a/android/java/org/chromium/chrome/browser/informers/BraveAndroidSyncDisabledInformer.java +++ b/android/java/org/chromium/chrome/browser/informers/BraveAndroidSyncDisabledInformer.java @@ -16,7 +16,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.infobar.InfoBarIdentifier; -import org.chromium.chrome.browser.sync.ProfileSyncService; +import org.chromium.chrome.browser.sync.SyncService; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.ui.messages.infobar.BraveSimpleConfirmInfoBarBuilder; import org.chromium.chrome.browser.ui.messages.infobar.SimpleConfirmInfoBarBuilder; @@ -49,7 +49,7 @@ private static void showIfRequired() { return; } - boolean brave_sync_is_enabled = ProfileSyncService.get().isFirstSetupComplete(); + boolean brave_sync_is_enabled = SyncService.get().isFirstSetupComplete(); boolean android_system_sync_disabled = !ContentResolver.getMasterSyncAutomatically(); if (!brave_sync_is_enabled || !android_system_sync_disabled) { diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java index 1c724a93b25f..439768246f3a 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSyncScreensPreference.java @@ -82,7 +82,7 @@ import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.chrome.browser.settings.SettingsActivity; import org.chromium.chrome.browser.sync.BraveSyncDevices; -import org.chromium.chrome.browser.sync.ProfileSyncService; +import org.chromium.chrome.browser.sync.SyncService; import org.chromium.chrome.browser.sync.settings.BraveManageSyncSettings; import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils; import org.chromium.chrome.browser.sync.settings.SyncSettingsUtils.SyncError; @@ -104,7 +104,7 @@ public class BraveSyncScreensPreference extends BravePreferenceFragment implements View.OnClickListener, SettingsActivity.OnBackPressedListener, BarcodeTracker.BarcodeGraphicTrackerCallback, BraveSyncDevices.DeviceInfoChangedListener, - ProfileSyncService.SyncStateChangedListener { + SyncService.SyncStateChangedListener { public static final int BIP39_WORD_COUNT = 24; private static final String TAG = "SYNC"; // Permission request codes need to be < 256 @@ -194,7 +194,7 @@ public void onConfigurationChanged(Configuration newConfig) { @Override public View onCreateView( LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - ProfileSyncService.get().addSyncStateChangedListener(this); + SyncService.get().addSyncStateChangedListener(this); InvalidateCodephrase(); @@ -883,7 +883,7 @@ public void onDestroy() { mCameraSourcePreview.release(); } - ProfileSyncService.get().removeSyncStateChangedListener(this); + SyncService.get().removeSyncStateChangedListener(this); if (deviceInfoObserverSet) { BraveSyncDevices.get().removeDeviceInfoChangedListener(this); @@ -1021,7 +1021,7 @@ private void leaveSyncChainComplete() { @Override public void syncStateChanged() { - if (ProfileSyncService.get().isFirstSetupComplete() == false) { + if (SyncService.get().isFirstSetupComplete() == false) { if (mLeaveSyncChainInProgress) { leaveSyncChainComplete(); } else { diff --git a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java index 4d0387042216..43270288b1b0 100644 --- a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java +++ b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java @@ -15,7 +15,7 @@ import org.chromium.chrome.browser.AppHooks; import org.chromium.chrome.browser.signin.services.SigninManager; import org.chromium.components.signin.base.CoreAccountInfo; -import org.chromium.components.signin.identitymanager.AccountInfoService; +import org.chromium.components.signin.identitymanager.AccountInfoServiceImpl; import org.chromium.components.signin.identitymanager.AccountTrackerService; import org.chromium.components.signin.identitymanager.IdentityManager; import org.chromium.components.signin.identitymanager.IdentityMutator; @@ -55,10 +55,6 @@ public void signOut(@SignoutReason int signoutSource, SignOutCallback signOutCal @MainThread public void runAfterOperationInProgress(Runnable runnable) {} - @Override - public void signinAndEnableSync(@SigninAccessPoint int accessPoint, CoreAccountInfo accountInfo, - @Nullable SignInCallback callback) {} - @Override @Deprecated public void signinAndEnableSync(@SigninAccessPoint int accessPoint, Account account, @@ -106,12 +102,12 @@ public String extractDomainName(String accountEmail) { static SigninManager create(long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService, IdentityManager identityManager, IdentityMutator identityMutator) { - AccountInfoService.init(identityManager, accountTrackerService); + AccountInfoServiceImpl.init(identityManager, accountTrackerService); return new BraveSigninManager(identityManager); } @CalledByNative void destroy() { - AccountInfoService.get().destroy(); + AccountInfoServiceImpl.get().destroy(); } } diff --git a/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java b/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java index 68ffb714adfe..e8713af1be20 100644 --- a/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java +++ b/android/java/org/chromium/chrome/browser/sync/BraveAndroidSyncSettings.java @@ -8,7 +8,7 @@ import android.accounts.Account; import android.annotation.SuppressLint; -import org.chromium.chrome.browser.sync.ProfileSyncService; +import org.chromium.chrome.browser.sync.SyncService; // see org.brave.bytecode.BraveAndroidSyncSettingsAdapter public class BraveAndroidSyncSettings extends AndroidSyncSettings { @@ -28,7 +28,7 @@ public void disableChromeSync() { } // so pretend sync for Brave "account" is always on when sync is configured @Override public boolean isChromeSyncEnabled() { - ProfileSyncService profileSyncService = ProfileSyncService.get(); + SyncService profileSyncService = SyncService.get(); return profileSyncService != null && profileSyncService.isFirstSetupComplete(); } } diff --git a/browser/sync/brave_sync_devices_android.h b/browser/sync/brave_sync_devices_android.h index 959c3d9ea869..ecb55f464a94 100644 --- a/browser/sync/brave_sync_devices_android.h +++ b/browser/sync/brave_sync_devices_android.h @@ -11,7 +11,6 @@ #include "base/android/jni_weak_ref.h" #include "base/scoped_observation.h" #include "base/values.h" -#include "chrome/browser/sync/profile_sync_service_android.h" #include "components/sync_device_info/device_info_tracker.h" class Profile; From cefa618bad2ef2fd4f60ffcee82c803abde638e9 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 18 Jun 2021 18:39:44 +0200 Subject: [PATCH 061/205] Remove Brave-specific code related to the Media Router extension This extention is no longer used upstream as Media Router capabilities are now unconditionally enabled, meaning that there's no need to select any setting to have access to enable ChromeCast in the browser. Thus, drop the code from https://github.com/brave/brave-core/pull/2836, plus every other reference to this extension in Brave-specific code. Chromium change: https://chromium.googlesource.com/chromium/src/+/e287bab0c15dc688d9604f9e43993ccd3b217adf commit e287bab0c15dc688d9604f9e43993ccd3b217adf Author: Takumi Fujimoto Date: Thu Jun 10 06:19:57 2021 +0000 Stop loading the Media Router component extension We no longer use the component extension so it can now be removed. Although this CL does not explicitly uninstall the extension, if the extension is installed, its files get deleted on startup via ExtensionService::CheckExternalUninstall(). Bug: 1179785, b/184392261 fixup! [WIP] Remove Brave-specific code related to the Media Router extension --- app/brave_generated_resources.grd | 3 - browser/brave_profile_prefs.cc | 13 ---- .../api/settings_private/brave_prefs_util.cc | 3 - .../brave_default_extensions_page.html | 7 --- .../brave_default_extensions_page.js | 4 -- .../brave_default_extensions_handler.cc | 42 ------------- .../brave_default_extensions_handler.h | 1 - chromium_src/chrome/browser/about_flags.cc | 33 +--------- .../media/router/media_router_feature.cc | 45 -------------- .../media_router_feature_browsertest.cc | 62 ------------------- .../settings_localized_strings_provider.cc | 1 - common/pref_names.cc | 1 - common/pref_names.h | 1 - test/BUILD.gn | 1 - 14 files changed, 1 insertion(+), 216 deletions(-) delete mode 100644 chromium_src/chrome/browser/media/router/media_router_feature.cc delete mode 100644 chromium_src/chrome/browser/media/router/media_router_feature_browsertest.cc diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd index 6573ec564a78..de5daaf80e7a 100644 --- a/app/brave_generated_resources.grd +++ b/app/brave_generated_resources.grd @@ -953,9 +953,6 @@ By installing this extension, you are agreeing to the Google Widevine Terms of U Uses Hangouts component to enable screen sharing and other features in the browser. - - Uses Media Router component to enable Chromecast in the browser. - Your changes will take effect the next time you relaunch Brave. diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index fdb3539f47d2..1db8ce6e60b2 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -236,19 +236,6 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // Hangouts registry->RegisterBooleanPref(kHangoutsEnabled, true); - // Media Router - registry->SetDefaultPrefValue(prefs::kEnableMediaRouter, base::Value(false)); - - // 1. We do not want to enable the MediaRouter pref directly, so - // using a proxy pref to handle Media Router setting - // 2. On upgrade users might have enabled Media Router and the pref should - // be set correctly, so we use feature switch to set the initial value -#if BUILDFLAG(ENABLE_EXTENSIONS) - registry->RegisterBooleanPref( - kBraveEnabledMediaRouter, - FeatureSwitch::load_media_router_component_extension()->IsEnabled()); -#endif - // Restore last profile on restart registry->SetDefaultPrefValue( prefs::kRestoreOnStartup, diff --git a/browser/extensions/api/settings_private/brave_prefs_util.cc b/browser/extensions/api/settings_private/brave_prefs_util.cc index f2a7341fd1b0..fb32c74e72d8 100644 --- a/browser/extensions/api/settings_private/brave_prefs_util.cc +++ b/browser/extensions/api/settings_private/brave_prefs_util.cc @@ -230,9 +230,6 @@ const PrefsUtil::TypedPrefMap& BravePrefsUtil::GetAllowlistedKeys() { (*s_brave_allowlist)[kIpfsStorageMax] = settings_api::PrefType::PREF_TYPE_NUMBER; #endif - // Media Router Pref - (*s_brave_allowlist)[kBraveEnabledMediaRouter] = - settings_api::PrefType::PREF_TYPE_BOOLEAN; #if !BUILDFLAG(USE_GCM_FROM_PLATFORM) // Push Messaging Pref diff --git a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html index e1fdc5ce80b1..a656adf80bbf 100644 --- a/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html +++ b/browser/resources/settings/brave_default_extensions_page/brave_default_extensions_page.html @@ -102,13 +102,6 @@ menu-options="[[ensResolveMethod_]]">

- - RegisterMessageCallback( - "setMediaRouterEnabled", - base::BindRepeating(&BraveDefaultExtensionsHandler::SetMediaRouterEnabled, - base::Unretained(this))); // TODO(petemill): If anything outside this handler is responsible for causing // restart-neccessary actions, then this should be moved to a generic handler // and the flag should be moved to somewhere more static / singleton-like. @@ -169,18 +165,6 @@ void BraveDefaultExtensionsHandler::RegisterMessages() { } void BraveDefaultExtensionsHandler::InitializePrefCallbacks() { - PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs(); - pref_change_registrar_.Init(prefs); - pref_change_registrar_.Add( - kBraveEnabledMediaRouter, - base::BindRepeating( - &BraveDefaultExtensionsHandler::OnMediaRouterEnabledChanged, - base::Unretained(this))); - pref_change_registrar_.Add( - prefs::kEnableMediaRouter, - base::BindRepeating( - &BraveDefaultExtensionsHandler::OnMediaRouterEnabledChanged, - base::Unretained(this))); local_state_change_registrar_.Init(g_browser_process->local_state()); #if BUILDFLAG(ENABLE_TOR) local_state_change_registrar_.Add( @@ -198,19 +182,7 @@ void BraveDefaultExtensionsHandler::InitializePrefCallbacks() { #endif } -void BraveDefaultExtensionsHandler::OnMediaRouterEnabledChanged() { - OnRestartNeededChanged(); -} - bool BraveDefaultExtensionsHandler::IsRestartNeeded() { - bool media_router_current_pref = - profile_->GetPrefs()->GetBoolean(prefs::kEnableMediaRouter); - bool media_router_new_pref = - profile_->GetPrefs()->GetBoolean(kBraveEnabledMediaRouter); - - if (media_router_current_pref != media_router_new_pref) - return true; - #if BUILDFLAG(ENABLE_WIDEVINE) if (was_widevine_enabled_ != IsWidevineOptedIn()) return true; @@ -302,20 +274,6 @@ void BraveDefaultExtensionsHandler::OnRestartNeededChanged() { } } -void BraveDefaultExtensionsHandler::SetMediaRouterEnabled( - const base::ListValue* args) { - CHECK_EQ(args->GetSize(), 1U); - CHECK(profile_); - bool enabled; - args->GetBoolean(0, &enabled); - - std::string feature_name(switches::kLoadMediaRouterComponentExtension); - enabled ? feature_name += "@1" : feature_name += "@2"; - flags_ui::PrefServiceFlagsStorage flags_storage( - g_browser_process->local_state()); - about_flags::SetFeatureEntryEnabled(&flags_storage, feature_name, true); -} - void BraveDefaultExtensionsHandler::SetTorEnabled(const base::ListValue* args) { #if BUILDFLAG(ENABLE_TOR) CHECK_EQ(args->GetSize(), 1U); diff --git a/browser/ui/webui/settings/brave_default_extensions_handler.h b/browser/ui/webui/settings/brave_default_extensions_handler.h index 2aa87fdb1a84..c8caa14c74e2 100644 --- a/browser/ui/webui/settings/brave_default_extensions_handler.h +++ b/browser/ui/webui/settings/brave_default_extensions_handler.h @@ -69,7 +69,6 @@ class BraveDefaultExtensionsHandler : public settings::SettingsPageUIHandler extensions::webstore_install::Result result); void OnRestartNeededChanged(); - void OnMediaRouterEnabledChanged(); bool IsRestartNeeded(); #if BUILDFLAG(ENABLE_IPFS) diff --git a/chromium_src/chrome/browser/about_flags.cc b/chromium_src/chrome/browser/about_flags.cc index ac6778531984..9c1bca141c9c 100644 --- a/chromium_src/chrome/browser/about_flags.cc +++ b/chromium_src/chrome/browser/about_flags.cc @@ -3,38 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include #include "brave/browser/about_flags.cc" -#include "brave/common/pref_names.h" -#include "chrome/browser/profiles/profile.h" -#include "chrome/browser/profiles/profile_manager.h" -#include "components/prefs/pref_service.h" -#define SetFeatureEntryEnabled SetFeatureEntryEnabled_ChromiumImpl -#include "../../../../chrome/browser/about_flags.cc" // NOLINT -#undef SetFeatureEntryEnabled - -namespace about_flags { - -void UpdateBraveMediaRouterPref(const std::string& internal_name, - Profile* profile) { - bool enable = false; - if (base::EndsWith(internal_name, "@1", base::CompareCase::SENSITIVE)) { - enable = true; - } - if (base::StartsWith(internal_name, "load-media-router-component-extension", - base::CompareCase::SENSITIVE)) { - profile->GetPrefs()->SetBoolean(kBraveEnabledMediaRouter, enable); - } -} - -void SetFeatureEntryEnabled(flags_ui::FlagsStorage* flags_storage, - const std::string& internal_name, - bool enable) { - UpdateBraveMediaRouterPref(internal_name, - ProfileManager::GetActiveUserProfile()); - SetFeatureEntryEnabled_ChromiumImpl(flags_storage, internal_name, enable); -} - -} // namespace about_flags +#include "../../../../chrome/browser/about_flags.cc" diff --git a/chromium_src/chrome/browser/media/router/media_router_feature.cc b/chromium_src/chrome/browser/media/router/media_router_feature.cc deleted file mode 100644 index 9f8f8cfa757f..000000000000 --- a/chromium_src/chrome/browser/media/router/media_router_feature.cc +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "chrome/browser/media/router/media_router_feature.h" - -#include "chrome/common/pref_names.h" -#include "extensions/common/feature_switch.h" - -#define MediaRouterEnabled MediaRouterEnabled_ChromiumImpl -#include "../../../../../../chrome/browser/media/router/media_router_feature.cc" // NOLINT -#undef MediaRouterEnabled - -namespace media_router { - -// Media router pref can be toggled using kLoadMediaRouterComponentExtension -// on Desktop -void UpdateMediaRouterPref(content::BrowserContext* context) { -#if BUILDFLAG(ENABLE_EXTENSIONS) - user_prefs::UserPrefs::Get(context)->SetBoolean( - ::prefs::kEnableMediaRouter, - extensions::FeatureSwitch::load_media_router_component_extension() - ->IsEnabled()); -#endif -} - -bool MediaRouterEnabled(content::BrowserContext* context) { -#if defined(OS_ANDROID) - return MediaRouterEnabled_ChromiumImpl(context); -#elif BUILDFLAG(ENABLE_EXTENSIONS) - UpdateMediaRouterPref(context); - const PrefService::Preference* pref = GetMediaRouterPref(context); - bool allowed = false; - CHECK(pref->GetValue()->GetAsBoolean(&allowed)); - - // The component extension cannot be loaded in guest sessions. - // crbug.com/756243 - return allowed && !Profile::FromBrowserContext(context)->IsGuestSession(); -#else - return false; -#endif // defined(OS_ANDROID) -} - -} // namespace media_router diff --git a/chromium_src/chrome/browser/media/router/media_router_feature_browsertest.cc b/chromium_src/chrome/browser/media/router/media_router_feature_browsertest.cc deleted file mode 100644 index 5e627da5ee64..000000000000 --- a/chromium_src/chrome/browser/media/router/media_router_feature_browsertest.cc +++ /dev/null @@ -1,62 +0,0 @@ -/* Copyright 2019 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "chrome/browser/media/router/media_router_feature.h" -#include "chrome/browser/profiles/profile.h" -#include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_finder.h" -#include "chrome/common/pref_names.h" -#include "chrome/test/base/in_process_browser_test.h" -#include "components/prefs/pref_service.h" -#include "content/public/test/browser_test.h" -#include "extensions/common/feature_switch.h" - -using extensions::FeatureSwitch; - -class MediaRouterTest : public InProcessBrowserTest { - protected: - MediaRouterTest() {} - ~MediaRouterTest() override {} - - void SetUpOnMainThread() override { - InProcessBrowserTest::SetUpOnMainThread(); - } -}; - -IN_PROC_BROWSER_TEST_F(MediaRouterTest, MediaRouterDefaults) { - EXPECT_FALSE( - browser()->profile()->GetPrefs()->GetBoolean(prefs::kEnableMediaRouter)); - EXPECT_FALSE( - FeatureSwitch::load_media_router_component_extension()->IsEnabled()); -} - -IN_PROC_BROWSER_TEST_F(MediaRouterTest, MediaRouterEnabled) { - FeatureSwitch::ScopedOverride load_media_router_component_extension( - FeatureSwitch::load_media_router_component_extension(), true); - EXPECT_TRUE(media_router::MediaRouterEnabled(browser()->profile())); - EXPECT_TRUE( - browser()->profile()->GetPrefs()->GetBoolean(prefs::kEnableMediaRouter)); -} - -IN_PROC_BROWSER_TEST_F(MediaRouterTest, MediaRouterToggle) { - FeatureSwitch::ScopedOverride enabled_override_( - FeatureSwitch::load_media_router_component_extension(), true); - EXPECT_TRUE(media_router::MediaRouterEnabled(browser()->profile())); - EXPECT_TRUE( - browser()->profile()->GetPrefs()->GetBoolean(prefs::kEnableMediaRouter)); - - FeatureSwitch::ScopedOverride disabled_override_( - FeatureSwitch::load_media_router_component_extension(), false); - EXPECT_FALSE(media_router::MediaRouterEnabled(browser()->profile())); - EXPECT_FALSE( - browser()->profile()->GetPrefs()->GetBoolean(prefs::kEnableMediaRouter)); -} - -// Test to confirm that setting the pref to false disables MediaRouterEnabled -IN_PROC_BROWSER_TEST_F(MediaRouterTest, MediaRouterDisabled) { - browser()->profile()->GetPrefs()->SetBoolean(prefs::kEnableMediaRouter, - false); - EXPECT_FALSE(media_router::MediaRouterEnabled(browser()->profile())); -} diff --git a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc index 5c2c4943b2bb..7b1506d1be0c 100644 --- a/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chromium_src/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc @@ -265,7 +265,6 @@ void BraveAddCommonStrings(content::WebUIDataSource* html_source, {"ipfsAutoRedirectDNSLinkDesc", IDS_SETTINGS_IPFS_AUTO_REDIRECT_DNSLINK_RESOURCES_DESC}, {"ipfsCompanionEnabledDesc", IDS_SETTINGS_IPFS_COMPANION_ENABLED_DESC}, - {"mediaRouterEnabledDesc", IDS_SETTINGS_MEDIA_ROUTER_ENABLED_DESC}, {"torEnabledLabel", IDS_SETTINGS_ENABLE_TOR_TITLE}, {"torEnabledDesc", IDS_SETTINGS_ENABLE_TOR_DESC}, {"autoOnionLocationLabel", IDS_SETTINGS_AUTO_ONION_LOCATION_TITLE}, diff --git a/common/pref_names.cc b/common/pref_names.cc index c585bc3cd490..fa71d08381ca 100644 --- a/common/pref_names.cc +++ b/common/pref_names.cc @@ -74,7 +74,6 @@ const char kBraveTodayWeeklyCardVisitsCount[] = "brave.today.p3a_weekly_card_visits_count"; const char kBraveTodayWeeklyDisplayAdViewedCount[] = "brave.today.p3a_weekly_display_ad_viewed_count"; -const char kBraveEnabledMediaRouter[] = "brave.enable_media_router"; const char kBinanceAccessToken[] = "brave.binance.access_token"; const char kBinanceRefreshToken[] = "brave.binance.refresh_token"; const char kAlwaysShowBookmarkBarOnNTP[] = diff --git a/common/pref_names.h b/common/pref_names.h index 9cc846ce1b27..827f838f5cdd 100644 --- a/common/pref_names.h +++ b/common/pref_names.h @@ -63,7 +63,6 @@ extern const char kBraveTodayWeeklySessionCount[]; extern const char kBraveTodayWeeklyCardViewsCount[]; extern const char kBraveTodayWeeklyCardVisitsCount[]; extern const char kBraveTodayWeeklyDisplayAdViewedCount[]; -extern const char kBraveEnabledMediaRouter[]; extern const char kAlwaysShowBookmarkBarOnNTP[]; extern const char kAutocompleteEnabled[]; extern const char kTopSiteSuggestionsEnabled[]; diff --git a/test/BUILD.gn b/test/BUILD.gn index 1fde01df0f6c..dbe7e7d904eb 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -625,7 +625,6 @@ if (!is_android) { "//brave/browser/ui/views/toolbar/brave_toolbar_view_browsertest.cc", "//brave/browser/ui/webui/brave_welcome_ui_browsertest.cc", "//brave/browser/ui/webui/new_tab_page/brave_new_tab_ui_browsertest.cc", - "//brave/chromium_src/chrome/browser/media/router/media_router_feature_browsertest.cc", "//brave/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base_browsertest.cc", "//brave/chromium_src/chrome/browser/ui/views/location_bar/location_bar_view_browsertest.cc", "//brave/chromium_src/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view_browsertest.cc", From dfe0eb7f5637de68e992329392acbb2bb253b13f Mon Sep 17 00:00:00 2001 From: mkarolin Date: Tue, 22 Jun 2021 16:08:08 -0400 Subject: [PATCH 062/205] Fixes crash on Windows due to unknown key. --- ui/webui/resources/css/text_defaults_md.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/webui/resources/css/text_defaults_md.css b/ui/webui/resources/css/text_defaults_md.css index cd495831dcf1..82a76f8576cc 100644 --- a/ui/webui/resources/css/text_defaults_md.css +++ b/ui/webui/resources/css/text_defaults_md.css @@ -16,7 +16,7 @@ html { /* TODO(dbeam): remove this soon. Prefer dir= in HTML. */ - direction: $i18n{textDirection}; + direction: $i18n{textdirection}; } body { From c2788a324455d5b45f35744b21b90923e76d1ef0 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 23 Jun 2021 12:17:43 +0200 Subject: [PATCH 063/205] Updated patches from Chromium 93.0.4542.2 to Chromium 93.0.4549.4. --- patches/base-BUILD.gn.patch | 4 +- ...base-threading-thread_restrictions.h.patch | 4 +- patches/build-config-BUILDCONFIG.gn.patch | 2 +- patches/build-config-android-config.gni.patch | 2 +- ...ld-config-android-internal_rules.gni.patch | 4 +- patches/build-config-android-rules.gni.patch | 2 +- patches/build-config-compiler-BUILD.gn.patch | 4 +- patches/chrome-BUILD.gn.patch | 18 ++++---- patches/chrome-android-BUILD.gn.patch | 12 ++--- ...rome-android-chrome_java_sources.gni.patch | 4 +- ...e-android-chrome_public_apk_tmpl.gni.patch | 4 +- ...ome-android-java-AndroidManifest.xml.patch | 6 +-- ...me-browser-ChromeTabbedActivity.java.patch | 6 +-- ...rome-browser-app-ChromeActivity.java.patch | 4 +- ...rowser-sync-AndroidSyncSettings.java.patch | 2 +- ...ync-settings-ManageSyncSettings.java.patch | 4 +- ...-browser-toolbar-ToolbarManager.java.patch | 2 +- patches/chrome-browser-BUILD.gn.patch | 6 +-- patches/chrome-browser-about_flags.cc.patch | 8 ++-- ...wser-chrome_content_browser_client.h.patch | 4 +- ...flags-android-chrome_feature_list.cc.patch | 6 +-- ...et-system_network_context_manager.cc.patch | 2 +- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 +-- ...profiles-profile_avatar_icon_util.cc.patch | 8 ++-- ...e-browser-profiles-profile_manager.h.patch | 4 +- ...ext_menu-render_view_context_menu.cc.patch | 2 +- ...-browser-resources-settings-BUILD.gn.patch | 6 +-- ...owser-resources-settings-settings.js.patch | 4 +- ...browser-sync-sync_service_factory.cc.patch | 4 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 +-- ...rome-browser-ui-appmenu-AppMenu.java.patch | 2 +- ...-browser-ui-android-toolbar-BUILD.gn.patch | 6 +-- patches/chrome-browser-ui-browser.cc.patch | 2 +- patches/chrome-browser-ui-browser.h.patch | 4 +- .../chrome-browser-ui-chrome_pages.cc.patch | 4 +- ...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 | 2 +- ...oolbar-recent_tabs_sub_menu_model.cc.patch | 2 +- ...toolbar-recent_tabs_sub_menu_model.h.patch | 2 +- ...-views-download-download_item_view.h.patch | 2 +- ...rowser-ui-views-frame-browser_view.h.patch | 4 +- ...ws-location_bar-location_bar_view.cc.patch | 2 +- ...ews-location_bar-location_bar_view.h.patch | 2 +- ...i-views-profiles-profile_menu_view.h.patch | 2 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...owser-ui-webui-history-history_ui.cc.patch | 2 +- ...-ui-webui-settings-people_handler.cc.patch | 6 +-- ...ttings_localized_strings_provider.cc.patch | 4 +- ...de_detector-upgrade_detector_impl.cc.patch | 4 +- ...me-installer-mac-signing-pipeline.py.patch | 2 +- patches/chrome-renderer-BUILD.gn.patch | 2 +- ...er-chrome_content_renderer_client.cc.patch | 4 +- patches/chrome-test-BUILD.gn.patch | 4 +- ...er-page_specific_content_settings.cc.patch | 6 +-- .../components-page_info-page_info.cc.patch | 4 +- ...-browser-client_side_model_loader.cc.patch | 2 +- ...g-core-common-safe_browsing_prefs.cc.patch | 4 +- ...n-internal-identity_manager-BUILD.gn.patch | 4 +- ...nents-sync-protocol-proto_visitors.h.patch | 2 +- ...-browser-browser_main_runner_impl.cc.patch | 2 +- ...r_host-navigation_controller_impl.cc.patch | 4 +- ...-renderer_host-navigation_request.cc.patch | 10 ++--- patches/content-common-BUILD.gn.patch | 2 +- patches/content-common-user_agent.cc.patch | 4 +- ...lic-browser-content_browser_client.h.patch | 2 +- ...ontent-renderer-render_frame_impl.cc.patch | 4 +- ...ons-browser-api-socket-tcp_socket.cc.patch | 4 +- ...o-public-tools-mojom-mojom_parser.py.patch | 4 +- patches/net-BUILD.gn.patch | 4 +- patches/net-base-host_port_pair.cc.patch | 8 ++-- patches/net-base-host_port_pair.h.patch | 6 +-- ...net-http-transport_security_state.cc.patch | 4 +- .../sandbox-policy-win-sandbox_win.cc.patch | 2 +- ...ices-network-public-cpp-cors-cors.cc.patch | 2 +- ...-common-client_hints-client_hints.cc.patch | 4 +- ...er-bindings-generated_in_modules.gni.patch | 2 +- ...renderer-bindings-idl_in_modules.gni.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 4 +- ...re-html-canvas-html_canvas_element.h.patch | 4 +- ...anvas2d-base_rendering_context_2d.cc.patch | 6 +-- ...vas2d-canvas_rendering_context_2d.cc.patch | 4 +- ...modules-mediastream-media_devices.cc.patch | 4 +- ...ebgl-webgl_rendering_context_base.cc.patch | 44 +++++++++---------- ...tools-gritsettings-resource_ids.spec.patch | 4 +- ...rams_xml-histogram_suffixes_list.xml.patch | 4 +- ...ity-platform-ax_platform_node_mac.mm.patch | 4 +- patches/ui-base-BUILD.gn.patch | 4 +- patches/ui-views-controls-focus_ring.cc.patch | 6 +-- 89 files changed, 203 insertions(+), 203 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 4a1f2b3d773d..2bb3367cb4f9 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 cdf351b0ab362d469257a730ce4e6a6f7ab228ef..096c1cc82fe4ef7c97940263d474c46104610200 100644 +index 6f28729d49b24c11ec6721d89ad36d5bb21cf0da..a261479777e22d2e4fa51af506483194e631bd78 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3915,6 +3915,7 @@ if (is_android) { +@@ -3931,6 +3931,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/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch index f6a699690c3c..cbf3603891be 100644 --- a/patches/base-threading-thread_restrictions.h.patch +++ b/patches/base-threading-thread_restrictions.h.patch @@ -1,8 +1,8 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index 06faca583318302bd4cdbaf4cde69d81c0750422..129690cfcd5122e795e0bd17c89299c97ed84101 100644 +index 0b188bb6e27e917415f53786f8b0462142d9936d..34cd90f81902e14aa0579d4e5c0e3d9388934270 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -459,6 +459,7 @@ INLINE_IF_DCHECK_IS_OFF void DisallowBaseSyncPrimitives() +@@ -461,6 +461,7 @@ INLINE_IF_DCHECK_IS_OFF void DisallowBaseSyncPrimitives() EMPTY_BODY_IF_DCHECK_IS_OFF; class BASE_EXPORT ScopedAllowBaseSyncPrimitives { diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index e372cd26837f..cf96c25fa7ba 100644 --- a/patches/build-config-BUILDCONFIG.gn.patch +++ b/patches/build-config-BUILDCONFIG.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn -index 46bc4769236eabee773be1e5690f0d406cb22229..af161e0099f4238cf93662b41771629909e0e199 100644 +index 725894d05274355be4ad5d6ac3388a489220a50c..33b519fd8ebdff03904f85f76b6f296b3626056b 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -314,6 +314,7 @@ is_posix = !is_win && !is_fuchsia diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index d18b012dc579..911eed0393e2 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index cbfbba928632a4538cc3b34c58e8ed6d49d0a49e..6f73712562d2bffe6d28f171358a74be90a9cf2c 100644 +index 4cf67d96ec9c7b01fa9fe216146517ba6ccf26c8..cef770aec11c8399e1f156533745a457899110d8 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -3,6 +3,7 @@ diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index 0381bb0c44a8..bbd227537d13 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 472a6f6011586456724bf7a9274e20eaf1563cca..913789593d6452c3731279986c784ed5980c4d1e 100644 +index 8e35d68e658ead8e8f67066e1e72f4e457423d4b..97c9f71eda76866dc79dfe6a63962c6ba28a4407 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -1949,6 +1949,7 @@ if (enable_java_templates) { +@@ -1955,6 +1955,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 07531e85a968..ed93c5acefc0 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 d61fa88ec2e5433d7120d05383485d29cc3c7862..cacb7878920f8c30c665d62a3795d11448b72a77 100644 +index 6755d3579c687369043d0987e1327690bff2315e..80d36b4c3b4dcd754d6b6a8fd883300af73c0f6d 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -476,6 +476,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 7be88b569b40..45d7972cef86 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 3abdf7d232cf9fd998d32cd52217b2148fe1daac..19b7dfde6d34011d2392526f144826646c54df20 100644 +index 7a54d6efa543fa93370dddbbba1abc8cd6491367..bfcc853f7e53bacf46b6f1d776bfc0432517837c 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1727,6 +1727,7 @@ config("chromium_code") { +@@ -1730,6 +1730,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index be5d9449acd1..c11738101366 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 3aeda626f18b23cb79e81710c08c353b5abe6651..f1d83c5283379b01118069270b57e0f0bd7968e5 100644 +index 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7628839bb 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -171,6 +171,7 @@ if (!is_android && !is_mac) { @@ -32,7 +32,7 @@ index 3aeda626f18b23cb79e81710c08c353b5abe6651..f1d83c5283379b01118069270b57e0f0 if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -540,7 +543,7 @@ if (is_win) { +@@ -538,7 +541,7 @@ if (is_win) { args = [ "-b", @@ -41,7 +41,7 @@ index 3aeda626f18b23cb79e81710c08c353b5abe6651..f1d83c5283379b01118069270b57e0f0 "-v", chrome_version_full, "-g", -@@ -614,6 +617,7 @@ if (is_win) { +@@ -612,6 +615,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -49,7 +49,7 @@ index 3aeda626f18b23cb79e81710c08c353b5abe6651..f1d83c5283379b01118069270b57e0f0 } } -@@ -646,9 +650,11 @@ if (is_win) { +@@ -644,9 +648,11 @@ if (is_win) { "--scm=0", ] } @@ -61,7 +61,7 @@ index 3aeda626f18b23cb79e81710c08c353b5abe6651..f1d83c5283379b01118069270b57e0f0 if (is_chrome_branded) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -675,6 +681,7 @@ if (is_win) { +@@ -673,6 +679,7 @@ if (is_win) { info_plist_target = ":chrome_helper_plist" } @@ -69,7 +69,7 @@ index 3aeda626f18b23cb79e81710c08c353b5abe6651..f1d83c5283379b01118069270b57e0f0 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -1148,6 +1155,7 @@ if (is_win) { +@@ -1146,6 +1153,7 @@ if (is_win) { if (is_chrome_branded) { bundle_deps += [ ":preinstalled_apps" ] } @@ -77,7 +77,7 @@ index 3aeda626f18b23cb79e81710c08c353b5abe6651..f1d83c5283379b01118069270b57e0f0 ldflags = [ "-compatibility_version", -@@ -1331,6 +1339,7 @@ if (is_win) { +@@ -1329,6 +1337,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -85,7 +85,7 @@ index 3aeda626f18b23cb79e81710c08c353b5abe6651..f1d83c5283379b01118069270b57e0f0 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/app:shutdown_signal_handlers", -@@ -1433,12 +1442,13 @@ group("child_dependencies") { +@@ -1431,12 +1440,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -100,7 +100,7 @@ index 3aeda626f18b23cb79e81710c08c353b5abe6651..f1d83c5283379b01118069270b57e0f0 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1492,6 +1502,7 @@ group("resources") { +@@ -1490,6 +1500,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 a0f86a5f4d36..b99a519bf6b0 100644 --- a/patches/chrome-android-BUILD.gn.patch +++ b/patches/chrome-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn -index 7781a2627e7c9975f2a5a1ffe3c01e8c8840f013..21260e0bb50b96ce342351cc6a123716ba4093ed 100644 +index d139faa21038405cb60df299c7e5a6295f2b7df3..5f5619fe90a785ed763715f45312be452fc801e4 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -245,6 +245,7 @@ android_resources("chrome_app_java_resources") { +@@ -247,6 +247,7 @@ android_resources("chrome_app_java_resources") { "//third_party/androidx:androidx_preference_preference_java", "//third_party/androidx:androidx_recyclerview_recyclerview_java", ] @@ -10,7 +10,7 @@ index 7781a2627e7c9975f2a5a1ffe3c01e8c8840f013..21260e0bb50b96ce342351cc6a123716 } if (enable_vr) { -@@ -579,6 +580,7 @@ android_library("chrome_java") { +@@ -580,6 +581,7 @@ android_library("chrome_java") { deps += feed_deps deps += web_feed_deps @@ -18,7 +18,7 @@ index 7781a2627e7c9975f2a5a1ffe3c01e8c8840f013..21260e0bb50b96ce342351cc6a123716 srcjar_deps = [ ":autofill_verification_status_generated_enum", -@@ -610,6 +612,7 @@ android_library("chrome_java") { +@@ -611,6 +613,7 @@ android_library("chrome_java") { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -26,7 +26,7 @@ index 7781a2627e7c9975f2a5a1ffe3c01e8c8840f013..21260e0bb50b96ce342351cc6a123716 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -730,6 +733,7 @@ java_group("chrome_all_java") { +@@ -731,6 +734,7 @@ java_group("chrome_all_java") { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -34,7 +34,7 @@ index 7781a2627e7c9975f2a5a1ffe3c01e8c8840f013..21260e0bb50b96ce342351cc6a123716 } # This is a list of all base module jni headers. New features should add their -@@ -770,6 +774,7 @@ group("jni_headers") { +@@ -772,6 +776,7 @@ group("jni_headers") { "//components/ukm/android:jni_headers", "//components/webauthn/android:jni_headers", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 8439fbec258a..589ab6e807c0 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 127a9213e08cd69bd01e068c5f87ac5062327c4f..9b4c92d0404ec3d9224d15933d46580d34a8bcbd 100644 +index e269b4406137d47c45fcbb0b523c579616999c04..f7787437072c2e5a189a9388bb0e061507c34f3b 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1402,3 +1402,4 @@ chrome_java_sources = [ +@@ -1293,3 +1293,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 b01077800edc..9e9fad01ee24 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index c485c30a712325ffb56f53da7a4633534d95d758..c2a5fb5dafeb55a535211f78ffb7680dce445604 100644 +index c5089ddf516cd0576a6710267aa288938ffd6686..182c2672ee321bcb08c55fec1732d94e67d22812 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni @@ -168,6 +168,7 @@ template("chrome_public_common_apk_or_module_tmpl") { @@ -10,7 +10,7 @@ index c485c30a712325ffb56f53da7a4633534d95d758..c2a5fb5dafeb55a535211f78ffb7680d if (!_is_monochrome) { product_config_java_packages = [ "org.chromium.chrome.browser" ] -@@ -235,6 +236,7 @@ template("chrome_public_common_apk_or_module_tmpl") { +@@ -248,6 +249,7 @@ template("chrome_public_common_apk_or_module_tmpl") { if (!defined(proguard_configs)) { proguard_configs = [] } diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index d71775711ed5..947d61f6e8e2 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 dab1346ff08290d2f2418e2d5df4f97ef3d88929..8aa5b19a23b23afd88029f0d1306565f7e06bc40 100644 +index 1ff1b646567c94451ed97fbbd5285ac2eade103c..8552ab03b193cb80b468264431d2576f53c4d48f 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -56,7 +56,9 @@ by a child template that "extends" this file. @@ -57,7 +57,7 @@ index dab1346ff08290d2f2418e2d5df4f97ef3d88929..8aa5b19a23b23afd88029f0d1306565f android:icon="@drawable/ic_launcher" android:roundIcon="@drawable/ic_launcher_round" android:label="{% block application_label %}@string/app_name{% endblock %}" -@@ -1161,6 +1174,7 @@ by a child template that "extends" this file. +@@ -1176,6 +1189,7 @@ by a child template that "extends" this file. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" > @@ -65,7 +65,7 @@ index dab1346ff08290d2f2418e2d5df4f97ef3d88929..8aa5b19a23b23afd88029f0d1306565f {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1239,6 +1253,7 @@ by a child template that "extends" this file. +@@ -1254,6 +1268,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index f25548d09a7d..7aaf155d0deb 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,10 +1,10 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 89da7c89725c6a280c341b56af2c39087f3b6f28..967d5423d3d42c3eb1c2991f3fe65e0040afd294 100644 +index 9f626de0f550b7acef758dced8fc54a26a6a1db2..90551a1515976040b1a1e05089c0677957d4d6af 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2284,6 +2284,7 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -381,7 +381,7 @@ public abstract class ChromeActivity private boolean mLastPictureInPictureModeForTesting; protected ChromeActivity() { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch index 7b091460bff7..3bb06d2f75fa 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-AndroidSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java -index 6dc5ea9b7e3b3d26537fe4b94c9258a5124381ae..4e1d8af87bcad1bca184f06016b6a5b4f9c8d86d 100644 +index 44a1e3a27a843837e31639c210dd84923c7b3b26..7c6d013e863628dc26a599e544c1819cbadee012 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/AndroidSyncSettings.java @@ -73,7 +73,7 @@ public class AndroidSyncSettings { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch index f9a0e7323d89..9b70f6378520 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -index c2ce9a70d95d002a116a488a0a2a22584b881745..27eb84ce696bef6939dc58c704df10e6521c8a8f 100644 +index 849a0b9df353f4ea79949b229d6e4670fdb72f24..7101e09371cdb4a181a56acd17d2275805374a5a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java @@ -25,7 +25,7 @@ import androidx.appcompat.app.AppCompatActivity; @@ -11,7 +11,7 @@ index c2ce9a70d95d002a116a488a0a2a22584b881745..27eb84ce696bef6939dc58c704df10e6 import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; -@@ -364,7 +364,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat +@@ -359,7 +359,7 @@ public class ManageSyncSettings extends PreferenceFragmentCompat IdentityServicesProvider.get() .getIdentityManager(Profile.getLastUsedRegularProfile()) .getPrimaryAccountInfo(ConsentLevel.SYNC)); 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 e3abf049deba..af632dc16ae2 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,5 +1,5 @@ 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 79aa3045baac3fd510603c56dc7b7004ce8e4879..47fa489bcdbe90baa7fe3bd4a65203aec8b26ecc 100644 +index 23eb3c3548fbadd38ea4e36bffe878cd99220766..0c2ac92bc74cb98c781670cea4a3331425975030 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 @@ -488,13 +488,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index e4a11e501d9f..a9f7bc5ef87b 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn -index 62430f9f3ce6767280d888b43e62d629092788e3..a5ab63a5177ee370f44de4af72ed6c9cdadc8a9a 100644 +index ace7270498413620140dfe89246bead14bc08b0c..3edc7e4c06e88a1272d8f8424126700837b88039 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2459,6 +2459,7 @@ static_library("browser") { +@@ -2460,6 +2460,7 @@ static_library("browser") { "performance_monitor/metric_evaluator_helper_posix.h", ] } + import("//brave/browser/sources.gni") sources += brave_chrome_browser_sources deps += brave_chrome_browser_deps public_deps += brave_chrome_browser_public_deps defines += brave_chrome_browser_defines - + if (is_android) { sources += [ diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 6730f284560f..8a249529836b 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 c9ff48cda4087e8471679fc771a52f9f40366a07..9a738f179b2b9244e0852a4aee7460120312cf88 100644 +index f1a4e18ad7588aea782297f0bbecd6092258488c..408439ad3f46a769c848f9179a446d1892843fd4 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -310,14 +310,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -311,14 +311,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -19,9 +19,9 @@ index c9ff48cda4087e8471679fc771a52f9f40366a07..9a738f179b2b9244e0852a4aee746012 - "https://performance-insights.appspot.com/upload?tags=flags,TestingTeam"}}; + "https://no-thanks.invalid"}}; - const FeatureEntry::Choice kPassiveListenersChoices[] = { + const FeatureEntry::Choice kLiteVideoDefaultDownlinkBandwidthKbps[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -7202,6 +7202,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7296,6 +7296,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 ea3f98466b22..19a36cc1df8c 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 54a66b71f8e60bb59f217274816f398b9d49ed84..be40e2d055dd94138db39567a2f27e37de2f75b7 100644 +index 32e2dd57a441cb1e84da499e7b236ed6ee545ffe..5a95713e5e0d411de19be9cd521eb2794719bfcb 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -751,6 +751,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -754,6 +754,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch index b0e0ea827995..262b57df979d 100644 --- a/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch +++ b/patches/chrome-browser-flags-android-chrome_feature_list.cc.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browser/flags/android/chrome_feature_list.cc -index c4f1cc0c6e6b2865b36ad9e89dae82a0bdb69201..500a69af529e7474413d1d9903cfb38438e6ed87 100644 +index 27aaf592961c9f583cbccc3ab88e029111cb445c..840593e04e675c2d76f3f37f88425950263147f0 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -317,6 +317,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -321,6 +321,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { }; - + const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { + BRAVE_FIND_FEATURE_EXPOSED_TO_JAVA for (const auto* feature : kFeaturesExposedToJava) { 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 f377eca89980..e27a5cf87cde 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index 7910033624475cb719e326f92c9f225e175fc7cd..1f20c5301d3898f74a6c400e1ac452c99be15e20 100644 +index b4f333323d8c2eec17b845526cb1e1b051c79194..f6d278a063324cbac99d8e05c3f9fcbf9c20d9a5 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc @@ -224,7 +224,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 84cd2c3a231e..77f6d7c3ee27 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 7c2f450bce18c8c03fa7612475248c0ff888bdb9..c36763629d6b4015fb8782da97dba276d48b62c4 100644 +index 4ecdb061de976a279580c87e05faceff64a0b6d0..90d2e370f623b2668c07005b206121d7e55e5da3 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -949,6 +949,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -950,6 +950,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 7c2f450bce18c8c03fa7612475248c0ff888bdb9..c36763629d6b4015fb8782da97dba276 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1238,6 +1239,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1241,6 +1242,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); 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 562bfff4d9ff..d031befcde28 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 91c228daacbab333cbc4623a80d1950353e45a60..c09372511af314990eb7156b1eddae9d46be8b63 100644 +index 6e67b95040478f3534f21869890e217ac7406307..05edaab39f8391c3bcdd880148f2cefc869d498e 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc -@@ -345,7 +345,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; +@@ -346,7 +346,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; #elif BUILDFLAG(IS_CHROMEOS_ASH) constexpr size_t kDefaultAvatarIconsCount = 27; #else @@ -11,7 +11,7 @@ index 91c228daacbab333cbc4623a80d1950353e45a60..c09372511af314990eb7156b1eddae9d #endif #if !defined(OS_ANDROID) -@@ -458,6 +458,7 @@ size_t GetPlaceholderAvatarIndex() { +@@ -459,6 +459,7 @@ size_t GetPlaceholderAvatarIndex() { size_t GetModernAvatarIconStartIndex() { #if !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(OS_ANDROID) @@ -19,7 +19,7 @@ index 91c228daacbab333cbc4623a80d1950353e45a60..c09372511af314990eb7156b1eddae9d return GetPlaceholderAvatarIndex() + 1; #else // Only use the placeholder avatar on ChromeOS and Android. -@@ -491,6 +492,7 @@ std::string GetPlaceholderAvatarIconUrl() { +@@ -492,6 +493,7 @@ std::string GetPlaceholderAvatarIconUrl() { const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) { CHECK_LT(index, kDefaultAvatarIconsCount); diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch index e042c6821f2f..4f2d8c0f2a09 100644 --- a/patches/chrome-browser-profiles-profile_manager.h.patch +++ b/patches/chrome-browser-profiles-profile_manager.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h -index 1384f548a282780f9b7b08aa11ec902c3f680aca..bc9bf6056afd0935a1a885d1987476bfb417ddb8 100644 +index 915ae812639cbff69629831e516c51f8b1b997cb..4935cc578579f0a3b32dab34d56267706b2d5eef 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h -@@ -281,6 +281,7 @@ class ProfileManager : public Profile::Delegate { +@@ -283,6 +283,7 @@ class ProfileManager : public Profile::Delegate { void set_do_final_services_init(bool do_final_services_init) { do_final_services_init_ = do_final_services_init; } 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 35b4bca79094..205531ede958 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,5 +1,5 @@ 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 b590b86c8d776edb3f4ba910640005181ea92817..63c0fa7be974d359eb31ed26958fd27b727c4af0 100644 +index 3e6c5354f47b0df51e9065b55570cc0ef202a4ef..43a99f5dca28c45b96a5dc501dc4860c5f358b2d 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -1694,6 +1694,7 @@ void RenderViewContextMenu::AppendSearchProvider() { diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 5517b506b8f7..44127a23047b 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index 9ec6334caf60cab4b1a44eedbdc094cfc13ce673..1df12cd32b7730af936cf4975fb8abcef4ab6e45 100644 +index 4d90367352cb58494f458b32abf78d4ce0a5b174..51e96ba9dec7c1df940b43c94f1eb1f846f3a451 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -44,6 +44,7 @@ if (optimize_webui) { +@@ -51,6 +51,7 @@ if (optimize_webui) { "chrome://resources/mojo/mojo/public/js/bindings.js", "chrome://resources/mojo/skia/public/mojom/skcolor.mojom-webui.js", ] @@ -10,7 +10,7 @@ index 9ec6334caf60cab4b1a44eedbdc094cfc13ce673..1df12cd32b7730af936cf4975fb8abce } } -@@ -93,6 +94,7 @@ generate_grd("build_grd") { +@@ -100,6 +101,7 @@ generate_grd("build_grd") { "$target_gen_dir/$preprocess_gen_manifest", ] } diff --git a/patches/chrome-browser-resources-settings-settings.js.patch b/patches/chrome-browser-resources-settings-settings.js.patch index eddb8589d346..6a03998a502e 100644 --- a/patches/chrome-browser-resources-settings-settings.js.patch +++ b/patches/chrome-browser-resources-settings-settings.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.js b/chrome/browser/resources/settings/settings.js -index 58ae84de125800cf9c81d6aec2d7e77e4ef8a015..16f10da122c4d8944b604b3e24394fc08e301a42 100644 +index 53e96ad24f7e4aaf650b7dc5ff2ea86f5790ab8d..bbf2d3aa4f61ff577635270dd3838206fc854cb6 100644 --- a/chrome/browser/resources/settings/settings.js +++ b/chrome/browser/resources/settings/settings.js @@ -2,6 +2,7 @@ @@ -9,4 +9,4 @@ index 58ae84de125800cf9c81d6aec2d7e77e4ef8a015..16f10da122c4d8944b604b3e24394fc0 +import './brave_overrides/index.js'; import './settings_ui/settings_ui.js'; - export {CrLinkRowElement} from 'chrome://resources/cr_elements/cr_link_row/cr_link_row.js'; + export {CrDrawerElement} from 'chrome://resources/cr_elements/cr_drawer/cr_drawer.js'; diff --git a/patches/chrome-browser-sync-sync_service_factory.cc.patch b/patches/chrome-browser-sync-sync_service_factory.cc.patch index 53a469873d06..b7be00deee30 100644 --- a/patches/chrome-browser-sync-sync_service_factory.cc.patch +++ b/patches/chrome-browser-sync-sync_service_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc -index 546b699ccd9418b1c8cfa0e020c50d03a5469376..501c55adda32595b6d81e3b726f9a955ad5c9d55 100644 +index aa731d5fa2b02c9214cc6a37123320ebff9c444a..8b6855efa8719ac43bbbd288203d54c2552dfe44 100644 --- a/chrome/browser/sync/sync_service_factory.cc +++ b/chrome/browser/sync/sync_service_factory.cc -@@ -277,7 +277,7 @@ KeyedService* SyncServiceFactory::BuildServiceInstanceFor( +@@ -273,7 +273,7 @@ KeyedService* SyncServiceFactory::BuildServiceInstanceFor( } auto sync_service = diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 899706f2ae54..34897c348f79 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 22b262f802319f70b4f9b2b204bf7a74c37743f7..46ae79bb9e97af45f502103ad458ba4113512408 100644 +index 51f072eeae4504d8baf7ff3be8cdc053f8b659fb..cb5fe375e734d81f988a41f4ebfd0366306096a2 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -603,6 +603,7 @@ static_library("ui") { +@@ -611,6 +611,7 @@ static_library("ui") { "//ui/webui/resources/cr_components/most_visited:mojom", "//v8:v8_version", ] @@ -10,7 +10,7 @@ index 22b262f802319f70b4f9b2b204bf7a74c37743f7..46ae79bb9e97af45f502103ad458ba41 # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -3422,10 +3423,13 @@ static_library("ui") { +@@ -3447,10 +3448,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 99f5201f9062..b41ff3597aaf 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,5 +1,5 @@ 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 376435fd2937d24dbfa17cf6cd4cdaa4924f1791..eea23beefad3f5d2086013c670ca9b6147b78c7a 100644 +index 3c17fd69454b180afde488e8d99e509064a0d07b..ac44b488f28b3b2d94bc3de072750ee229932ec6 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 @@ -220,6 +220,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index 5e602d19657f..0330d67e6f12 100644 --- a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn -index c1693edf429d1428f750ba1dd5a5ebd33943d7d0..117525b001ff51caf730519bfa169be3f513c659 100644 +index f09e189f6e72f07703c8538aeed22c358a4a3c18..a2c3a61e71defc004e9935c739377e2573531013 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -66,6 +66,7 @@ android_library("java") { +@@ -64,6 +64,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java", "java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java", ] + sources += brave_browser_ui_android_toolbar_sources - + deps = [ ":java_resources", diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 78c874408659..328f1228d87c 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index a850e0d28bc9a9f54ba17b04a6cc08d1de7c53c0..ebd536cfc9bdae5bc5dd1ab11db7758b86c12613 100644 +index 049d34f2785db516c28bfb4372224aa8e4b6f1a0..364a62d562fbc693f309555120b707e96d37b023 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -441,6 +441,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { diff --git a/patches/chrome-browser-ui-browser.h.patch b/patches/chrome-browser-ui-browser.h.patch index f56f0467daa2..19835ae8c447 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 682e706b4d73f862241d441de4314b65cb78253d..ea6610c9a8db8f379d26d80d4890639c90372abb 100644 +index ab9c5fb85f83b2ffb04bf21be631d38cfacd8835..f1d511caaa70b0b0ce6fc62f804c3f8f889e3da1 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h -@@ -703,6 +703,7 @@ class Browser : public TabStripModelObserver, +@@ -709,6 +709,7 @@ class Browser : public TabStripModelObserver, StatusBubble* GetStatusBubbleForTesting(); diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index 15023d69716a..cacd5058be96 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 e86fe09c9b3d4ad876fa84ba8c5423385d3607a2..411d37575f577896b06f7d689980e80daff62cdf 100644 +index 021245a4916a823b070bf60fce3be3cdfebe393f..207fbd5a9d244a4cb4195214697f4c649544ab93 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -299,7 +299,7 @@ void ShowSlow(Browser* browser) { +@@ -303,7 +303,7 @@ void ShowSlow(Browser* browser) { #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 43e50154d4d7..ec98a588cecb 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 91dc7d09f1849b8677ea385b9edccbc92d832b8f..5eedfa53194443469a38be75d7ca5cf5128c3e80 100644 +index 5c5076b0e3d1cbdf944bbeef7c4b650c1416ae14..61a1f383c453f4b7c13332ea58524df63afdd164 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -376,6 +376,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -371,6 +371,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( #if !BUILDFLAG(IS_CHROMEOS_ASH) welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index be6ab8eee3d3..d98cfeb3524c 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 1addd2c03c828334dfbc0e394f0657ca884548a1..940326e01b128db164d6068ecef8cc28e10cea95 100644 +index 5f644903bb775b3d0d9c0ee2b9b77a8ebcc3f0d4..e01b217c4fdb1909a1f6eecc8b87553063369133 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -498,4 +498,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -491,4 +491,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 5b39cdfc1c6b..d9b911e38b15 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h -index d34e48c787831d45c6ac461261345cd19a1a19bd..c4350aabdc540ec6cb8bb89ff6e70deb845be26c 100644 +index b9fade99e7fe0c8d23fd20672ffae88c5e5fe3fc..100ecfbc28bfa4c84667e4a0da461ab169d7299d 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h @@ -600,6 +600,7 @@ class TabStripModel : public TabGroupController { diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch index 093c58b30594..32197faf408c 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc -index 4181f927ce4542a0ebfa58f10dcaf05de0492a82..48e3719fff4e6821a651c16a17792362bb37b71c 100644 +index c564cacec15a23955b9353b4e62d0111fb52d0e5..479b1287ca79f4b25071a3a764cfe55c9aa7a5c0 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc @@ -469,6 +469,8 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch index 2b572bd11856..7be5deedbebb 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h -index e2d52f4385d8f71bfa4bf928c88542532f5ca445..96f0a49f90dba716d8b5bf112c1f8c53d2871d33 100644 +index 24ae4d886d3dfcb3406a8333abefaf4508696ca6..c28b7a1f540ab6a8b8a7c6c1ec69f7312a0bd467 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h @@ -81,6 +81,7 @@ class RecentTabsSubMenuModel : public ui::SimpleMenuModel, diff --git a/patches/chrome-browser-ui-views-download-download_item_view.h.patch b/patches/chrome-browser-ui-views-download-download_item_view.h.patch index c321c8d39e50..066053a0b4c6 100644 --- a/patches/chrome-browser-ui-views-download-download_item_view.h.patch +++ b/patches/chrome-browser-ui-views-download-download_item_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h -index 3eda50fb7312cd3dd7c0b3ececc18b5bfe41baa0..adc0e3cdbf7a3f213a57644dcb56b1c10feb69a9 100644 +index 406c8b0c1511ec17534ab07ff294f54f8bf1a15b..5a91839bdae28774c78778e64a50cc67e06b552a 100644 --- a/chrome/browser/ui/views/download/download_item_view.h +++ b/chrome/browser/ui/views/download/download_item_view.h @@ -115,6 +115,7 @@ class DownloadItemView : public views::View, diff --git a/patches/chrome-browser-ui-views-frame-browser_view.h.patch b/patches/chrome-browser-ui-views-frame-browser_view.h.patch index 6361603c7eb3..a88a2fef9383 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view.h.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h -index 25b8b8290f9b19596de7a03f77a74ad16de1a52a..d343e4f9d9a1dda6387bea599fb9f2a66b5e4033 100644 +index 0611981d8eafd03e16011775a172fc6a4192485d..9c0466747a56826f9e33baba5d39d5bb4d0a460b 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h -@@ -650,6 +650,7 @@ class BrowserView : public BrowserWindow, +@@ -656,6 +656,7 @@ class BrowserView : public BrowserWindow, return accessibility_focus_highlight_.get(); } diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index 60d3f2300c42..daa29c6a6fce 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index 43fca087e6f6e455f26e001279641eed93808599..40b02ba5118804c882cc99fa4edb4d374840fb44 100644 +index c02d31683198226f9d110ad549299c62a32837e8..fe77175e0f6bb4aa6051e56411697244165f8ea0 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -650,6 +650,7 @@ void LocationBarView::Layout() { diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch index f1bd143b9b22..897f8524ef1f 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h -index 884f10b13baf146a8d990e4b9bde1674e9dc25a0..fe3079303ff0f14bdfabc591dbad7e53a7bf831c 100644 +index c2cd95767d4eecb9d7dfe439100b716139018e9e..1cd0b3af28ac8fe0e53828376624f92cde978eb7 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -109,6 +109,7 @@ class LocationBarView : public LocationBar, diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch index 1f0484c1c92e..4a7f6ba8471a 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.h b/chrome/browser/ui/views/profiles/profile_menu_view.h -index beb7d3d06a47ffb9facdbfe1f6f4d6d544f00739..2455e45596b329f5ed3899a7a373e4fbf3fe6c65 100644 +index 0420cbae191ec3a8f0a983834ba212a7024a31dd..d7c1ebc18bc8f9be09beec9871f41793b53dc362 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view.h @@ -46,6 +46,7 @@ class ProfileMenuView : public ProfileMenuViewBase { 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 69a4ed404ab5..f756a357b229 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,8 +1,8 @@ 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 07fd8d25427876d9f56d106b2eb7ff3b373da11e..9422cab367477feb756fd7f589ec04088e2bab2a 100644 +index 834c70bf6d188591ee1fc92ef87b0eda6b498279..f9023adc5cff24977dd6e7865dfb7e16b55dcd51 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1181,6 +1181,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1191,6 +1191,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { 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 0f079e45796b..b5531f4c4773 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 bc0219651739efe5aba136935501845ded8b2680..68e56aafda5754501e3b48f6c510132e0e9f8de9 100644 +index c8c62c8809ca4fd41b801ea72f806a677b5613dc..30c9eb1b6b89a25ca8ef4f17526a6b3b5de4a57e 100644 --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc @@ -55,6 +55,7 @@ content::WebUIDataSource* CreateHistoryUIHTMLSource(Profile* profile) { 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 dbbaa08c21c4..61e6d3e0e108 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 c18f918ae8338026f0550afa3f74770f61495619..15eabe253e26f8a245d5bd18962949751610da0a 100644 +index 6949b11e9825b4e12306d69d3535d13418fa8cfe..4cc809a2c128744388e0d78fbed727280efe44bd 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc @@ -821,6 +821,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { @@ -16,8 +16,8 @@ index c18f918ae8338026f0550afa3f74770f61495619..15eabe253e26f8a245d5bd1896294975 identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)); + BRAVE_GET_SYNC_STATUS_DICTIONARY - const sync_ui_util::StatusLabels status_labels = - sync_ui_util::GetStatusLabels(profile_); + const SyncStatusLabels status_labels = GetSyncStatusLabels(profile_); + // TODO(crbug.com/1027467): Consider unifying some of the fields below to @@ -1023,6 +1025,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { } 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 dcf937765671..fb5712fdd59b 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 674c3559b910e2a6c1a8c1c96256e418b425536e..5f27a8aa98611f94fe6177e744766b7d43f4f8cc 100644 +index f81af2211672a162fefd6c7b703f6335c807bf49..f30f10e6b710152f9ebbf5418ef006b68c95521e 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2705,6 +2705,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2729,6 +2729,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch index 1e88eb6a9f18..819e4c258bc7 100644 --- a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch +++ b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -index aacd6bdc7aec948b4ec6a5378163d818fcca6452..ffff132be16136f71993c5124a3f7d52c7d25590 100644 +index 4c318c5286ade659c80e5a5946ddec36444c68f4..895b9c8c719a36276985944aa75172dccd634b42 100644 --- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -@@ -475,7 +475,7 @@ void UpgradeDetectorImpl::Init() { +@@ -479,7 +479,7 @@ void UpgradeDetectorImpl::Init() { // On Windows, only enable upgrade notifications for Google Chrome builds. // Chromium does not use an auto-updater. #if !defined(OS_WIN) || BUILDFLAG(GOOGLE_CHROME_BRANDING) || \ diff --git a/patches/chrome-installer-mac-signing-pipeline.py.patch b/patches/chrome-installer-mac-signing-pipeline.py.patch index 6e6a8fd2cbe0..545963b639c5 100644 --- a/patches/chrome-installer-mac-signing-pipeline.py.patch +++ b/patches/chrome-installer-mac-signing-pipeline.py.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mac/signing/pipeline.py b/chrome/installer/mac/signing/pipeline.py -index b1adeb9793ca0159db08da49c42f83328eb3f621..4134188ee74a64a4de60345f030dacde2d515f1b 100644 +index 112945e765873714ca4d2ddc7bc3ef65b39e056d..47860107b9c20593d63f66d81ceb889db44fdd66 100644 --- a/chrome/installer/mac/signing/pipeline.py +++ b/chrome/installer/mac/signing/pipeline.py @@ -664,5 +664,8 @@ def sign_all(orig_paths, diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index f9777eac34b5..45f4234494b1 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index 5f60593886e374b39679c6bd244eb0f75cd26552..2514829b3e19a523f198a478102e85a5163a8d32 100644 +index 1cc080a2ba6981dce94b0c063708d9e311e88fdc..e0107b244e8acf464a5b4189845655e913e23bf6 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -234,6 +234,7 @@ static_library("renderer") { diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index d5c90283c9f1..04360821156e 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 feb4521500860956705f0db11ac0e740c488b901..7c0b5266437ee6522990782260eeac92da61f528 100644 +index 89f15b443f97a98c6472aef2f2c8062ab70b3a9f..387b57d235c27aea3a275f1129fc2546c7554405 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -517,7 +517,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -523,7 +523,7 @@ void ChromeContentRendererClient::RenderFrameCreated( ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 5fec4e9f8615..4d53491cea0f 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 c8712d952d90bd6366c59047988a50578627922e..1f1a200cd9f6324b78b4af89462c6189ca3b5d25 100644 +index f65d94d4bf7cf9d8d91fe7520599fcae95af5bd6..09f7568a20fe077dcda39770eb89ee3808905ed7 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1230,6 +1230,7 @@ if (!is_android) { +@@ -1239,6 +1239,7 @@ if (!is_android) { "//v8", ] 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 55f763684465..2c08d62591f7 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,8 +1,8 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index 25e4f27a67d4e58b83304f80a5ac2c224a7a9894..d534dd41bbdfe8444382d0bb82e541614e8b81ad 100644 +index bfd0c6a9f82c2fbdbebbc656c2a310b7751b2c39..5cdc5cabbf53bb7fe5f170f582455defbb8e20e9 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc -@@ -425,6 +425,7 @@ bool PageSpecificContentSettings::IsContentBlocked( +@@ -453,6 +453,7 @@ bool PageSpecificContentSettings::IsContentBlocked( content_type == ContentSettingsType::ADS || content_type == ContentSettingsType::SOUND || content_type == ContentSettingsType::CLIPBOARD_READ_WRITE || @@ -10,7 +10,7 @@ index 25e4f27a67d4e58b83304f80a5ac2c224a7a9894..d534dd41bbdfe8444382d0bb82e54161 content_type == ContentSettingsType::SENSORS || content_type == ContentSettingsType::GEOLOCATION) { const auto& it = content_settings_status_.find(content_type); -@@ -448,6 +449,7 @@ bool PageSpecificContentSettings::IsContentAllowed( +@@ -476,6 +477,7 @@ bool PageSpecificContentSettings::IsContentAllowed( content_type != ContentSettingsType::PPAPI_BROKER && content_type != ContentSettingsType::MIDI_SYSEX && content_type != ContentSettingsType::CLIPBOARD_READ_WRITE && diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index f53d039ae0f1..e48403cfb930 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 9eaadafce8208de8e3b98c3b95fafeeb3ad048e6..ff3827db9c0ff86042a69728bed66f6c1f7e2165 100644 +index 875820b849b0cfc6da64213fb7a72cf311bfb7a6..7d090973551584c89563b2385e8bc8efdd86f36c 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -978,6 +978,7 @@ void PageInfo::PresentSitePermissions() { +@@ -979,6 +979,7 @@ void PageInfo::PresentSitePermissions() { } } diff --git a/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch b/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch index 7f0cd69d2715..37645f42e1ff 100644 --- a/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch +++ b/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/safe_browsing/content/browser/client_side_model_loader.cc b/components/safe_browsing/content/browser/client_side_model_loader.cc -index 1f489b663fce4309f09d96baf7073e279e4c6715..3ed24e95822838d5832d288fe0dcc0be3168ee30 100644 +index 4af8f484bb2dc04970c51f76ae015c10380f4802..0738b1d3a4c1bc5d35fe730d4a3d3f096bf5f77e 100644 --- a/components/safe_browsing/content/browser/client_side_model_loader.cc +++ b/components/safe_browsing/content/browser/client_side_model_loader.cc @@ -61,7 +61,7 @@ std::string ReadFileIntoString(base::FilePath path) { diff --git a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch index 73a081ff2370..fe2f69cad500 100644 --- a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch +++ b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc -index 25d3c524502be64803d0e5d3f04638c4a7109080..88882424f4c77b51dd3365675795b68b69856b3e 100644 +index c27b9bb975b953d08fe06319069020c04684f4cc..9afd2e0147edeb93f0296a23f4e06995a14d7d93 100644 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc -@@ -137,6 +137,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) { +@@ -136,6 +136,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) { } bool IsEnhancedProtectionEnabled(const PrefService& prefs) { diff --git a/patches/components-signin-internal-identity_manager-BUILD.gn.patch b/patches/components-signin-internal-identity_manager-BUILD.gn.patch index d33151bcc380..95d6bcd709d1 100644 --- a/patches/components-signin-internal-identity_manager-BUILD.gn.patch +++ b/patches/components-signin-internal-identity_manager-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/signin/internal/identity_manager/BUILD.gn b/components/signin/internal/identity_manager/BUILD.gn -index 171d8a0719b1f645cf9a4b640b5925139a04b742..3d0d95c1867c8a7531084738601a36a83145c1fd 100644 +index adb92f1704b5fb9be9bbf9d0410d95e7df2dad36..a1de9c76a7cba893b48975c23513a608296a0a74 100644 --- a/components/signin/internal/identity_manager/BUILD.gn +++ b/components/signin/internal/identity_manager/BUILD.gn -@@ -135,6 +135,7 @@ source_set("identity_manager") { +@@ -139,6 +139,7 @@ source_set("identity_manager") { "device_accounts_synchronizer_impl.h", ] } diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index 2c07f3f3caac..2a4c721bd472 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index a95925b3ac8125876e06f9b6d315e1f77acf266d..0a5bf7205956fb8289fec7072a8eb61a0a483aeb 100644 +index e6235ee6991d1f8b66524654301b1c7e6e2a4f54..4f7e55552a3574cf6fbb1b16230a077217809014 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h @@ -389,6 +389,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { diff --git a/patches/content-browser-browser_main_runner_impl.cc.patch b/patches/content-browser-browser_main_runner_impl.cc.patch index 9b0fab156a4f..ddfcca8f75b4 100644 --- a/patches/content-browser-browser_main_runner_impl.cc.patch +++ b/patches/content-browser-browser_main_runner_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/browser_main_runner_impl.cc b/content/browser/browser_main_runner_impl.cc -index fde9208b8c03d32cd03b3116dde10d36d3ba2f89..3e0347dc9d01628cd34e597ffb0c85b21027d9ee 100644 +index 4edb50243ad1cda95e15fd13be0f47ea182a364f..a5e224ff74420d1b71415ea1248237f38cf0ca91 100644 --- a/content/browser/browser_main_runner_impl.cc +++ b/content/browser/browser_main_runner_impl.cc @@ -18,6 +18,7 @@ diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index b76468f1b480..314632fec80b 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 2e80beaed696a62a0405036bea16db1a2ff104b0..523fa76aa6ca2aa12198d1858c52c78f81acd2e9 100644 +index fb118bd70df304374f6b6baedfaca2b2c243ecfa..fe810e413ba596ae6d5cdd5abec47344150e491b 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3153,16 +3153,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3136,16 +3136,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index b83a4ebf0f99..6aac8bd54fb3 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,19 +1,19 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index 81d5b4fcca62c20b7f0085cfbc15a25b3aa7c759..8c7620f8125416c5cf75fe8dddbd84ae89eec533 100644 +index 827dfe863389d029aa273d5e9ae2ed8b7de9876b..d52afc86aeab8f8d70c1e0eb76ee447d8448da40 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2158,6 +2158,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2189,6 +2189,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); + BRAVE_ONREQUESTREDIRECTED_MAYBEHIDEREFERRER common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); - -@@ -3327,6 +3328,7 @@ void NavigationRequest::OnStartChecksComplete( + +@@ -3359,6 +3360,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); - + + BRAVE_ONSTARTCHECKSCOMPLETE_MAYBEHIDEREFERRER // TODO(clamy): Avoid cloning the navigation params and create the // ResourceRequest directly here. diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index 08540b4c5392..f76d77f655d7 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 e70a3ce7e6cef0c456641178051352043002b8d3..02d51a7698cda2a1ab2d5dddbc3b7a66f3f6d17d 100644 +index 4fea169ce6d9cfa12bb695e8fe5f0c5c4e0f7952..5aa7932249ba7423d642c54b15f71f0e1e3ee88c 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -42,6 +42,7 @@ source_set("common") { diff --git a/patches/content-common-user_agent.cc.patch b/patches/content-common-user_agent.cc.patch index ccd3f389c3eb..a3526e6cd16f 100644 --- a/patches/content-common-user_agent.cc.patch +++ b/patches/content-common-user_agent.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc -index 72ff8e17cf1ade6c6c3bf68b924c4bb627ebd977..08bea775e9591641e16822cf8291d8749f1c26c5 100644 +index b3e400cf99b07d0b18574a4fbae94a8176d30445..8741b34005183bac3c34dd4adf2d2ef7f907bd9c 100644 --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc -@@ -297,6 +297,7 @@ std::string GetAndroidOSInfo( +@@ -310,6 +310,7 @@ std::string GetAndroidOSInfo( // Send information about the device. bool semicolon_inserted = false; diff --git a/patches/content-public-browser-content_browser_client.h.patch b/patches/content-public-browser-content_browser_client.h.patch index 4a3fe8e41a3d..80e3e8985abf 100644 --- a/patches/content-public-browser-content_browser_client.h.patch +++ b/patches/content-public-browser-content_browser_client.h.patch @@ -1,5 +1,5 @@ diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h -index 89f07fd6a1062fcf5cfd175b93e52f5d7165ceca..f5424e168614fdd66646b06c1c67f7c68883585e 100644 +index 57947a93614a66892ddcc1e7a03d1a9afa87d5f1..c07ac32d4c53861b924008fae9bfe35f52122f8f 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h @@ -1860,6 +1860,7 @@ class CONTENT_EXPORT ContentBrowserClient { diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index a62a86601d52..5d1ad2270651 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 8eff548967d161be9238402cdb7d574aa078d984..a745ca529b20fe8c44054cec40d0a13cfacfb535 100644 +index 43276a29e2015d6200d64c730d77bbb4a6c37cf6..d71e3a759500d9d71665d848a88664bd3be11b8b 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4327,6 +4327,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4367,6 +4367,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/extensions-browser-api-socket-tcp_socket.cc.patch b/patches/extensions-browser-api-socket-tcp_socket.cc.patch index 920b6661e9e8..6e5a7fcdcb92 100644 --- a/patches/extensions-browser-api-socket-tcp_socket.cc.patch +++ b/patches/extensions-browser-api-socket-tcp_socket.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/socket/tcp_socket.cc b/extensions/browser/api/socket/tcp_socket.cc -index 217be3e3f5d586cef85220b927d34243de40399c..8d26a4ddc7f9f29563d635f6d24d1b7cfcf4d5a2 100644 +index 92943d1c38d5b2136b71fd87a1a7a2eed7990f80..022bca2c79b06da9a4216063b2f2781677790b35 100644 --- a/extensions/browser/api/socket/tcp_socket.cc +++ b/extensions/browser/api/socket/tcp_socket.cc -@@ -152,8 +152,16 @@ void TCPSocket::Disconnect(bool socket_destroying) { +@@ -153,8 +153,16 @@ void TCPSocket::Disconnect(bool socket_destroying) { client_socket_.reset(); server_socket_.reset(); listen_callback_.Reset(); diff --git a/patches/mojo-public-tools-mojom-mojom_parser.py.patch b/patches/mojo-public-tools-mojom-mojom_parser.py.patch index e7c188208258..3e05d5179dd8 100644 --- a/patches/mojo-public-tools-mojom-mojom_parser.py.patch +++ b/patches/mojo-public-tools-mojom-mojom_parser.py.patch @@ -1,8 +1,8 @@ diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/mojom_parser.py -index aad01b48df5053771f84d372caf0144ac194fda5..7a8f82ef32a34919699568f3cd299a23e4b47b9e 100755 +index 48431e9f271bc08c4671b2b5fb3c5e083e2492a6..d8430982f07f9a247c136aa36ad6e89338240965 100755 --- a/mojo/public/tools/mojom/mojom_parser.py +++ b/mojo/public/tools/mojom/mojom_parser.py -@@ -177,6 +177,7 @@ def _ParseAstHelper(args): +@@ -178,6 +178,7 @@ def _ParseAstHelper(mojom_abspath, enabled_features): with codecs.open(mojom_abspath, encoding='utf-8') as f: ast = parser.Parse(f.read(), mojom_abspath) conditional_features.RemoveDisabledDefinitions(ast, enabled_features) diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 084f1b94c1f2..a316b15fb95a 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 53b11eb73639f117777527faf5270126487d3072..544118c497bd1848a7c3a6095ce75cb5c530c212 100644 +index 15fc75fcdc16c8afec4e4ff0519e21eede9adc60..153239dcbefb1a009ca8a88a82ba342cd0812ac8 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1137,6 +1137,7 @@ component("net") { +@@ -1135,6 +1135,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/net-base-host_port_pair.cc.patch b/patches/net-base-host_port_pair.cc.patch index 8343d47aa89f..c15f46634c41 100644 --- a/patches/net-base-host_port_pair.cc.patch +++ b/patches/net-base-host_port_pair.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/base/host_port_pair.cc b/net/base/host_port_pair.cc -index f24ac7b0d34ca997f9a57ee82ad9cf2a9baed3e3..487f46cb0d79cc0e0d16149116e1b29a56fe6bb3 100644 +index efa039d35fd44c2c7412563a68a3e7a6fdae1e2a..05e7a587a7d0f63224804737f383ecec15174d9f 100644 --- a/net/base/host_port_pair.cc +++ b/net/base/host_port_pair.cc -@@ -25,6 +25,7 @@ HostPortPair::HostPortPair(const std::string& in_host, uint16_t in_port) +@@ -25,6 +25,7 @@ HostPortPair::HostPortPair(base::StringPiece in_host, uint16_t in_port) // static HostPortPair HostPortPair::FromURL(const GURL& url) { @@ -10,7 +10,7 @@ index f24ac7b0d34ca997f9a57ee82ad9cf2a9baed3e3..487f46cb0d79cc0e0d16149116e1b29a return HostPortPair(url.HostNoBrackets(), static_cast(url.EffectiveIntPort())); } -@@ -36,6 +37,7 @@ HostPortPair HostPortPair::FromIPEndPoint(const IPEndPoint& ipe) { +@@ -51,6 +52,7 @@ HostPortPair HostPortPair::FromIPEndPoint(const IPEndPoint& ipe) { // static HostPortPair HostPortPair::FromString(const std::string& str) { @@ -18,7 +18,7 @@ index f24ac7b0d34ca997f9a57ee82ad9cf2a9baed3e3..487f46cb0d79cc0e0d16149116e1b29a std::vector key_port = base::SplitStringPiece( str, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); if (key_port.size() != 2) -@@ -55,6 +57,7 @@ std::string HostPortPair::ToString() const { +@@ -70,6 +72,7 @@ std::string HostPortPair::ToString() const { std::string ret(HostForURL()); ret += ':'; ret += base::NumberToString(port_); diff --git a/patches/net-base-host_port_pair.h.patch b/patches/net-base-host_port_pair.h.patch index 024a79931cd8..e709c34490aa 100644 --- a/patches/net-base-host_port_pair.h.patch +++ b/patches/net-base-host_port_pair.h.patch @@ -1,8 +1,8 @@ diff --git a/net/base/host_port_pair.h b/net/base/host_port_pair.h -index 1efb721e103ad43bb8799ceed2ce3fc199ccd9e6..0f773eff2ef5b03de11de367ffedb0ea7f861b4e 100644 +index 2ac2aaf2ea202c80a1a8516fdbc116d07aeba6d0..39ce98b413eadd23d12d341beffbc85f61c5440a 100644 --- a/net/base/host_port_pair.h +++ b/net/base/host_port_pair.h -@@ -36,16 +36,20 @@ class NET_EXPORT HostPortPair { +@@ -44,16 +44,20 @@ class NET_EXPORT HostPortPair { // TODO(willchan): Define a functor instead. // Comparator function so this can be placed in a std::map. @@ -23,7 +23,7 @@ index 1efb721e103ad43bb8799ceed2ce3fc199ccd9e6..0f773eff2ef5b03de11de367ffedb0ea bool IsEmpty() const { return host_.empty() && port_ == 0; -@@ -72,6 +76,7 @@ class NET_EXPORT HostPortPair { +@@ -80,6 +84,7 @@ class NET_EXPORT HostPortPair { // Returns the estimate of dynamically allocated memory in bytes. size_t EstimateMemoryUsage() const; diff --git a/patches/net-http-transport_security_state.cc.patch b/patches/net-http-transport_security_state.cc.patch index 72d1b267f8ad..406e51fd6835 100644 --- a/patches/net-http-transport_security_state.cc.patch +++ b/patches/net-http-transport_security_state.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc -index 1a13b0e6883a4622380ccedf2ac6a02e4c2c842d..49e209cdcc8d394c84cd6ad5b2f130f67d4127b6 100644 +index 8488019ec5f071d474217fe796d8688bab48acd1..f453bc682a40e11424c96c1e170b9c79f632b088 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc -@@ -409,6 +409,7 @@ TransportSecurityState::TransportSecurityState( +@@ -414,6 +414,7 @@ TransportSecurityState::TransportSecurityState( #if !BUILDFLAG(GOOGLE_CHROME_BRANDING) || defined(OS_ANDROID) || defined(OS_IOS) enable_static_pins_ = false; enable_static_expect_ct_ = false; diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch index 9671f9141bfc..f94e95a62eb0 100644 --- a/patches/sandbox-policy-win-sandbox_win.cc.patch +++ b/patches/sandbox-policy-win-sandbox_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc -index 52413e2776fb6a7e9c6913a31177ea1d38b05197..71b041e0ec7fc1c4d9ff3e56c057041a673d6b14 100644 +index fc3963696dd848ace3631403d2deceab4ab7910f..f6c4123f7b08e13ad56e83b82f0cd372fad54aeb 100644 --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc @@ -772,6 +772,7 @@ ResultCode LaunchWithoutSandbox( diff --git a/patches/services-network-public-cpp-cors-cors.cc.patch b/patches/services-network-public-cpp-cors-cors.cc.patch index bf1837edd331..2fdd2c81303f 100644 --- a/patches/services-network-public-cpp-cors-cors.cc.patch +++ b/patches/services-network-public-cpp-cors-cors.cc.patch @@ -1,5 +1,5 @@ diff --git a/services/network/public/cpp/cors/cors.cc b/services/network/public/cpp/cors/cors.cc -index 2e960432f19cc2afb807ae9f5a9d51a2bfa431a2..01d27bebe7a6dcae64473c413048587724a3f34e 100644 +index a1835cda1fb5de26c8393d8fb0d4d4b4e413b1a6..ba7d3efb1d02c6ef72a76e67224ca2a81379de6b 100644 --- a/services/network/public/cpp/cors/cors.cc +++ b/services/network/public/cpp/cors/cors.cc @@ -457,6 +457,7 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) { diff --git a/patches/third_party-blink-common-client_hints-client_hints.cc.patch b/patches/third_party-blink-common-client_hints-client_hints.cc.patch index f82cb2bc69c9..56fbeff447dd 100644 --- a/patches/third_party-blink-common-client_hints-client_hints.cc.patch +++ b/patches/third_party-blink-common-client_hints-client_hints.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc -index 4eefbeaef02891be61ed0c9cb607cde2839caf00..bfa3985493043c7943f3ab98c3ae9b56d09ba020 100644 +index 1610d6110cdf1acc3b6ca1b27d4f9621dd279ebe..1692dd4fcc83c4ec92f90c1b057e03df180e4cdf 100644 --- a/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc -@@ -132,6 +132,7 @@ absl::optional> FilterAcceptCH( +@@ -133,6 +133,7 @@ absl::optional> FilterAcceptCH( } bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) { 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 3ca7575369b3..d83109d345ad 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,5 +1,5 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index 2c8828fcf90ea1ef77eb876fd679638f3df0ee2a..78a112605c39c4bb0da78cdc0a8af6d411166de0 100644 +index 3cb2253ae8003c814704cb3502a8e864b983fa83..a320e16ef271677193bed7da9c5e35759188327c 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni @@ -2450,6 +2450,7 @@ generated_interface_sources_in_modules = [ 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 6d0af330bed3..c2ce611a99bb 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,5 +1,5 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni -index e3a7fb6f06ef184094171af86d30fe080950f320..87ca0ed036a2733895813efca64a86d7f1262691 100644 +index 132db2456d8f5cb457dbdc84d5aac8b6902fed04..44eba76efb13d6e26d20a63b70fdbd396d6e74a5 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni @@ -1132,6 +1132,7 @@ static_idl_files_in_modules = get_path_info( 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 c14586e72d1b..b1d9d7ed9372 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 fae49ea712b9af2ff78807e3f7c52d47c38bf284..70116ff76de311c25ee1db98874dde691a9d8979 100644 +index a19eb7684feb09ab382dbee743f3b4950cb1d45e..d2059b1581c79bab927a71fb5ee87b54e1f30b53 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 -@@ -920,6 +920,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -936,6 +936,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch index e877f9bab1eb..3f4b97c0b296 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h -index 4e4876dc0ec679467cb7010e90f0e8a61f5c067d..7915c8f1876ca00cc4d347a49bf93c155ec80fb2 100644 +index 99d45e501ba215201b54ef74bb812c993716517d..18be42578dad947ae2ebfcac933cae6cdcaef72f 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h -@@ -323,6 +323,7 @@ class CORE_EXPORT HTMLCanvasElement final +@@ -321,6 +321,7 @@ class CORE_EXPORT HTMLCanvasElement final bool IsCanvasClear() { return canvas_is_clear_; } 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 49706b8cfcb6..19929a9d3dc0 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 492e480960d3f49f2090c0116e4f327bd0cee240..2795be971f2be74c4ddf74c68743f830380615c1 100644 +index 5e53812a85483a5571f9273c61dbbb6d05d67e10..984c43aeac90ab0859b373da0736634922c9bd81 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 -@@ -1875,6 +1875,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -1926,6 +1926,7 @@ ImageData* BaseRenderingContext2D::getImageData( } ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index 492e480960d3f49f2090c0116e4f327bd0cee240..2795be971f2be74c4ddf74c68743f830 int sx, int sy, int sw, -@@ -1992,6 +1993,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2043,6 +2044,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } 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 52348d8a8ada..a67976326305 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 11762acc65d27b0cdcdabf5d58d88d249d9fe900..6d36b45499659ff0b04c3bec7456b63ec4beb4b2 100644 +index 69676393cc7d403579cbd4a65c1c08c973319af0..eb5717363408f7a0652a876424dd1168c2654c58 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 -@@ -962,6 +962,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { +@@ -925,6 +925,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { if (!canvas()->GetDocument().GetFrame()) return MakeGarbageCollected(); 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 23550cb25657..43f8b3520d13 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 49f1459db8c8fa2d1489a7faccb042da2d00aa66..1f8585010faaa7c4cdb4c516fb15a7e7cffbb19e 100644 +index 6406e459df49742a927e3081361a60fe4fa2ca6e..c8b2629ad891ee487b80b7d031dc90c1481ece19 100644 --- a/third_party/blink/renderer/modules/mediastream/media_devices.cc +++ b/third_party/blink/renderer/modules/mediastream/media_devices.cc -@@ -478,6 +478,8 @@ void MediaDevices::DevicesEnumerated( +@@ -479,6 +479,8 @@ void MediaDevices::DevicesEnumerated( } } 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 01921f0ab96c..457a9c7e4f9a 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 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb63455891be3601f 100644 +index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe560af609f3 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 -@@ -2927,6 +2927,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -2928,6 +2928,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -2958,6 +2959,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -2959,6 +2960,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -2988,6 +2990,7 @@ absl::optional>> +@@ -2989,6 +2991,7 @@ absl::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return absl::nullopt; @@ -26,7 +26,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -3002,6 +3005,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3003,6 +3006,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3035,6 +3039,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3036,6 +3040,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 switch (pname) { case GL_BUFFER_USAGE: { -@@ -3171,6 +3176,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3172,6 +3177,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -50,7 +50,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3572,6 +3578,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3573,6 +3579,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 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3587,6 +3594,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3588,6 +3595,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 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3679,6 +3687,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3680,6 +3688,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3734,6 +3743,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3735,6 +3744,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3744,6 +3754,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3745,6 +3755,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3795,6 +3806,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3796,6 +3807,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3826,6 +3838,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3827,6 +3839,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3856,6 +3869,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3857,6 +3870,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSample( -@@ -3868,6 +3882,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3869,6 +3883,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 return EnsureNotNull(shader->Source()); } -@@ -3897,6 +3912,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3898,6 +3913,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3931,6 +3947,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3932,6 +3948,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4190,6 +4207,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4191,6 +4208,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4214,6 +4232,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4215,6 +4233,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4291,6 +4310,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4292,6 +4311,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 47ad7a32f073fe15e1dc20a92b8705b6dc0dd9f1..f241aaddb22070d94e90896eb6345589 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4638,6 +4658,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4639,6 +4659,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 c381b930fd31..ac7af6b9ed9f 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 5b357dc8e522ade6bae00396db62ef6fac2867bb..607453c720568d603e866185a1200ec31c19bec3 100644 +index e3addfe13662b37a1ed27ffb5355478515dfa8c6..8e051599f1573652fa73e7676cd38bd95270ae59 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -47,6 +47,9 @@ @@ -12,7 +12,7 @@ index 5b357dc8e522ade6bae00396db62ef6fac2867bb..607453c720568d603e866185a1200ec3 "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -479,6 +482,9 @@ +@@ -491,6 +494,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 50e8a1344b4b..8ec6b6e57c73 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 52106340cd742f6e941021eccfd0e9842f4c196f..2d1e4afb73e8f357e2af6ae58168f7a85746123b 100644 +index e6b8943db0915d1b68768c50b123cec65531c052..7df114b65d9a4f491c4c350010a333c719406ebd 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -14391,6 +14391,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -14394,6 +14394,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. diff --git a/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch index 12a64f88b6ec..71657b5ad38b 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_mac.mm b/ui/accessibility/platform/ax_platform_node_mac.mm -index 115f964ee0ef5518a3a02eae4310d2af02068148..4562fb52b41acb66a5d9a30cc34f0337fefba9aa 100644 +index 55ffe6f60b06de3b31513880345619dbd876b8f6..4702d770fd5b170a4db8a76fe80dcc2b25409ff7 100644 --- a/ui/accessibility/platform/ax_platform_node_mac.mm +++ b/ui/accessibility/platform/ax_platform_node_mac.mm -@@ -1164,6 +1164,7 @@ bool IsAXSetter(SEL selector) { +@@ -1162,6 +1162,7 @@ bool IsAXSetter(SEL selector) { if (!_node) return nil; diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index 20c1034af111..33672151585e 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 a6b721245a5b141b7ee3170b92335a5f89eaebb6..8f75d10f7ec47d02ab693dd298da73db080cb5cb 100644 +index 9155fa3d991649b6883f378d9fe3833b366ce7ec..47b19317b47d5f20b95ef7748ef68abebd5983da 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn -@@ -464,6 +464,7 @@ component("base") { +@@ -465,6 +465,7 @@ component("base") { "//ui/strings", "//url", ] diff --git a/patches/ui-views-controls-focus_ring.cc.patch b/patches/ui-views-controls-focus_ring.cc.patch index ba355e0391ff..8f6ebb5fa1f4 100644 --- a/patches/ui-views-controls-focus_ring.cc.patch +++ b/patches/ui-views-controls-focus_ring.cc.patch @@ -1,8 +1,8 @@ diff --git a/ui/views/controls/focus_ring.cc b/ui/views/controls/focus_ring.cc -index c54adbeabbd7afd44f8b17b824972940357c7a0a..24c2bb77120b2fd425df8e04aa2fac7c1734273b 100644 +index bc8136a77df0edbe40bb3b6c8bb12a07a22a1512..251428a95f9f797e0d464d0d18c0aee9e8617ab4 100644 --- a/ui/views/controls/focus_ring.cc +++ b/ui/views/controls/focus_ring.cc -@@ -197,6 +197,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { +@@ -213,6 +213,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { flags.setAntiAlias(true); flags.setColor(GetNativeTheme()->GetSystemColor( ui::NativeTheme::kColorId_FocusAuraColor)); @@ -10,7 +10,7 @@ index c54adbeabbd7afd44f8b17b824972940357c7a0a..24c2bb77120b2fd425df8e04aa2fac7c flags.setStyle(cc::PaintFlags::kFill_Style); canvas->sk_canvas()->drawRRect(ring_rect, flags); -@@ -205,6 +206,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { +@@ -221,6 +222,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { cc::PaintFlags paint; paint.setAntiAlias(true); paint.setColor(color_.value_or(GetColor(this, !invalid_))); From c57b08d44f949c1b2f34dfbcc2da518a0439f124 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 23 Jun 2021 12:18:43 +0200 Subject: [PATCH 064/205] Conflict-resolved patches from Chromium 93.0.4542.2 to Chromium 93.0.4549.4. --- patches/chrome-VERSION.patch | 6 +++--- ...in-profile_picker-profile_picker_main_view.js.patch | 6 +++--- ...ser-ui-webui-settings-site_settings_helper.cc.patch | 8 ++++---- ...ngs-core-browser-content_settings_registry.cc.patch | 8 ++++---- ...tent_settings-core-common-content_settings.cc.patch | 6 +++--- ...settings-core-common-content_settings_types.h.patch | 8 ++++---- patches/components-permissions-BUILD.gn.patch | 10 +++++----- 7 files changed, 26 insertions(+), 26 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index c9723cf5836c..b2afa033f01c 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index ac8a64ec2770554cbddd624070472eb8e0a21faa..c5cfdaaa37bdde933d93e031426a28b7344a3a94 100644 +index 8b7fcb0a332de9a4300bcf012f0f92bacd72410b..c5cfdaaa37bdde933d93e031426a28b7344a3a94 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=93 -MINOR=0 --BUILD=4542 --PATCH=2 +-BUILD=4549 +-PATCH=4 +MINOR=1 +BUILD=30 +PATCH=30 diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.js.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.js.patch index 8d4a462f94ea..775e927e63ca 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.js.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.js.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.js b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.js -index e4d18fe19621df0f75394798f602f54ce0d53fed..20c72407d88aa5e58c6ee02a4fc10499c574ffad 100644 +index ce36bbc87bdbe481ba0a81656490294fa6d4e198..c16a2629c0d9aa0f43a9142e1734206a8d5e0a32 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.js +++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.js -@@ -79,6 +79,7 @@ Polymer({ +@@ -100,6 +100,7 @@ export class ProfilePickerMainViewElement extends this.manageProfilesBrowserProxy_ = ManageProfilesBrowserProxyImpl.getInstance(); + this.$$('#addProfile').style.borderRadius = '8px'; - }, + } /** @override */ 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 7346bb704f3f..bfe5c45abd26 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,16 +1,16 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index 3a156ea256e0760bf9bcb12e9722bae9a5ec812c..a98bf0fca1ba7908778157c6fa1e65b1a50a5ab6 100644 +index 62aed022398ff348db83bb1252ebcfc444556e26..31ad6d576c2dfc081ff2ba06b78bed715807fcee 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc -@@ -159,6 +159,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { - {ContentSettingsType::DISPLAY_CAPTURE, nullptr}, +@@ -160,6 +160,7 @@ const ContentSettingsTypeNameEntry kContentSettingsTypeGroupNames[] = { {ContentSettingsType::FEDERATED_IDENTITY_SHARING, nullptr}, {ContentSettingsType::FEDERATED_IDENTITY_REQUEST, nullptr}, + {ContentSettingsType::JAVASCRIPT_JIT, nullptr}, + BRAVE_CONTENT_SETTINGS_TYPE_GROUP_NAMES_LIST }; static_assert(base::size(kContentSettingsTypeGroupNames) == -@@ -382,6 +383,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { +@@ -383,6 +384,7 @@ bool HasRegisteredGroupName(ContentSettingsType type) { } ContentSettingsType ContentSettingsTypeFromGroupName(base::StringPiece name) { diff --git a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch index cb5c3924dee5..d5be97527d62 100644 --- a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch @@ -1,11 +1,11 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index 6abf923af42858897bc41296343c36adec29e088..ecac6e1b94545bbcef6040e30a57c304de4580a2 100644 +index 692dc9fd7c5820fc8931cab745e81c21e3dba1eb..2377ee444a5ee8712b970d85af868bfc028eed0d 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -612,6 +612,7 @@ void ContentSettingsRegistry::Init() { - ContentSettingsInfo::INHERIT_IF_LESS_PERMISSIVE, +@@ -622,6 +622,7 @@ void ContentSettingsRegistry::Init() { + ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::PERSISTENT, - ContentSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); + ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); + BRAVE_INIT } 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 c9e507cdaf46..95d3f65decfe 100644 --- a/patches/components-content_settings-core-common-content_settings.cc.patch +++ b/patches/components-content_settings-core-common-content_settings.cc.patch @@ -1,11 +1,11 @@ diff --git a/components/content_settings/core/common/content_settings.cc b/components/content_settings/core/common/content_settings.cc -index 807a39d67582b91b293056db4be50382f544b6e7..291264444ac9fd9703c066f73826e102ca3becb3 100644 +index c9f2d85b91ca645d1633d6925763460fc647afca..3299105de386764c0e6f8d9732facd025cc6cead 100644 --- a/components/content_settings/core/common/content_settings.cc +++ b/components/content_settings/core/common/content_settings.cc -@@ -97,6 +97,7 @@ constexpr HistogramValue kHistogramValue[] = { - {ContentSettingsType::FILE_SYSTEM_ACCESS_CHOOSER_DATA, 76}, +@@ -98,6 +98,7 @@ constexpr HistogramValue kHistogramValue[] = { {ContentSettingsType::FEDERATED_IDENTITY_SHARING, 77}, {ContentSettingsType::FEDERATED_IDENTITY_REQUEST, 78}, + {ContentSettingsType::JAVASCRIPT_JIT, 79}, + BRAVE_HISTOGRAM_VALUE_LIST }; diff --git a/patches/components-content_settings-core-common-content_settings_types.h.patch b/patches/components-content_settings-core-common-content_settings_types.h.patch index 7bce3a63c834..fca288a24738 100644 --- a/patches/components-content_settings-core-common-content_settings_types.h.patch +++ b/patches/components-content_settings-core-common-content_settings_types.h.patch @@ -1,10 +1,10 @@ diff --git a/components/content_settings/core/common/content_settings_types.h b/components/content_settings/core/common/content_settings_types.h -index 47d6effe7e33e71bbe640943d2122133ede12a56..41b691217961c7d225e22dbecf1ba15e6beb700c 100644 +index 4bb4ad71cc1b3e4776266dce41ed6e67e6d1ca5b..8f7b7f52f7286e0ca6088d11540cc449e75e68ca 100644 --- a/components/content_settings/core/common/content_settings_types.h +++ b/components/content_settings/core/common/content_settings_types.h -@@ -261,6 +261,7 @@ enum class ContentSettingsType : int32_t { - // associated with the relying party's origin. - FEDERATED_IDENTITY_REQUEST, +@@ -264,6 +264,7 @@ enum class ContentSettingsType : int32_t { + // Whether to use the v8 optimized JIT for running JavaScript on the page. + JAVASCRIPT_JIT, + BRAVE_CONTENT_SETTINGS_TYPES_LIST, NUM_TYPES, diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index 90d372690579..7e254472306a 100644 --- a/patches/components-permissions-BUILD.gn.patch +++ b/patches/components-permissions-BUILD.gn.patch @@ -1,11 +1,11 @@ diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn -index 4724a5c0ceb16934ee859397e651ce28411566dc..282f2e851fe675933626701afd0cea7287fb7362 100644 +index 51b1cae4cf796e6b3e65e1af12d93cb03a22da89..9d50f092098044366a25d6585046dd1b8274f296 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn -@@ -112,6 +112,7 @@ source_set("permissions") { - "//ui/base", - "//url", - ] +@@ -122,6 +122,7 @@ source_set("permissions") { + "contexts/geolocation_permission_context_mac.h", + ] + } + import("//brave/components/permissions/sources.gni") sources += brave_components_permissions_sources deps += brave_components_permissions_deps if (is_android) { sources += [ From 1b924446d2f81d87dfb802d43c3aab0f51ba8d7c Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 23 Jun 2021 12:19:04 +0200 Subject: [PATCH 065/205] Adapt to relocation of DropdownItemViewInfoListBuilder.java From //chrome/android/java to //chrome/browser/ui/android/omnibox/java. Chromium change: https://chromium.googlesource.com/chromium/src/+/385121b715b153153f7626baf728cbd588250ff7 commit 385121b715b153153f7626baf728cbd588250ff7 Author: Jinsuk Kim Date: Thu Jun 17 03:25:23 2021 +0000 Android: Modularize omnibox/ Moves the files in chrome/browser/omnibox and related resources to a new modularized target under chrome/browser/ui/android/omnibox. Bug: 1171512 --- ...tions-DropdownItemViewInfoListBuilder.java.patch | 13 ------------- ...tions-DropdownItemViewInfoListBuilder.java.patch | 13 +++++++++++++ 2 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch create mode 100644 patches/chrome-browser-ui-android-omnibox-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch deleted file mode 100644 index d92626f55864..000000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java -index 1d03f6211130ada943a7a0a5d123756ca000ade2..24d3217fb65ec517a0d8bdf9e1a1849cfa0c868a 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java -@@ -95,7 +95,7 @@ class DropdownItemViewInfoListBuilder { - () -> mShareDelegateSupplier == null ? null : mShareDelegateSupplier.get(); - - mHeaderProcessor = new HeaderProcessor(context, host, delegate); -- registerSuggestionProcessor(new EditUrlSuggestionProcessor( -+ registerSuggestionProcessor(new org.chromium.chrome.browser.omnibox.suggestions.editurl.BraveEditUrlSuggestionProcessor( - context, host, delegate, iconBridgeSupplier, mActivityTabSupplier, shareSupplier)); - registerSuggestionProcessor( - new AnswerSuggestionProcessor(context, host, textProvider, imageFetcherSupplier)); diff --git a/patches/chrome-browser-ui-android-omnibox-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch b/patches/chrome-browser-ui-android-omnibox-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch new file mode 100644 index 000000000000..51af61276057 --- /dev/null +++ b/patches/chrome-browser-ui-android-omnibox-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch @@ -0,0 +1,13 @@ +diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java +index 208580a0d53c8a578de68b0f25dd0f3ecf823e05..4f963f68b0d2ed8178fd399904d6db6ff49bde2f 100644 +--- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java ++++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java +@@ -92,7 +92,7 @@ class DropdownItemViewInfoListBuilder { + () -> mShareDelegateSupplier == null ? null : mShareDelegateSupplier.get(); + + mHeaderProcessor = new HeaderProcessor(context, host, delegate); +- registerSuggestionProcessor(new EditUrlSuggestionProcessor( ++ registerSuggestionProcessor(new new org.chromium.chrome.browser.omnibox.suggestions.editurl.BraveEditUrlSuggestionProcessor( + context, host, delegate, iconBridgeSupplier, mActivityTabSupplier, shareSupplier)); + registerSuggestionProcessor( + new AnswerSuggestionProcessor(context, host, textProvider, imageFetcherSupplier)); From 552a11f0f2a08e1da43fb6174b5cc3d5d63091f6 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 23 Jun 2021 12:25:03 +0200 Subject: [PATCH 066/205] Updated strings for Chromium 93.0.4549.4. --- app/app_management_strings.grdp | 6 ++ app/generated_resources.grd | 94 ++++++++++++++-- app/generated_resources_override.grd | 17 ++- app/os_settings_search_tag_strings.grdp | 9 ++ app/os_settings_strings.grdp | 102 ++++++++++++++++-- app/url_handler_intent_picker_strings.grdp | 3 + app/whats_new_strings.grdp | 10 ++ .../strings/android_chrome_strings.grd | 59 ++++++++-- components/arc_strings.grdp | 11 +- components/error_page_strings.grdp | 11 +- components/flags_strings.grdp | 3 +- components/history_strings.grdp | 3 + components/payments_strings.grdp | 34 +++++- components/payments_strings_override.grdp | 7 +- 14 files changed, 326 insertions(+), 43 deletions(-) create mode 100644 app/whats_new_strings.grdp diff --git a/app/app_management_strings.grdp b/app/app_management_strings.grdp index 636d6aa05668..5de0ef291505 100644 --- a/app/app_management_strings.grdp +++ b/app/app_management_strings.grdp @@ -25,6 +25,12 @@ Pin to shelf + + Preset window sizes + + + Use presets for phone, tablet, or resizable windows to prevent app from misbehaving + Printers diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 940f5cf97be2..d6b3d2bb2606 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -291,8 +291,10 @@ are declared in tools/grit/grit_rule.gni. - + + + @@ -325,6 +327,11 @@ are declared in tools/grit/grit_rule.gni. + + + + + @@ -1338,6 +1345,9 @@ are declared in tools/grit/grit_rule.gni. Tips for Brave + + What's New + Import bookmarks and settings... @@ -1851,6 +1861,9 @@ are declared in tools/grit/grit_rule.gni. Send + + Review + @@ -5238,11 +5251,6 @@ Keep your key file in a safe place. You will need it to create new versions of y This page will also be removed from your history and $1Brave activity. - - - Remove suggestion from clipboard? - - Always Show Full URLs @@ -5533,6 +5541,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Customize cards + + Viewed $15 days ago + + + Viewed today + Shopping suggestions @@ -5605,6 +5619,12 @@ Keep your key file in a safe place. You will need it to create new versions of y Close + + Related to your search + + + Recommended + New @@ -5726,6 +5746,9 @@ Keep your key file in a safe place. You will need it to create new versions of y To save a page for later, click the Bookmark icon + + Add current tab + @@ -6874,9 +6897,18 @@ Keep your key file in a safe place. You will need it to create new versions of y Open Tabs + + Recently Closed + Recently Closed Tabs + + $11 Tab + + + $12 Tabs + @@ -7342,6 +7374,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Shared Tab + + Choose a device. Then, to see the page, open Brave there. + Send to your devices @@ -7364,6 +7399,14 @@ Keep your key file in a safe place. You will need it to create new versions of y Send Link to $1Ted's Pixel2 + + + Page shared from $1Tanya's Pixel 2 + + + Open + + @@ -7425,6 +7468,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Cast... + + Share link to + @@ -7447,9 +7493,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Press $1Ctrl+V to paste - - Brave has sent the verification code to the website upon your approval on $1Jimmy's Pixel - Call from your device @@ -8369,6 +8412,12 @@ Please help our engineers fix this problem. Tell us what happened right before y To start sync, verify it's you + + To make sure you can always access your sync data, verify it's you + + + To make sure you can always access your saved passwords, verify it's you + @@ -10848,6 +10897,17 @@ Please help our engineers fix this problem. Tell us what happened right before y Close Private + + + To clear data, close all Private windows + + + This only affects Private windows + + + Close windows + + {0, plural, @@ -10938,6 +10998,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Your administrator says "$1Please don't upload this type of data.". + + $1foo.txt has sensitive or dangerous data. Your administrator says "$2Please don't upload this type of data.". + Learn more @@ -11069,6 +11132,12 @@ Please help our engineers fix this problem. Tell us what happened right before y =1 {Click to view the extension} other {Click to view these extensions}} + + Justification for requesting this extension: + + + Enter justification... + @@ -11114,6 +11183,13 @@ Please help our engineers fix this problem. Tell us what happened right before y Enabled – $1tabs shrink to pinned tab width + + + Side Panel + + + Enables a browser-level side panel for a useful and persistent way to access your Reading List and Bookmarks. + Reading List diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index c37a054908ac..a9b9b7ded4ee 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -94,6 +94,8 @@ are declared in tools/grit/grit_rule.gni. + + @@ -118,6 +120,9 @@ are declared in tools/grit/grit_rule.gni. + + + @@ -480,8 +485,6 @@ are declared in tools/grit/grit_rule.gni. - - @@ -655,6 +658,8 @@ are declared in tools/grit/grit_rule.gni. + + @@ -922,7 +927,13 @@ are declared in tools/grit/grit_rule.gni. Close Private - + + To clear data, close all Private windows + + + This only affects Private windows + + diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp index 68405cc8f800..998e6641cf44 100644 --- a/app/os_settings_search_tag_strings.grdp +++ b/app/os_settings_search_tag_strings.grdp @@ -729,6 +729,15 @@ Right click card + + Quick Answers definition + + + Quick Answers translation + + + Quick Answers unit conversion + Brave Assistant diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index b9da4525e90f..a18725417448 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -539,6 +539,24 @@ Edit dictionary entries + + Physical keyboard layout + + + Selection keys + + + Number of candidates to display per page + + + Korean keyboard layout + + + Input a syllable at a time + + + Show candidates in Hangul mode + Initial punctuation width is Full @@ -569,6 +587,15 @@ US + + Default + + + IBM + + + Eten + Dvorak @@ -728,6 +755,17 @@ Celsius + + + Dark theme + + + On + + + Off + + Preferred search engine @@ -767,6 +805,18 @@ With a right-click or long press, show related info for your text selection + + Definition + + + Translation + + + Add your preferred website languages. The top language from the list will be used for translations. + + + Unit Conversion + @@ -1195,9 +1245,30 @@ Press an assigned switch to remove assignment. Assign two more switches - + Assign them to "Next" and "Previous" to move between items on the page + + Auto-scan speed + + + Choose how long the highlight should stay on each item + + + You're all set! + + + Press your switch when the focus is on the Done button to close the guide. + + + You can always change additional settings or open the setup guide again from Switch Access settings. + + + Slower + + + Faster + Pair Bluetooth switch @@ -1207,6 +1278,12 @@ Press an assigned switch to remove assignment. Previous + + Start over setup + + + Done + Assigned @@ -3229,6 +3306,9 @@ Press an assigned switch to remove assignment. Default to using voice instead of keyboard + + To get responses that are more tailored to you, let Brave Assistant use info on your screen when you ask questions. Your Assistant may also use info about songs or videos that are playing. + Brave Assistant settings @@ -3605,6 +3685,9 @@ Press an assigned switch to remove assignment. Manage your apps + + Notifications + Google Play Store @@ -3759,20 +3842,17 @@ Press an assigned switch to remove assignment. - - On Startup - - - Restore apps and pages + + Restore apps on startup - - Always + + Always restore - + Ask every time - - Do not restore + + Never restore diff --git a/app/url_handler_intent_picker_strings.grdp b/app/url_handler_intent_picker_strings.grdp index b2232835281c..a302b3f7a410 100644 --- a/app/url_handler_intent_picker_strings.grdp +++ b/app/url_handler_intent_picker_strings.grdp @@ -20,4 +20,7 @@ Publisher: $1example.com + + $1Brave, $21 of $32 + diff --git a/app/whats_new_strings.grdp b/app/whats_new_strings.grdp new file mode 100644 index 000000000000..fb37bffbd17b --- /dev/null +++ b/app/whats_new_strings.grdp @@ -0,0 +1,10 @@ + + + + + This page can't be reached + + + Reload the page or try again later + + diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index d6a8f8b9c708..5277b00916f6 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -289,9 +289,6 @@ CHAR_LIMIT guidelines: Control how your browsing history is used to personalize Search and more - - Control how your browsing history is used to personalize Search and more - Sign out and turn off sync @@ -917,9 +914,15 @@ Your Brave account may have other forms of browsing history like searches and ac To clear <link1>search</link1> or other forms of history, visit <link2>My Brave Activity</link2> + + To clear other forms of history, visit <link1>My Brave Activity</link1> + Your search engine is %1$sBing. If applicable, see their instructions to delete your search history. + + See your search engine’s instructions for deleting your search history, if applicable + Saved passwords @@ -2654,9 +2657,6 @@ To change this setting, <resetlink>reset sync

Brave may use your history to personalize Search and other Brave services - - Brave may use your history to personalize Search and other Brave services - You can always choose what to sync in <LINK1>settings</LINK1>. @@ -3561,6 +3561,9 @@ To change this setting, <resetlink>reset sync

Remove suggestion from history? + + Remove suggestion from clipboard? + Frequently visited @@ -4048,6 +4051,17 @@ To change this setting, <resetlink>reset sync

+ + + Search or type URL + + + Start Dino Game + + + Quick Action Search Widget Icon + + Remove and recreate this shortcut @@ -4204,13 +4218,16 @@ To change this setting, <resetlink>reset sync

- Allow Brave to submit code on your remote device? + Verify your phone number on other device - Allow Brave to submit code on your %1$smac? + Verify your phone number on %1$sZoe's Macbook - Tap OK to submit %1$s123 on %2$sexample.com + Let Brave submit %1$s123 on %2$sexample.com + + + Tap OK to submit %1$s123 on %3$spayment.com to continue on %2$sshopping.com @@ -4391,11 +4408,11 @@ To change this setting, <resetlink>reset sync

- Switching on Bluetooth… + Turning on Bluetooth… - We'll switch it back off after we are done + Bluetooth will turn back off when you're done @@ -4460,6 +4477,14 @@ To change this setting, <resetlink>reset sync

+ + Move Up + + + + Move Down + + Can\u2019t go higher. Try starting from further up the page. @@ -4741,6 +4766,9 @@ To change this setting, <resetlink>reset sync

Create a %1$sairbnb.com account… + + Sign up + List of accounts to be selected. @@ -4761,6 +4789,15 @@ To change this setting, <resetlink>reset sync

chrome_stylized_highlight_ + + %1$sClassic template selected + + + Select a template for your highlight + + + Highlight was shortened + diff --git a/components/arc_strings.grdp b/components/arc_strings.grdp index 4edaeaa36f2e..5a532bdb856a 100644 --- a/components/arc_strings.grdp +++ b/components/arc_strings.grdp @@ -2,6 +2,9 @@ + + This app only supports "Phone" size. + Enable Resizing? @@ -33,11 +36,17 @@ This app is designed for mobile - It may behave unexpectedly if resized. You can now limit the ability to resize apps in $1Settings. + $1Gmail app may not resize well. Use preset window sizes to prevent the app from misbehaving. + + + Got it Settings + + You can now drag and resize this app + diff --git a/components/error_page_strings.grdp b/components/error_page_strings.grdp index 6fd57ac90e49..bf0d5a11c74f 100644 --- a/components/error_page_strings.grdp +++ b/components/error_page_strings.grdp @@ -373,18 +373,21 @@ Tap the dino to play - - Dino game, tap to jump and play + + Dino game. A pixelated dinosaur dodges cacti and pterodactyls as it runs across a desolate landscape. When you hear an audio cue, tap to jump over obstacles. Press space to play - - Dino game, press space to jump and play + + Dino game. A pixelated dinosaur dodges cacti and pterodactyls as it runs across a desolate landscape. When you hear an audio cue, press space to jump over obstacles. + + Dino game, play + Game started. diff --git a/components/flags_strings.grdp b/components/flags_strings.grdp index 286f4dbe475f..e62539e72dc6 100644 --- a/components/flags_strings.grdp +++ b/components/flags_strings.grdp @@ -22,7 +22,8 @@ By enabling these features, you could lose browser data or compromise your security or privacy. Enabled features apply to all - users of this browser. + users of this browser. If you are an enterprise admin you should + not be using these flags in production. Flags that apply system-wide can only be set by the owner: $1owner@email.com diff --git a/components/history_strings.grdp b/components/history_strings.grdp index 61abf77e78fb..43e5325b7c87 100644 --- a/components/history_strings.grdp +++ b/components/history_strings.grdp @@ -84,6 +84,9 @@ Remove from history + + '$1Brave Store - My Cart' deleted + Remove selected items diff --git a/components/payments_strings.grdp b/components/payments_strings.grdp index 7b3b0304a75d..c224dd9c006e 100644 --- a/components/payments_strings.grdp +++ b/components/payments_strings.grdp @@ -624,13 +624,24 @@ - + + + + Verify your purchase + + + You can use your device to quickly verify it's you the next time you make a purchase with this payment method. + + + Use Touch ID to verify and complete your purchase? You can use Touch ID to quickly verify it's you the next time you use this device to make a purchase with this payment method. + + Use Touch ID @@ -664,4 +675,25 @@ No thanks + + + + Secure payment credential enrollment sheet + + + Secure payment credential enrollment sheet is opened + + + Secure payment credential enrollment sheet is closed + + + Secure payment credential authentication sheet + + + Secure payment credential authentication sheet is opened + + + Secure payment credential authentication sheet is closed + + diff --git a/components/payments_strings_override.grdp b/components/payments_strings_override.grdp index cd35f1156937..52bf0375f655 100644 --- a/components/payments_strings_override.grdp +++ b/components/payments_strings_override.grdp @@ -32,9 +32,12 @@ - + + + Sign-in data will be stored on this device after you exit Private mode. - + + From a5a93a4e386189f833cde68a016d4ea80b8412cd Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 23 Jun 2021 13:30:53 +0200 Subject: [PATCH 067/205] IWYU: services/network/public/mojom/url_response_head.mojom.h --- browser/net/brave_proxying_url_loader_factory.h | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/net/brave_proxying_url_loader_factory.h b/browser/net/brave_proxying_url_loader_factory.h index 989eeafb7064..1915beea6b33 100644 --- a/browser/net/brave_proxying_url_loader_factory.h +++ b/browser/net/brave_proxying_url_loader_factory.h @@ -31,6 +31,7 @@ #include "services/network/public/mojom/network_context.mojom.h" #include "services/network/public/mojom/url_loader.mojom.h" #include "services/network/public/mojom/url_loader_factory.mojom.h" +#include "services/network/public/mojom/url_response_head.mojom.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "url/gurl.h" From 0ea53ba3943ff5129ff54e1d804c24088c40b09c Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 23 Jun 2021 13:38:57 +0200 Subject: [PATCH 068/205] Port away from deprecated ListValue::Remove We should use EraseListValue() now. Chromium change: https://chromium.googlesource.com/chromium/src/+/816cc6dcef88491540a7f18522a25f9b3d700501 commit 816cc6dcef88491540a7f18522a25f9b3d700501 Author: Maks Orlovich Date: Sun Jun 20 15:51:05 2021 +0000 Code health: Remove deprecated ListValue::Remove ... After converting the last remaining use in a base/ testcase. Bug: 1187094 --- components/ipfs/ipfs_json_parser.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/components/ipfs/ipfs_json_parser.cc b/components/ipfs/ipfs_json_parser.cc index 481f4d5c6a12..2d0521af99d9 100644 --- a/components/ipfs/ipfs_json_parser.cc +++ b/components/ipfs/ipfs_json_parser.cc @@ -37,8 +37,7 @@ bool RemoveElementFromList(base::Value* root, base::ListValue* list = nullptr; if (!root->GetAsList(&list) || !list) return false; - size_t removed_index = 0; - return list->Remove(item_to_remove, &removed_index); + return list->EraseListValue(item_to_remove); } bool RemoveValueFromList(base::Value* root, From a180f4b95308f3c805a9a7937a64c640d5533623 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 23 Jun 2021 13:43:52 +0200 Subject: [PATCH 069/205] Adapt focus_ring() calls to using views::FocusRing::Get(this) instead MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Chromium change: https://chromium.googlesource.com/chromium/src/+/96da3e494a8b7e6839298cd653a92dfdffc3f7e3 commit 96da3e494a8b7e6839298cd653a92dfdffc3f7e3 Author: Peter Boström Date: Wed Jun 16 03:40:22 2021 +0000 Make FocusRing a View class property This removes Button::focus_ring() in favor of a shared way of using FocusRing for all Views. Bug: None --- browser/ui/views/location_bar/brave_location_bar_view.cc | 7 ++++--- browser/ui/views/sidebar/sidebar_button_view.cc | 2 +- browser/ui/views/sidebar/sidebar_items_scroll_view.cc | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/browser/ui/views/location_bar/brave_location_bar_view.cc b/browser/ui/views/location_bar/brave_location_bar_view.cc index 689c23faf407..e2731ef5b49f 100644 --- a/browser/ui/views/location_bar/brave_location_bar_view.cc +++ b/browser/ui/views/location_bar/brave_location_bar_view.cc @@ -79,12 +79,13 @@ void BraveLocationBarView::Init() { // base method calls Update and Layout LocationBarView::Init(); // Change focus ring highlight path - if (focus_ring_) { - focus_ring_->SetPathGenerator( + views::FocusRing* focus_ring = views::FocusRing::Get(this); + if (focus_ring) { + focus_ring->SetPathGenerator( std::make_unique< BraveLocationBarViewFocusRingHighlightPathGenerator>()); if (const auto color = GetFocusRingColor(profile())) - focus_ring_->SetColor(color.value()); + focus_ring->SetColor(color.value()); } #if BUILDFLAG(ENABLE_TOR) onion_location_view_ = new OnionLocationView(browser_->profile()); diff --git a/browser/ui/views/sidebar/sidebar_button_view.cc b/browser/ui/views/sidebar/sidebar_button_view.cc index 5db28445e769..b81bd96d04ce 100644 --- a/browser/ui/views/sidebar/sidebar_button_view.cc +++ b/browser/ui/views/sidebar/sidebar_button_view.cc @@ -12,7 +12,7 @@ SidebarButtonView::SidebarButtonView(Delegate* delegate) : delegate_(delegate) { SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER); SetImageVerticalAlignment(views::ImageButton::ALIGN_MIDDLE); DCHECK(GetInstallFocusRingOnFocus()); - focus_ring()->SetColor(gfx::kBraveBlurple300); + views::FocusRing::Get(this)->SetColor(gfx::kBraveBlurple300); } SidebarButtonView::~SidebarButtonView() = default; diff --git a/browser/ui/views/sidebar/sidebar_items_scroll_view.cc b/browser/ui/views/sidebar/sidebar_items_scroll_view.cc index f1bf1bdf8361..32a3645b47dd 100644 --- a/browser/ui/views/sidebar/sidebar_items_scroll_view.cc +++ b/browser/ui/views/sidebar/sidebar_items_scroll_view.cc @@ -41,7 +41,7 @@ class SidebarItemsArrowView : public views::ImageButton { SetImageHorizontalAlignment(views::ImageButton::ALIGN_CENTER); SetImageVerticalAlignment(views::ImageButton::ALIGN_MIDDLE); DCHECK(GetInstallFocusRingOnFocus()); - focus_ring()->SetColor(gfx::kBraveBlurple300); + views::FocusRing::Get(this)->SetColor(gfx::kBraveBlurple300); } ~SidebarItemsArrowView() override = default; From 2967bfe0b21937e1d46e03878a60b507e9acbd73 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 23 Jun 2021 13:50:05 +0200 Subject: [PATCH 070/205] Adapt Brave uses of content::WebContentsFrameReceiverSet to new rules We need to pass a content::WebContentsFrameReceiverSetPassKey() object in the constructor now to comply with security policies. Chromium change: https://chromium.googlesource.com/chromium/src/+/5b18ca94be3ef387e2aeeb5002e1bd236c2bf04a commit 5b18ca94be3ef387e2aeeb5002e1bd236c2bf04a Author: Robert Sesek Date: Wed Jun 16 14:52:41 2021 +0000 Restrict the use of content::WebContentsFrameReceiverSet with a pass key The WebContentsFrameReceiverSet lets classes register IPC bindings outside of the central registries that are reviewed by the security team. WebContentsFrameReceiverSet bypasses security review. Bug: 1213679 --- browser/brave_drm_tab_helper.cc | 5 +++- .../brave_shields_web_contents_observer.cc | 4 ++- chromium_src/chrome/browser/ui/tab_helpers.cc | 4 +++ ...-browser-web_contents_receiver_set.h.patch | 25 +++++++++++++++++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 patches/content-public-browser-web_contents_receiver_set.h.patch diff --git a/browser/brave_drm_tab_helper.cc b/browser/brave_drm_tab_helper.cc index 086f62900b79..905fe09a80c4 100644 --- a/browser/brave_drm_tab_helper.cc +++ b/browser/brave_drm_tab_helper.cc @@ -49,7 +49,10 @@ const char BraveDrmTabHelper::kWidevineComponentId[] = "oimompecagnajdejgnnjijobebaeigek"; BraveDrmTabHelper::BraveDrmTabHelper(content::WebContents* contents) - : WebContentsObserver(contents), receivers_(contents, this) { + : WebContentsObserver(contents), + receivers_(contents, + this, + content::WebContentsFrameReceiverSetPassKey()) { auto* updater = g_browser_process->component_updater(); // We don't need to observe if widevine is already registered. if (!IsAlreadyRegistered(updater)) diff --git a/browser/brave_shields/brave_shields_web_contents_observer.cc b/browser/brave_shields/brave_shields_web_contents_observer.cc index 8a167a1b1483..6525968ca22b 100644 --- a/browser/brave_shields/brave_shields_web_contents_observer.cc +++ b/browser/brave_shields/brave_shields_web_contents_observer.cc @@ -87,7 +87,9 @@ BraveShieldsWebContentsObserver::~BraveShieldsWebContentsObserver() { BraveShieldsWebContentsObserver::BraveShieldsWebContentsObserver( WebContents* web_contents) : WebContentsObserver(web_contents), - brave_shields_receivers_(web_contents, this) {} + brave_shields_receivers_(web_contents, + this, + content::WebContentsFrameReceiverSetPassKey()) {} void BraveShieldsWebContentsObserver::RenderFrameCreated(RenderFrameHost* rfh) { if (rfh && allowed_script_origins_.size()) { diff --git a/chromium_src/chrome/browser/ui/tab_helpers.cc b/chromium_src/chrome/browser/ui/tab_helpers.cc index fa5e1f680833..6d4f0075a4d2 100644 --- a/chromium_src/chrome/browser/ui/tab_helpers.cc +++ b/chromium_src/chrome/browser/ui/tab_helpers.cc @@ -5,6 +5,10 @@ #include "brave/browser/brave_tab_helpers.h" +// Include this to make sure we don't unintentionally rename NetErrorTabHelper +// into NoTabHelper inside WebContentsReceiverSet. +#include "content/public/browser/web_contents_receiver_set.h" + #define BRAVE_TAB_HELPERS \ brave::AttachTabHelpers(web_contents); diff --git a/patches/content-public-browser-web_contents_receiver_set.h.patch b/patches/content-public-browser-web_contents_receiver_set.h.patch new file mode 100644 index 000000000000..461bd85b85c1 --- /dev/null +++ b/patches/content-public-browser-web_contents_receiver_set.h.patch @@ -0,0 +1,25 @@ +diff --git a/content/public/browser/web_contents_receiver_set.h b/content/public/browser/web_contents_receiver_set.h +index c373078ea48ebf2886b3a42513eb795d24da159d..8cf8525f3a3b5722b39766d8400854ba78284858 100644 +--- a/content/public/browser/web_contents_receiver_set.h ++++ b/content/public/browser/web_contents_receiver_set.h +@@ -59,6 +59,11 @@ namespace subresource_filter { + class ContentSubresourceFilterThrottleManager; + } + ++class BraveDrmTabHelper; ++namespace brave_shields { ++class BraveShieldsWebContentsObserver; ++} ++ + namespace content { + + class ConversionHost; +@@ -148,6 +153,8 @@ class WebContentsFrameReceiverSetPassKey { + friend class DisplayCutoutHostImpl; + friend class ScreenOrientationProvider; + friend class TestFrameInterfaceBinder; ++ friend class ::BraveDrmTabHelper; ++ friend class ::brave_shields::BraveShieldsWebContentsObserver; + FRIEND_TEST_ALL_PREFIXES(WebContentsReceiverSetBrowserTest, + OverrideForTesting); + }; From bdf97babb1483dd9fe8e5ceabe5a90387f613e0b Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 23 Jun 2021 14:17:02 +0200 Subject: [PATCH 071/205] Adapt override of TabStrip::SelectRelativeTab() to new signature It expects a TabRelativeDirection parameter now instead of a bool. Chromium change: https://chromium.googlesource.com/chromium/src/+/cbe4171877a268d9b430425d51b5e2e76856ea1a commit cbe4171877a268d9b430425d51b5e2e76856ea1a Author: David Pennington Date: Mon Jun 14 19:53:42 2021 +0000 Use a more specific enum for directionality in TabStripModel The first in a series of small cleanup CLs for TabStripModel. Here the methods used for relative selection/movement of tabs is changed to have more specific params. An enum class is added which provided direction information and used in place of "forward". Change-Id: I5e118f293dd1d97880b63b36cd49900bd207f35f Bug: 1219551 --- browser/ui/tabs/brave_tab_strip_model.cc | 17 ++++++++--------- browser/ui/tabs/brave_tab_strip_model.h | 5 +++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/browser/ui/tabs/brave_tab_strip_model.cc b/browser/ui/tabs/brave_tab_strip_model.cc index cfa050b895c1..33944bf4d5f0 100644 --- a/browser/ui/tabs/brave_tab_strip_model.cc +++ b/browser/ui/tabs/brave_tab_strip_model.cc @@ -22,7 +22,7 @@ BraveTabStripModel::BraveTabStripModel(TabStripModelDelegate* delegate, : TabStripModel(delegate, profile) {} BraveTabStripModel::~BraveTabStripModel() {} -void BraveTabStripModel::SelectRelativeTab(bool forward, +void BraveTabStripModel::SelectRelativeTab(TabRelativeDirection direction, UserGestureDetails detail) { if (contents_data_.empty()) return; @@ -30,13 +30,14 @@ void BraveTabStripModel::SelectRelativeTab(bool forward, bool is_mru_enabled = profile()->GetPrefs()->GetBoolean(kMRUCyclingEnabled); if (is_mru_enabled) { - SelectMRUTab(forward, detail); + SelectMRUTab(direction, detail); } else { - TabStripModel::SelectRelativeTab(forward, detail); + TabStripModel::SelectRelativeTab(direction, detail); } } -void BraveTabStripModel::SelectMRUTab(bool forward, UserGestureDetails detail) { +void BraveTabStripModel::SelectMRUTab(TabRelativeDirection direction, + UserGestureDetails detail) { if (mru_cycle_list_.empty()) { // Start cycling @@ -59,13 +60,11 @@ void BraveTabStripModel::SelectMRUTab(bool forward, UserGestureDetails detail) { static_cast(browser->window())->StartTabCycling(); } - if (forward) { - std::rotate(mru_cycle_list_.begin(), - mru_cycle_list_.begin() + 1, + if (direction == TabRelativeDirection::kNext) { + std::rotate(mru_cycle_list_.begin(), mru_cycle_list_.begin() + 1, mru_cycle_list_.end()); } else { - std::rotate(mru_cycle_list_.rbegin(), - mru_cycle_list_.rbegin() + 1, + std::rotate(mru_cycle_list_.rbegin(), mru_cycle_list_.rbegin() + 1, mru_cycle_list_.rend()); } diff --git a/browser/ui/tabs/brave_tab_strip_model.h b/browser/ui/tabs/brave_tab_strip_model.h index d3ffb0b46ada..8fd1318a8dfb 100644 --- a/browser/ui/tabs/brave_tab_strip_model.h +++ b/browser/ui/tabs/brave_tab_strip_model.h @@ -20,11 +20,12 @@ class BraveTabStripModel : public TabStripModel { BraveTabStripModel(const BraveTabStripModel&) = delete; BraveTabStripModel operator=(const BraveTabStripModel&) = delete; - void SelectRelativeTab(bool forward, UserGestureDetails detail) override; + void SelectRelativeTab(TabRelativeDirection direction, + UserGestureDetails detail) override; // Set the next tab when doing a MRU cycling with Ctrl-tab void SelectMRUTab( - bool forward, + TabRelativeDirection direction, UserGestureDetails detail = UserGestureDetails(GestureType::kOther)); // Stop MRU cycling, called when releasing the Ctrl key From a71d9546c072c2fe7877ce960f76d21920d1e1ac Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 23 Jun 2021 18:30:52 +0200 Subject: [PATCH 072/205] Adapt sync_ui_util.cc override to removal of sync_ui_util namespace Chromium change: https://chromium.googlesource.com/chromium/src/+/5cd115f54c670fafd04972a66725113fd51302ba commit 5cd115f54c670fafd04972a66725113fd51302ba Author: Victor Hugo Vianna Silva Date: Mon Jun 14 17:08:28 2021 +0000 Remove sync_ui_util namespace from c/b/sync/sync_ui_util.h No behavior is changed. Namespaces are discouraged for top-level embedders [1]. Since the namespace is removed: 1) Rename the following so they aren't too generic: - MessageType -> SyncStatusMessageType - ActionType -> SyncStatusActionType - StatusLabels -> SyncStatusLabels - GetStatusLabels() -> GetSyncStatusLabels() - GetStatus() -> GetSyncStatus() 2) Use enum classes rather than raw enums. Besides the above: 3) Convert ENUM_VALUE casing to kEnumValue. 4) Avoid one line over 80 characters and remove one unused function in sync_ui_util_unittest.cc [1] https://source.chromium.org/chromium/chromium/src/+/main:styleguide/c++/c++-dos-and-donts.md;l=294;drc=be05130dfdd2db2b14f73d0b99be3a2b4b118869 Fixed: 1219516 --- chromium_src/chrome/browser/sync/sync_ui_util.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/chromium_src/chrome/browser/sync/sync_ui_util.cc b/chromium_src/chrome/browser/sync/sync_ui_util.cc index 57dd2eb8cceb..f328ec26c101 100644 --- a/chromium_src/chrome/browser/sync/sync_ui_util.cc +++ b/chromium_src/chrome/browser/sync/sync_ui_util.cc @@ -3,17 +3,13 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at http://mozilla.org/MPL/2.0/. -#define GetAvatarSyncErrorType GetAvatarSyncErrorType_ChromiumImpl +#define GetAvatarSyncErrorType GetAvatarSyncErrorType_Unused #include "../../../../../chrome/browser/sync/sync_ui_util.cc" #undef GetAvatarSyncErrorType -namespace sync_ui_util { - absl::optional GetAvatarSyncErrorType(Profile* profile) { // Brave Sync works differently in that there is no sign-in // and nothing to prompt the user to manage once their sync // chain is setup. return absl::nullopt; } - -} // namespace sync_ui_util From 07f9dc141e18ac7acf6828ba90bd26c5620b2972 Mon Sep 17 00:00:00 2001 From: samartnik Date: Tue, 29 Jun 2021 13:04:49 -0400 Subject: [PATCH 073/205] [Android] Added a stub for the Quick Action Search Widget Widget itself is not used in Brave, but we need this new value to fix build. Chromium change: https://chromium.googlesource.com/chromium/src/+/44801e6aebacb2b8e7c16f11deb5fc8b6255e1ae Added a stub implementation of the Quick Action Search Widget The branded strings are defined in this CL: https://crrev.com/i/3903128 + The widget is gated behind a Finch flag and is also gated by Build channel using jinja vars Bug: 1213541 --- .../brave/android/res_brave_base/values/channel_constants.xml | 1 + .../android/res_brave_beta_base/values/channel_constants.xml | 1 + .../android/res_brave_default_base/values/channel_constants.xml | 1 + .../android/res_brave_dev_base/values/channel_constants.xml | 1 + .../android/res_brave_nightly_base/values/channel_constants.xml | 1 + app/theme/brave/android/values/channel_constants.xml | 1 + 6 files changed, 6 insertions(+) diff --git a/app/theme/brave/android/res_brave_base/values/channel_constants.xml b/app/theme/brave/android/res_brave_base/values/channel_constants.xml index 4cf1649e1b58..4759d6a86c02 100644 --- a/app/theme/brave/android/res_brave_base/values/channel_constants.xml +++ b/app/theme/brave/android/res_brave_base/values/channel_constants.xml @@ -8,4 +8,5 @@ Brave Brave bookmarks Brave search + Brave quick action search diff --git a/app/theme/brave/android/res_brave_beta_base/values/channel_constants.xml b/app/theme/brave/android/res_brave_beta_base/values/channel_constants.xml index 2a149b5bc655..08ee9332ba16 100644 --- a/app/theme/brave/android/res_brave_beta_base/values/channel_constants.xml +++ b/app/theme/brave/android/res_brave_beta_base/values/channel_constants.xml @@ -10,4 +10,5 @@ Brave - Beta Brave bookmarks Brave search + Brave quick action search diff --git a/app/theme/brave/android/res_brave_default_base/values/channel_constants.xml b/app/theme/brave/android/res_brave_default_base/values/channel_constants.xml index bf3e867eaa07..6c19ba4a5398 100644 --- a/app/theme/brave/android/res_brave_default_base/values/channel_constants.xml +++ b/app/theme/brave/android/res_brave_default_base/values/channel_constants.xml @@ -8,4 +8,5 @@ Brave - Debug Brave bookmarks Brave search + Brave quick action search diff --git a/app/theme/brave/android/res_brave_dev_base/values/channel_constants.xml b/app/theme/brave/android/res_brave_dev_base/values/channel_constants.xml index 0be6d8638ab8..9ae924fefd1b 100644 --- a/app/theme/brave/android/res_brave_dev_base/values/channel_constants.xml +++ b/app/theme/brave/android/res_brave_dev_base/values/channel_constants.xml @@ -10,4 +10,5 @@ Brave - Dev Brave bookmarks Brave search + Brave quick action search diff --git a/app/theme/brave/android/res_brave_nightly_base/values/channel_constants.xml b/app/theme/brave/android/res_brave_nightly_base/values/channel_constants.xml index d1f7f510f8de..bcd336dcd3dd 100644 --- a/app/theme/brave/android/res_brave_nightly_base/values/channel_constants.xml +++ b/app/theme/brave/android/res_brave_nightly_base/values/channel_constants.xml @@ -10,4 +10,5 @@ Brave - Nightly Brave bookmarks Brave search + Brave quick action search diff --git a/app/theme/brave/android/values/channel_constants.xml b/app/theme/brave/android/values/channel_constants.xml index bf3e867eaa07..6c19ba4a5398 100644 --- a/app/theme/brave/android/values/channel_constants.xml +++ b/app/theme/brave/android/values/channel_constants.xml @@ -8,4 +8,5 @@ Brave - Debug Brave bookmarks Brave search + Brave quick action search From 7ddb2c4fe4b1bef1469bf5233211ab2a00257b5f Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 30 Jun 2021 11:56:37 -0400 Subject: [PATCH 074/205] [Android] Omnibox was modularized Chromium change: https://chromium.googlesource.com/chromium/src/+/385121b715b153153f7626baf728cbd588250ff7 Android: Modularize omnibox/ Moves the files in chrome/browser/omnibox and related resources to a new modularized target under chrome/browser/ui/android/omnibox. Bug: 1171512 --- android/java/apk_for_test.flags | 5 +++++ .../chrome/browser/tabmodel/BraveTabCreator.java | 4 ++-- .../org/chromium/chrome/browser/BytecodeTest.java | 9 ++++++++- build/android/bytecode/bytecode_rewriter.gni | 1 + ...BraveEditUrlSuggestionProcessorClassAdapter.java | 2 ++ ...tions-DropdownItemViewInfoListBuilder.java.patch | 13 ------------- test/BUILD.gn | 1 + 7 files changed, 19 insertions(+), 16 deletions(-) delete mode 100644 patches/chrome-browser-ui-android-omnibox-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index c9daaa817893..02acb6141ed9 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -59,9 +59,14 @@ } -keep class org.chromium.chrome.browser.omnibox.suggestions.editurl.EditUrlSuggestionProcessor { + public (...); *** mHasClearedOmniboxForFocus; } +-keep class org.chromium.chrome.browser.omnibox.suggestions.editurl.BraveEditUrlSuggestionProcessor { + public (...); +} + -keep class org.chromium.chrome.browser.sync.settings.ManageSyncSettings { *** mGoogleActivityControls; *** mSyncEncryption; diff --git a/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java b/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java index f8f65ca19759..1d28c9272ee0 100644 --- a/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java +++ b/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java @@ -33,8 +33,8 @@ public BraveTabCreator(Activity activity, WindowAndroid nativeWindow, StartupTabPreloader startupTabPreloader, Supplier tabDelegateFactory, boolean incognito, OverviewNTPCreator overviewNTPCreator, AsyncTabParamsManager asyncTabParamsManager, - ObservableSupplier tabModelSelectorSupplier, - ObservableSupplier compositorViewHolderSupplier) { + Supplier tabModelSelectorSupplier, + Supplier compositorViewHolderSupplier) { super(activity, nativeWindow, startupTabPreloader, tabDelegateFactory, incognito, overviewNTPCreator, asyncTabParamsManager, tabModelSelectorSupplier, compositorViewHolderSupplier); diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 00c9ee5176ba..86863be9960d 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -41,6 +41,8 @@ import org.chromium.chrome.browser.omnibox.SearchEngineLogoUtils; import org.chromium.chrome.browser.omnibox.UrlBarEditingTextStateProvider; import org.chromium.chrome.browser.omnibox.status.PageInfoIPHController; +import org.chromium.chrome.browser.omnibox.suggestions.SuggestionHost; +import org.chromium.chrome.browser.omnibox.suggestions.UrlBarDelegate; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager; import org.chromium.chrome.browser.tabmodel.ChromeTabCreator; @@ -300,7 +302,7 @@ public void testConstructorsExistAndMatch() throws Exception { "org/chromium/chrome/browser/tabmodel/BraveTabCreator", Activity.class, WindowAndroid.class, StartupTabPreloader.class, Supplier.class, boolean.class, ChromeTabCreator.OverviewNTPCreator.class, AsyncTabParamsManager.class, - ObservableSupplier.class, ObservableSupplier.class)); + Supplier.class, Supplier.class)); Assert.assertTrue(constructorsMatch("org/chromium/chrome/browser/toolbar/ToolbarManager", "org/chromium/chrome/browser/toolbar/BraveToolbarManager", AppCompatActivity.class, BrowserControlsSizer.class, FullscreenManager.class, ToolbarControlContainer.class, @@ -360,6 +362,11 @@ public void testConstructorsExistAndMatch() throws Exception { ActivityLifecycleDispatcher.class, TabModelSelector.class, boolean.class, NewTabPageUma.class, boolean.class, NativePageHost.class, Tab.class, String.class, BottomSheetController.class, Supplier.class, WindowAndroid.class)); + Assert.assertTrue(constructorsMatch( + "org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor", + "org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor", + Context.class, SuggestionHost.class, UrlBarDelegate.class, Supplier.class, + Supplier.class, Supplier.class)); } @Test diff --git a/build/android/bytecode/bytecode_rewriter.gni b/build/android/bytecode/bytecode_rewriter.gni index f0efbcd6069d..b5671e944140 100644 --- a/build/android/bytecode/bytecode_rewriter.gni +++ b/build/android/bytecode/bytecode_rewriter.gni @@ -12,6 +12,7 @@ brave_bytecode_jars = [ "obj/chrome/browser/search_engines/android/java.javac.jar", "obj/chrome/browser/site_settings/android/java.javac.jar", "obj/chrome/browser/ui/android/appmenu/internal/java.javac.jar", + "obj/chrome/browser/ui/android/omnibox/java.javac.jar", "obj/chrome/browser/ui/android/toolbar/java.javac.jar", "obj/components/browser_ui/notifications/android/java.javac.jar", "obj/components/browser_ui/site_settings/android/java.javac.jar", diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveEditUrlSuggestionProcessorClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveEditUrlSuggestionProcessorClassAdapter.java index c2e13a79fc51..c41077960114 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveEditUrlSuggestionProcessorClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveEditUrlSuggestionProcessorClassAdapter.java @@ -16,6 +16,8 @@ public class BraveEditUrlSuggestionProcessorClassAdapter extends BraveClassVisit public BraveEditUrlSuggestionProcessorClassAdapter(ClassVisitor visitor) { super(visitor); + redirectConstructor(sEditUrlSuggestionProcessor, sBraveEditUrlSuggestionProcessor); + deleteField(sBraveEditUrlSuggestionProcessor, "mHasClearedOmniboxForFocus"); makeProtectedField(sEditUrlSuggestionProcessor, "mHasClearedOmniboxForFocus"); } diff --git a/patches/chrome-browser-ui-android-omnibox-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch b/patches/chrome-browser-ui-android-omnibox-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch deleted file mode 100644 index 51af61276057..000000000000 --- a/patches/chrome-browser-ui-android-omnibox-java-src-org-chromium-chrome-browser-omnibox-suggestions-DropdownItemViewInfoListBuilder.java.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java -index 208580a0d53c8a578de68b0f25dd0f3ecf823e05..4f963f68b0d2ed8178fd399904d6db6ff49bde2f 100644 ---- a/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java -+++ b/chrome/browser/ui/android/omnibox/java/src/org/chromium/chrome/browser/omnibox/suggestions/DropdownItemViewInfoListBuilder.java -@@ -92,7 +92,7 @@ class DropdownItemViewInfoListBuilder { - () -> mShareDelegateSupplier == null ? null : mShareDelegateSupplier.get(); - - mHeaderProcessor = new HeaderProcessor(context, host, delegate); -- registerSuggestionProcessor(new EditUrlSuggestionProcessor( -+ registerSuggestionProcessor(new new org.chromium.chrome.browser.omnibox.suggestions.editurl.BraveEditUrlSuggestionProcessor( - context, host, delegate, iconBridgeSupplier, mActivityTabSupplier, shareSupplier)); - registerSuggestionProcessor( - new AnswerSuggestionProcessor(context, host, textProvider, imageFetcherSupplier)); diff --git a/test/BUILD.gn b/test/BUILD.gn index dbe7e7d904eb..cad7d54e5290 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -1098,6 +1098,7 @@ if (is_android) { "//chrome/browser/tabmodel:java", "//chrome/browser/ui/android/appmenu:java", "//chrome/browser/ui/android/native_page:java", + "//chrome/browser/ui/android/omnibox:java", "//chrome/browser/ui/android/theme:java", "//chrome/browser/ui/android/toolbar:java", "//chrome/browser/ui/messages/android:java", From 8f52a1a979a2efeb37c24d3d6853ed8ae5c421f2 Mon Sep 17 00:00:00 2001 From: samartnik Date: Wed, 30 Jun 2021 13:44:22 -0400 Subject: [PATCH 075/205] [Android] Fixed browser tests for cr93 Chromium change: https://chromium.googlesource.com/chromium/src/+/62ed7cdc676b4838bcf620911cb56df13b8430bb Android: Introduce LocaleManagerDelegate LocaleManagerDelegate/Impl is where the public/private behavior diff will go about locale-based operations. This CL introduces the delegate interface, and its impl to be used for the public apks. Also modularize c.b.locale under the directory chrome/browser/locale. In the next patch the private repo will have its own delegate impl in preparation for moving away from AppHooks. This is patch 1/4 for moving the package from AppHooks to its own build rule-based link. Bug: 1201640 --- test/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/test/BUILD.gn b/test/BUILD.gn index cad7d54e5290..7c1f2408a1e3 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -966,6 +966,7 @@ if (!is_android) { "//chrome/browser:browser_process", "//chrome/browser/flags:flags_android", "//chrome/browser/lens:delegate_public_impl_java", + "//chrome/browser/locale:delegate_public_impl_java", "//chrome/browser/metrics:test_support", "//chrome/test:android_browsertests_assets", "//chrome/test:android_browsertests_java", From f512dd3e2a0c93cbd77358a5c98b3063d6b95d39 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 5 Jul 2021 10:46:28 -0400 Subject: [PATCH 076/205] [Android] Removed Google services from main settings Chromium change: https://chromium.googlesource.com/chromium/src/+/333aadcb14d5fe2f9b4f62441b971324cf4d6e14 [Signin][Android] Remove the pre-MICE code in MainSyncSettings This cl removes legacy tests and code paths in MainSyncSettings prior to MOBILE_IDENTITY_CONSISTENCY rollout. Bug: 1206701 --- .../chrome/browser/settings/BraveMainPreferencesBase.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java index 93920138152a..dd5f3d40fab0 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java @@ -118,6 +118,8 @@ private void updateBravePreferences() { removePreferenceIfPresent(MainSettings.PREF_UI_THEME); removePreferenceIfPresent(MainSettings.PREF_DOWNLOADS); removePreferenceIfPresent(MainSettings.PREF_SAFETY_CHECK); + removePreferenceIfPresent(MainSettings.PREF_ACCOUNT_AND_GOOGLE_SERVICES_SECTION); + removePreferenceIfPresent(MainSettings.PREF_GOOGLE_SERVICES); removePreferenceIfPresent(PREF_LANGUAGES); removePreferenceIfPresent(PREF_BASICS_SECTION); // removePreferenceIfPresent(PREF_HOMEPAGE); From de59aa830ed624c5ccb8a43668dd30a1adb78fd1 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 5 Jul 2021 15:21:11 -0400 Subject: [PATCH 077/205] [Android] Added filter for Brave classes for dex warnings after D8 desugaring After D8 desugaring there are warnings (that are treated as errors in Release) on mising classes for code patched in bytecode. This happens because we add deps to general targets (brave_chrome_java_deps, brave_chrome_all_java_deps) rather then to each target separately, which we do to avoid extensive direct patching of gn targets. Example of warning: Warning in /tmp/tmpez828382/tmp_extract_dir/org/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter.class: Type `org.chromium.chrome.browser.search_engines.settings.BraveBaseSearchEngineAdapter` was not found, it is required for default or static interface methods desugaring of `Lorg/chromium/chrome/browser/search_engines/settings/SearchEngineAdapter;refreshData()V` Chromium change: https://chromium.googlesource.com/chromium/src/+/cb2696352af0f051d9a08c3ca60bd99ab7cf35b2 Android: Use D8 for desugaring by default Bug: 1015559 Fixed: 1015559 --- patches/build-android-gyp-dex.py.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 patches/build-android-gyp-dex.py.patch diff --git a/patches/build-android-gyp-dex.py.patch b/patches/build-android-gyp-dex.py.patch new file mode 100644 index 000000000000..4ecb01e03554 --- /dev/null +++ b/patches/build-android-gyp-dex.py.patch @@ -0,0 +1,12 @@ +diff --git a/build/android/gyp/dex.py b/build/android/gyp/dex.py +index e55ab4eccf0549864273b8b8f80aa6e17ce228a7..ddeb3fa2932292891adc0b1ed851895c8333d268 100755 +--- a/build/android/gyp/dex.py ++++ b/build/android/gyp/dex.py +@@ -48,6 +48,7 @@ _IGNORE_WARNINGS = ( + # Only relevant for R8 when optimizing an app that doesn't use proto. + r'Ignoring -shrinkunusedprotofields since the protobuf-lite runtime is', + ) ++_IGNORE_WARNINGS += ( r'.Brave', ) + + + def _ParseArgs(args): From 2d37de6074cb4f6397211b6d263686ef366232d4 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Tue, 6 Jul 2021 19:18:46 +0200 Subject: [PATCH 078/205] Adapt to NetworkServiceNetworkDelegate::OnAnnotateAndMoveUserBlockedCookies() This new method replaces the formerly existing OnCanGetCookies() method. Chromium change: https://chromium.googlesource.com/chromium/src/+/59f8a845e61de2ebbed367590b009abdf38eb450 commit 59f8a845e61de2ebbed367590b009abdf38eb450 Author: cfredric Date: Tue Jun 8 15:27:11 2021 +0000 Refactor CookieSettings to apply exclusion reasons directly. This clears the way for cookies to be blocked by CookieSettings individually, rather than on a per-header basis for cookie-sends. (Note that cookie-sets already occur on a per-cookie basis, though the cookie itself isn't referenced.) We will need to do this blocking individually in order to support the --sameparty-cookies-considered-first-party flag. Change-Id: I68b8e82c949f70cfe73e141e80e409da97bd27ca Bug: 1203706 --- .../network/network_service_network_delegate.cc | 12 ++++++++---- .../network/network_service_network_delegate.h | 7 +++++-- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/chromium_src/services/network/network_service_network_delegate.cc b/chromium_src/services/network/network_service_network_delegate.cc index b4cc05fc556b..2c99fdf5c95c 100644 --- a/chromium_src/services/network/network_service_network_delegate.cc +++ b/chromium_src/services/network/network_service_network_delegate.cc @@ -8,26 +8,30 @@ #include "services/network/cookie_settings.h" #define IsCookieAccessible IsEphemeralCookieAccessible -#define OnCanGetCookies OnCanGetCookies_ChromiumImpl +#define OnAnnotateAndMoveUserBlockedCookies \ + OnAnnotateAndMoveUserBlockedCookies_ChromiumImpl #define OnCanSetCookie OnCanSetCookie_ChromiumImpl #include "../../../../services/network/network_service_network_delegate.cc" #undef OnCanSetCookie -#undef OnCanGetCookies +#undef OnAnnotateAndMoveUserBlockedCookies #undef IsCookieAccessible namespace network { -bool NetworkServiceNetworkDelegate::OnCanGetCookies( +bool NetworkServiceNetworkDelegate::OnAnnotateAndMoveUserBlockedCookies( const net::URLRequest& request, + net::CookieAccessResultList& maybe_included_cookies, + net::CookieAccessResultList& excluded_cookies, bool allowed_from_caller) { // Enable ephemeral storage support for the call. auto scoped_ephemeral_storage_awareness = network_context_->cookie_manager() ->cookie_settings() .CreateScopedEphemeralStorageAwareness(); - return OnCanGetCookies_ChromiumImpl(request, allowed_from_caller); + return OnAnnotateAndMoveUserBlockedCookies_ChromiumImpl( + request, maybe_included_cookies, excluded_cookies, allowed_from_caller); } bool NetworkServiceNetworkDelegate::OnCanSetCookie( diff --git a/chromium_src/services/network/network_service_network_delegate.h b/chromium_src/services/network/network_service_network_delegate.h index 200f71ea081d..ba90d2ccb91b 100644 --- a/chromium_src/services/network/network_service_network_delegate.h +++ b/chromium_src/services/network/network_service_network_delegate.h @@ -8,8 +8,11 @@ #define FinishedCanSendReportingReports \ NotUsed() {} \ - bool OnCanGetCookies_ChromiumImpl(const net::URLRequest& request, \ - bool allowed_from_caller); \ + bool OnAnnotateAndMoveUserBlockedCookies_ChromiumImpl( \ + const net::URLRequest& request, \ + net::CookieAccessResultList& maybe_included_cookies, \ + net::CookieAccessResultList& excluded_cookies, \ + bool allowed_from_caller); \ bool OnCanSetCookie_ChromiumImpl( \ const net::URLRequest& request, const net::CanonicalCookie& cookie, \ net::CookieOptions* options, bool allowed_from_caller); \ From 3800f99feb6467367335a2a5a29c1b787fe5831d Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Tue, 6 Jul 2021 18:38:09 +0200 Subject: [PATCH 079/205] Revert "Added a new value to chrome_constants.cc override." This reverts commit b2a8762efc3c2069d2a80dbd188aaddd9e9e75c1. FIXME: Just removing it to keep things building before upgrading to a newer Cr93 tag that will include that definition. --- chromium_src/chrome/common/chrome_constants.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/chromium_src/chrome/common/chrome_constants.cc b/chromium_src/chrome/common/chrome_constants.cc index 90299ac93a15..104c1a0694a6 100644 --- a/chromium_src/chrome/common/chrome_constants.cc +++ b/chromium_src/chrome/common/chrome_constants.cc @@ -129,12 +129,12 @@ const base::FilePath::CharType kPreferencesFilename[] = FPL("Preferences"); const base::FilePath::CharType kPreviewsOptOutDBFilename[] = FPL("previews_opt_out.db"); const base::FilePath::CharType kQueryTileStorageDirname[] = FPL("Query Tiles"); +const base::FilePath::CharType kVideoTutorialsStorageDirname[] = + FPL("Video Tutorials"); const base::FilePath::CharType kReadmeFilename[] = FPL("README"); const base::FilePath::CharType kSecurePreferencesFilename[] = FPL("Secure Preferences"); const base::FilePath::CharType kServiceStateFileName[] = FPL("Service State"); -const base::FilePath::CharType kSegmentationPlatformStorageDirName[] = - FPL("Segmentation Platform"); const base::FilePath::CharType kSingletonCookieFilename[] = FPL("SingletonCookie"); const base::FilePath::CharType kSingletonLockFilename[] = FPL("SingletonLock"); @@ -144,8 +144,6 @@ const base::FilePath::CharType kSupervisedUserSettingsFilename[] = FPL("Managed Mode Settings"); const base::FilePath::CharType kThemePackFilename[] = FPL("Cached Theme.pak"); const base::FilePath::CharType kTrustTokenFilename[] = FPL("Trust Tokens"); -const base::FilePath::CharType kVideoTutorialsStorageDirname[] = - FPL("Video Tutorials"); const base::FilePath::CharType kWebAppDirname[] = FPL("Web Applications"); // Only use if the ENABLE_REPORTING build flag is true const base::FilePath::CharType kReportingAndNelStoreFilename[] = From 8c4de02e7ec7674ea2cdfcd59241e6ad8d12b2d3 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 12:34:16 +0200 Subject: [PATCH 080/205] Updated patches from Chromium 93.0.4549.4 to Chromium 93.0.4557.4. --- patches/base-BUILD.gn.patch | 4 +-- ...base-threading-thread_restrictions.h.patch | 4 +-- patches/build-config-compiler-BUILD.gn.patch | 4 +-- patches/chrome-BUILD.gn.patch | 22 ++++++------- patches/chrome-android-BUILD.gn.patch | 14 ++++---- ...rome-android-chrome_java_sources.gni.patch | 4 +-- ...d-expectations-lint-suppressions.xml.patch | 2 +- ...me-browser-ChromeTabbedActivity.java.patch | 4 +-- ...er-TabbedModeTabDelegateFactory.java.patch | 4 +-- ...rome-browser-app-ChromeActivity.java.patch | 4 +-- ...rowser-toolbar-top-ToolbarPhone.java.patch | 10 +++--- ...owser-toolbar-top-ToolbarTablet.java.patch | 12 +++---- patches/chrome-app-BUILD.gn.patch | 2 +- patches/chrome-browser-BUILD.gn.patch | 4 +-- patches/chrome-browser-about_flags.cc.patch | 6 ++-- ...wser-chrome_content_browser_client.h.patch | 4 +-- .../chrome-browser-extensions-BUILD.gn.patch | 4 +-- ...ponent_extension_resource_manager.cc.patch | 2 +- ...ser-extensions-extension_tab_util.cc.patch | 4 +-- ...flags-android-chrome_feature_list.cc.patch | 4 +-- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 ++-- ...ome-browser-profiles-profile_impl.cc.patch | 2 +- ...rowser-resources-extensions-BUILD.gn.patch | 6 ++-- ...-browser-resources-settings-BUILD.gn.patch | 2 +- ...tings-privacy_page-privacy_page.html.patch | 2 +- ...owser-resources-settings-settings.js.patch | 2 +- ...-settings-settings_ui-settings_ui.js.patch | 4 +-- ...heck_client_download_request_base.cc.patch | 4 +-- ...browser-sync-sync_service_factory.cc.patch | 4 +-- patches/chrome-browser-ui-BUILD.gn.patch | 6 ++-- ...-browser-ui-android-toolbar-BUILD.gn.patch | 4 +-- patches/chrome-browser-ui-browser.cc.patch | 6 ++-- ...me-browser-ui-tabs-tab_strip_model.h.patch | 4 +-- ...oolbar-recent_tabs_sub_menu_model.cc.patch | 2 +- ...rowser-ui-views-frame-browser_view.h.patch | 4 +-- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 4 +-- ...wser-ui-views-toolbar-toolbar_view.h.patch | 2 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +-- ...ttings_localized_strings_provider.cc.patch | 4 +-- patches/chrome-common-BUILD.gn.patch | 6 ++-- patches/chrome-renderer-BUILD.gn.patch | 4 +-- ...er-chrome_content_renderer_client.cc.patch | 4 +-- patches/chrome-test-BUILD.gn.patch | 4 +-- ...browser-content_settings_registry.cc.patch | 4 +-- ...history-core-browser-history_types.h.patch | 2 +- .../components-omnibox-browser-BUILD.gn.patch | 4 +-- patches/components-page_info-BUILD.gn.patch | 2 +- .../components-page_info-page_info.cc.patch | 4 +-- ...nager-core-browser-login_database.cc.patch | 4 +-- patches/components-permissions-BUILD.gn.patch | 4 +-- ...ponents-permissions-android-BUILD.gn.patch | 4 +-- ...-browser-client_side_model_loader.cc.patch | 2 +- ...nents-sync-protocol-proto_visitors.h.patch | 6 ++-- ...s-sync-protocol-protocol_sources.gni.patch | 4 +-- ...nents-sync_device_info-device_info.h.patch | 4 +-- ...vice_info-device_info_sync_bridge.cc.patch | 4 +-- ...-device_info_sync_bridge_unittest.cc.patch | 4 +-- ...r_host-navigation_controller_impl.cc.patch | 4 +-- ...-renderer_host-navigation_request.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 +-- ...r-api-web_request-web_request_api.cc.patch | 2 +- ...nsions-common-api-_api_features.json.patch | 4 +-- ...hrome-browser-prefs-browser_prefs.mm.patch | 4 +-- patches/net-cookies-canonical_cookie.cc.patch | 2 +- ...er-bindings-generated_in_modules.gni.patch | 4 +-- ...renderer-bindings-idl_in_modules.gni.patch | 4 +-- ...d_party-blink-renderer-core-BUILD.gn.patch | 6 ++-- ...e-html-canvas-html_canvas_element.cc.patch | 4 +-- ...arty-blink-renderer-modules-BUILD.gn.patch | 6 ++-- ...anvas2d-base_rendering_context_2d.cc.patch | 6 ++-- ...vas2d-canvas_rendering_context_2d.cc.patch | 2 +- ...as2d-canvas_rendering_context_2d.idl.patch | 6 ++-- ...reen_canvas_rendering_context_2d.idl.patch | 6 ++-- ...paint-paint_rendering_context_2d.idl.patch | 4 +-- ...bgl-webgl2_rendering_context_base.cc.patch | 8 ++--- ...ebgl-webgl_rendering_context_base.cc.patch | 32 +++++++++---------- ...tools-gritsettings-resource_ids.spec.patch | 2 +- ...rams_xml-histogram_suffixes_list.xml.patch | 4 +-- ...ity-platform-ax_platform_node_mac.mm.patch | 4 +-- patches/ui-base-BUILD.gn.patch | 2 +- 82 files changed, 196 insertions(+), 196 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index 2bb3367cb4f9..e930b92bc4b0 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 6f28729d49b24c11ec6721d89ad36d5bb21cf0da..a261479777e22d2e4fa51af506483194e631bd78 100644 +index 465f4cdc1a823ca58fbfe538e1a700ff6300645e..ed08d35043da2549e4e45a115facb70069a8740e 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3931,6 +3931,7 @@ if (is_android) { +@@ -3945,6 +3945,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/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch index cbf3603891be..d795d6200a4c 100644 --- a/patches/base-threading-thread_restrictions.h.patch +++ b/patches/base-threading-thread_restrictions.h.patch @@ -1,8 +1,8 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index 0b188bb6e27e917415f53786f8b0462142d9936d..34cd90f81902e14aa0579d4e5c0e3d9388934270 100644 +index bf028545a03f9250412e484c67369b481b5a0dbe..fc392a6ed0d954171c2c16e337ee1ce354645dba 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -461,6 +461,7 @@ INLINE_IF_DCHECK_IS_OFF void DisallowBaseSyncPrimitives() +@@ -458,6 +458,7 @@ INLINE_IF_DCHECK_IS_OFF void DisallowBaseSyncPrimitives() EMPTY_BODY_IF_DCHECK_IS_OFF; class BASE_EXPORT ScopedAllowBaseSyncPrimitives { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 45d7972cef86..5800500e3260 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 7a54d6efa543fa93370dddbbba1abc8cd6491367..bfcc853f7e53bacf46b6f1d776bfc0432517837c 100644 +index 30dcd618633a463b3d202aaacbbd8fcfc5416957..916317cbe895b90e7133abfebfa17b2e93e81d05 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1730,6 +1730,7 @@ config("chromium_code") { +@@ -1724,6 +1724,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index c11738101366..029688eb7eee 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 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7628839bb 100644 +index 6c594ef1816c2ff9d1c4e75f4488025079e090b2..af3d62aaf1fc4743576db824d185eb8e7e032d83 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -171,6 +171,7 @@ if (!is_android && !is_mac) { @@ -10,7 +10,7 @@ index 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7 deps += [ ":chrome_dll", -@@ -444,11 +445,12 @@ if (is_win) { +@@ -448,11 +449,12 @@ if (is_win) { args += [ "--keystone=0" ] } } @@ -24,7 +24,7 @@ index 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -466,6 +468,7 @@ if (is_win) { +@@ -470,6 +472,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -32,7 +32,7 @@ index 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7 if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -538,7 +541,7 @@ if (is_win) { +@@ -542,7 +545,7 @@ if (is_win) { args = [ "-b", @@ -41,7 +41,7 @@ index 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7 "-v", chrome_version_full, "-g", -@@ -612,6 +615,7 @@ if (is_win) { +@@ -616,6 +619,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -49,7 +49,7 @@ index 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7 } } -@@ -644,9 +648,11 @@ if (is_win) { +@@ -648,9 +652,11 @@ if (is_win) { "--scm=0", ] } @@ -61,7 +61,7 @@ index 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7 if (is_chrome_branded) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -673,6 +679,7 @@ if (is_win) { +@@ -677,6 +683,7 @@ if (is_win) { info_plist_target = ":chrome_helper_plist" } @@ -69,7 +69,7 @@ index 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -1146,6 +1153,7 @@ if (is_win) { +@@ -1150,6 +1157,7 @@ if (is_win) { if (is_chrome_branded) { bundle_deps += [ ":preinstalled_apps" ] } @@ -77,7 +77,7 @@ index 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7 ldflags = [ "-compatibility_version", -@@ -1329,6 +1337,7 @@ if (is_win) { +@@ -1333,6 +1341,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -85,7 +85,7 @@ index 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/app:shutdown_signal_handlers", -@@ -1431,12 +1440,13 @@ group("child_dependencies") { +@@ -1435,12 +1444,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -100,7 +100,7 @@ index 1c6fd93d94871a7f4913fc08898987056c8f21e5..7bdcc51de2b2bd1a446f9c856db76df7 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1490,6 +1500,7 @@ group("resources") { +@@ -1494,6 +1504,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 b99a519bf6b0..02e3f804c116 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 d139faa21038405cb60df299c7e5a6295f2b7df3..5f5619fe90a785ed763715f45312be452fc801e4 100644 +index 40f4fdca18e8423520adb97360aa2bf519edef41..5fb91fc9e2d551bb0b32c6308d9e690b0443f183 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -247,6 +247,7 @@ android_resources("chrome_app_java_resources") { @@ -10,7 +10,7 @@ index d139faa21038405cb60df299c7e5a6295f2b7df3..5f5619fe90a785ed763715f45312be45 } if (enable_vr) { -@@ -580,6 +581,7 @@ android_library("chrome_java") { +@@ -592,6 +593,7 @@ android_library("chrome_java") { deps += feed_deps deps += web_feed_deps @@ -18,7 +18,7 @@ index d139faa21038405cb60df299c7e5a6295f2b7df3..5f5619fe90a785ed763715f45312be45 srcjar_deps = [ ":autofill_verification_status_generated_enum", -@@ -611,6 +613,7 @@ android_library("chrome_java") { +@@ -623,6 +625,7 @@ android_library("chrome_java") { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -26,7 +26,7 @@ index d139faa21038405cb60df299c7e5a6295f2b7df3..5f5619fe90a785ed763715f45312be45 # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -731,6 +734,7 @@ java_group("chrome_all_java") { +@@ -743,6 +746,7 @@ java_group("chrome_all_java") { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -34,7 +34,7 @@ index d139faa21038405cb60df299c7e5a6295f2b7df3..5f5619fe90a785ed763715f45312be45 } # This is a list of all base module jni headers. New features should add their -@@ -772,6 +776,7 @@ group("jni_headers") { +@@ -784,6 +788,7 @@ group("jni_headers") { "//components/ukm/android:jni_headers", "//components/webauthn/android:jni_headers", ] @@ -42,7 +42,7 @@ index d139faa21038405cb60df299c7e5a6295f2b7df3..5f5619fe90a785ed763715f45312be45 } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2036,6 +2041,7 @@ if (current_toolchain == default_toolchain) { +@@ -2047,6 +2052,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -50,7 +50,7 @@ index d139faa21038405cb60df299c7e5a6295f2b7df3..5f5619fe90a785ed763715f45312be45 if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2433,6 +2439,7 @@ android_library("base_module_java") { +@@ -2440,6 +2446,7 @@ android_library("base_module_java") { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 589ab6e807c0..900fa68ef557 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 e269b4406137d47c45fcbb0b523c579616999c04..f7787437072c2e5a189a9388bb0e061507c34f3b 100644 +index 9d8b2abadfca888982b3d7b28a172a4c2e4dff20..7858e9a373013c3cca45fdf47e0d43a99f8732a3 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1293,3 +1293,4 @@ chrome_java_sources = [ +@@ -1294,3 +1294,4 @@ chrome_java_sources = [ "java/src/org/chromium/chrome/browser/webauth/authenticator/CableAuthenticatorActivity.java", "java/src/org/chromium/chrome/browser/webshare/ShareServiceImplementationFactory.java", ] diff --git a/patches/chrome-android-expectations-lint-suppressions.xml.patch b/patches/chrome-android-expectations-lint-suppressions.xml.patch index f25f3172e74c..3aa1619bb5ff 100644 --- a/patches/chrome-android-expectations-lint-suppressions.xml.patch +++ b/patches/chrome-android-expectations-lint-suppressions.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/expectations/lint-suppressions.xml b/chrome/android/expectations/lint-suppressions.xml -index 34e1f3da8338897e4c654e79d807c1f62d0686ee..549c0b6393313bb59192797f67701c178a9bdbb8 100644 +index 57d9b134dbe5be0cac2369c335533d11f81405d5..f62097a08f2cbf4f54978c83e7418af68b1f7508 100644 --- a/chrome/android/expectations/lint-suppressions.xml +++ b/chrome/android/expectations/lint-suppressions.xml @@ -122,6 +122,7 @@ https://chromium.googlesource.com/chromium/src/+/main/build/android/docs/lint.md diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index 7aaf155d0deb..3cc4180417a1 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index 9f626de0f550b7acef758dced8fc54a26a6a1db2..90551a1515976040b1a1e05089c0677957d4d6af 100644 +index a0039bbb77ede9fded776e13359ce2c52c56f15f..cf0577c7eb0175970562242bcf9df1062d223280 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2242,6 +2242,7 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -384,7 +384,7 @@ public abstract class ChromeActivity private boolean mLastPictureInPictureModeForTesting; protected ChromeActivity() { 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 dab0fdc3ec5a..e3aeb07af324 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 3d4c1eee419af6504a6b9b3ad257a184f489f873..5ae5949c6f885bc59f7d4cdca02339a79a176ffa 100644 +index 11a5c4d25d8f9c73a56d10ed8950623aeeefdf8b..c4ecb2aaa978369351670706018fe9b3c5152953 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 -@@ -405,6 +405,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -404,6 +404,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC if (mCurrentLocationBarColor == color) return; mCurrentLocationBarColor = color; mLocationBarBackground.setColorFilter(color, PorterDuff.Mode.SRC_IN); @@ -10,7 +10,7 @@ index 3d4c1eee419af6504a6b9b3ad257a184f489f873..5ae5949c6f885bc59f7d4cdca02339a7 } /** -@@ -524,6 +525,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -521,6 +522,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED); } } @@ -18,7 +18,7 @@ index 3d4c1eee419af6504a6b9b3ad257a184f489f873..5ae5949c6f885bc59f7d4cdca02339a7 } @Override -@@ -693,6 +695,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -690,6 +692,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() { @@ -26,7 +26,7 @@ index 3d4c1eee419af6504a6b9b3ad257a184f489f873..5ae5949c6f885bc59f7d4cdca02339a7 return Math.max(mToolbarSidePadding, mToolbarButtonsContainer.getMeasuredWidth()); } -@@ -2129,6 +2132,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -2124,6 +2127,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC } else { populateUrlClearExpansionAnimatorSet(animators); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch index cbd083eded53..b6d6d5aa44e2 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -index ce0ea0b4c7022f16105513555a13a8a0b1a00ed0..3ed6ad46619ddbe626a41b9cc2719fe7fef0b7d0 100644 +index fa1428c1b24a55d2340420ed51f88a11a75df1d9..669d040f17aa198dc772e730b307d454f899727d 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java @@ -60,7 +60,7 @@ import java.util.Collection; @@ -9,10 +9,10 @@ index ce0ea0b4c7022f16105513555a13a8a0b1a00ed0..3ed6ad46619ddbe626a41b9cc2719fe7 -public class ToolbarTablet extends ToolbarLayout +public class ToolbarTablet extends BraveToolbarLayout implements OnClickListener, View.OnLongClickListener, TabCountObserver { - private HomeButton mHomeButton; - private ImageButton mBackButton; -@@ -316,10 +316,12 @@ public class ToolbarTablet extends ToolbarLayout - DownloadUtils.downloadOfflinePage(getContext(), getToolbarDataProvider().getTab()); + /** Downloads page for offline access. */ + public interface OfflineDownloader { +@@ -327,10 +327,12 @@ public class ToolbarTablet extends ToolbarLayout + mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab()); RecordUserAction.record("MobileToolbarDownloadPage"); } + super.onClick(v); @@ -24,7 +24,7 @@ index ce0ea0b4c7022f16105513555a13a8a0b1a00ed0..3ed6ad46619ddbe626a41b9cc2719fe7 String description = null; Context context = getContext(); Resources resources = context.getResources(); -@@ -385,6 +387,7 @@ public class ToolbarTablet extends ToolbarLayout +@@ -396,6 +398,7 @@ public class ToolbarTablet extends ToolbarLayout textBoxColor, PorterDuff.Mode.SRC_IN); mLocationBar.updateVisualsForState(); diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index 650704fa8515..20ff3cdb8b59 100644 --- a/patches/chrome-app-BUILD.gn.patch +++ b/patches/chrome-app-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn -index ba75492c91e32506d359aa1f0d56d4cc35212402..4e783ba8533045dab1ed992b42b08bc21fc144a5 100644 +index 89d91f4786ee5af6e639194dc216bd19a7657380..0421f6108de87bb81de0ccedd5df31c1ac0b3bd7 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn @@ -84,6 +84,8 @@ grit("generated_resources") { diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index a9f7bc5ef87b..fe62aeeed4e4 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 ace7270498413620140dfe89246bead14bc08b0c..3edc7e4c06e88a1272d8f8424126700837b88039 100644 +index c77a5d0e3eb23fcb6940b333b9eb8e472be0f601..af1ae2735313fae7eea6fc3d2078b45908f88509 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2460,6 +2460,7 @@ static_library("browser") { +@@ -2456,6 +2456,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 8a249529836b..2de6391ef236 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 f1a4e18ad7588aea782297f0bbecd6092258488c..408439ad3f46a769c848f9179a446d1892843fd4 100644 +index 321e71e86187f8346679ebfe118345caea8a8f0b..19362b8414e0fc1ec490d1727a3408e93486e382 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -311,14 +311,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -312,14 +312,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, @@ -21,7 +21,7 @@ index f1a4e18ad7588aea782297f0bbecd6092258488c..408439ad3f46a769c848f9179a446d18 const FeatureEntry::Choice kLiteVideoDefaultDownlinkBandwidthKbps[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -7296,6 +7296,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7336,6 +7336,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 19a36cc1df8c..8523467efac0 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 32e2dd57a441cb1e84da499e7b236ed6ee545ffe..5a95713e5e0d411de19be9cd521eb2794719bfcb 100644 +index aecfb67c06e5da3f51a081470a4ba846874a90a1..84f60b176b9c01f187547ae11ba5b2d5ef0b4ace 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h -@@ -754,6 +754,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { +@@ -752,6 +752,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { } private: diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index 44d70dd9f335..cd49492e3eae 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 ed3363ad668d2f56a7040222d447ff516d0303ee..5af7f45f2d96f4ce324ba4a4fd6e891955ac5490 100644 +index 705a7e4413e86b080a4855d118cd98db887c964e..04630064f77f2fcef8f8f8c5a6a7b63785396926 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1309,6 +1309,7 @@ static_library("extensions") { +@@ -1332,6 +1332,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 1c80036de978..a298e3a2988f 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,5 +1,5 @@ diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc -index 0947c538f3a4603f49205d112237e6bf38522660..e140ca5fc2e18d75cdda4eb83ea8ec1ea9239b25 100644 +index 3d017d7c0f86e3a538e855f23344c256103ebfa8..03249bccb2271aeaed8c05e5c4c54abb7e051340 100644 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc @@ -144,6 +144,7 @@ ChromeComponentExtensionResourceManager::Data::Data() { diff --git a/patches/chrome-browser-extensions-extension_tab_util.cc.patch b/patches/chrome-browser-extensions-extension_tab_util.cc.patch index 8ea0ce3b3f04..b90b9c0c0ba7 100644 --- a/patches/chrome-browser-extensions-extension_tab_util.cc.patch +++ b/patches/chrome-browser-extensions-extension_tab_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc -index 5bc2d640f26bccf523b25651d3ea8d3a75d37924..86f9c25b38407adbd7b8f3ac5e6bc78733e5f0d8 100644 +index 1d3c4d4171e0cc6828ff857e37e68c3dcdeceb61..82b80dd901a05a3b91af87f620f9c97e55060fa6 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc -@@ -793,6 +793,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) { +@@ -794,6 +794,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) { }; if (!url.SchemeIs(content::kChromeUIScheme)) 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 262b57df979d..93edc36b0f8f 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 27aaf592961c9f583cbccc3ab88e029111cb445c..840593e04e675c2d76f3f37f88425950263147f0 100644 +index a30cd2b7e34af83cede3dddf8ab300f01ea9bba0..992b2e3cc937cca8a5892f894924b726ff4c5790 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -321,6 +321,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -322,6 +322,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 77f6d7c3ee27..92b24db83821 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 4ecdb061de976a279580c87e05faceff64a0b6d0..90d2e370f623b2668c07005b206121d7e55e5da3 100644 +index 5abb1d1ff8c9d48d61448bcfe40a3ec2fa52988b..8f04fb4c25e20621e220b2486356b218b7601247 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -950,6 +950,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -986,6 +986,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 4ecdb061de976a279580c87e05faceff64a0b6d0..90d2e370f623b2668c07005b206121d7 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1241,6 +1242,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1278,6 +1279,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif RegisterProfilePrefsForMigration(registry); diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index 50e110ca35e1..08456ba1af8d 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 9bd7f952e93ca1154cbdfeea58ec054b71ab2f1f..bdfda250966fed88dadc4def7eb093f405bd738a 100644 +index dd0192c2e6473eb7ae45c8d94c3ab198059fab81..1b16a3595c4c291b22c45a4695968c4114db9f74 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -407,7 +407,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch index 7f13009fd386..68da02e3b8ae 100644 --- a/patches/chrome-browser-resources-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-resources-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/extensions/BUILD.gn b/chrome/browser/resources/extensions/BUILD.gn -index adc3a4d40e41c8c51689e314018ad22742de34fb..d941348814b7e641b863e8af71c715e07ef266fc 100644 +index 4ef2212e96c9d19b341747148041c135f5fe05c1..bfca2b06e25552fb1b54e372a81f32fedac32038 100644 --- a/chrome/browser/resources/extensions/BUILD.gn +++ b/chrome/browser/resources/extensions/BUILD.gn -@@ -33,6 +33,7 @@ if (optimize_webui) { +@@ -31,6 +31,7 @@ if (optimize_webui) { "../../../../ui/webui/resources:preprocess", ] excludes = [ "chrome://resources/js/cr.m.js" ] @@ -10,7 +10,7 @@ index adc3a4d40e41c8c51689e314018ad22742de34fb..d941348814b7e641b863e8af71c715e0 } } -@@ -54,6 +55,7 @@ generate_grd("build_grd") { +@@ -52,6 +53,7 @@ generate_grd("build_grd") { deps = [ ":build_ts" ] manifest_files = [ "$target_gen_dir/tsconfig.manifest" ] } diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index 44127a23047b..b5619177d531 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 4d90367352cb58494f458b32abf78d4ce0a5b174..51e96ba9dec7c1df940b43c94f1eb1f846f3a451 100644 +index 1e20645dcf315fd2341dda92e1e20a21bbaa1059..59ed3facbfe7bee7fac542a5c0c1c3389039759e 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn @@ -51,6 +51,7 @@ if (optimize_webui) { 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 77e3ee66f043..075a4a15aef1 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 e6238e92375ced17d849fd54239ee25c9787e2c3..d76abffca422a6358d04e4cf3659de8a53d81c45 100644 +index 0e154e5d8c9fae481d02cbf3af2d0a98d1b7b756..b7d4aca9c368e3bb6f7233b8e139c57ae5e589ca 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -29,6 +29,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings.js.patch b/patches/chrome-browser-resources-settings-settings.js.patch index 6a03998a502e..e57f47a52043 100644 --- a/patches/chrome-browser-resources-settings-settings.js.patch +++ b/patches/chrome-browser-resources-settings-settings.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.js b/chrome/browser/resources/settings/settings.js -index 53e96ad24f7e4aaf650b7dc5ff2ea86f5790ab8d..bbf2d3aa4f61ff577635270dd3838206fc854cb6 100644 +index 996c180ccb6aafb10dd3d41d9dc2e0019a02fd76..06d3c9873f531435ee302e02b817f2134a1dea19 100644 --- a/chrome/browser/resources/settings/settings.js +++ b/chrome/browser/resources/settings/settings.js @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch index cd470bcd40a6..16d20f1f2427 100644 --- a/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch +++ b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.js b/chrome/browser/resources/settings/settings_ui/settings_ui.js -index b45f56f3edb37c160704344dbc2797b1cf493686..8f94c91e4c220d64e2089c6100c170e16ce959b1 100644 +index d61e6510b9b963b78ecc37f6dc3c047663b468b4..f22bacd066e12e83201a3170b59841ce1b16e1ee 100644 --- a/chrome/browser/resources/settings/settings_ui/settings_ui.js +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.js -@@ -23,7 +23,7 @@ import '../prefs/prefs.js'; +@@ -22,7 +22,7 @@ import '../settings_shared_css.js'; import '../settings_vars_css.js'; import {CrContainerShadowBehavior} from 'chrome://resources/cr_elements/cr_container_shadow_behavior.m.js'; diff --git a/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch b/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch index 487980b8e311..fb2d223dde5d 100644 --- a/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch +++ b/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc -index 1a8577dd06730e04c8d213a1268d9205d7ca1430..3f2b87167c89350520ba06af76ff3eee14b403bb 100644 +index a5841ae9b891f6f9b9ce73c599ca5e18904ed8ad..d6cf1d4e5a67eccd010313618b5ad38bf6eab60c 100644 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc -@@ -319,6 +319,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt( +@@ -318,6 +318,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt( std::unique_ptr request) { client_download_request_ = std::move(request); SanitizeRequest(); diff --git a/patches/chrome-browser-sync-sync_service_factory.cc.patch b/patches/chrome-browser-sync-sync_service_factory.cc.patch index b7be00deee30..37a4b3ab0b49 100644 --- a/patches/chrome-browser-sync-sync_service_factory.cc.patch +++ b/patches/chrome-browser-sync-sync_service_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc -index aa731d5fa2b02c9214cc6a37123320ebff9c444a..8b6855efa8719ac43bbbd288203d54c2552dfe44 100644 +index eee83377db5f986a96c8339afa2deab0b57709ff..5af3d1a11f4c094857d7774b809b9161e1cafbe0 100644 --- a/chrome/browser/sync/sync_service_factory.cc +++ b/chrome/browser/sync/sync_service_factory.cc -@@ -273,7 +273,7 @@ KeyedService* SyncServiceFactory::BuildServiceInstanceFor( +@@ -189,7 +189,7 @@ std::unique_ptr BuildSyncService( } auto sync_service = diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 34897c348f79..5601c8186858 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 51f072eeae4504d8baf7ff3be8cdc053f8b659fb..cb5fe375e734d81f988a41f4ebfd0366306096a2 100644 +index 6436ea292565707f25a357ba3cc541198d9e9a7f..fb816089bd33b0a9733a15d9cbb2e14943e2ec4c 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -611,6 +611,7 @@ static_library("ui") { +@@ -609,6 +609,7 @@ static_library("ui") { "//ui/webui/resources/cr_components/most_visited:mojom", "//v8:v8_version", ] @@ -10,7 +10,7 @@ index 51f072eeae4504d8baf7ff3be8cdc053f8b659fb..cb5fe375e734d81f988a41f4ebfd0366 # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -3447,10 +3448,13 @@ static_library("ui") { +@@ -3453,10 +3454,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index 0330d67e6f12..69361aea6800 100644 --- a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn -index f09e189f6e72f07703c8538aeed22c358a4a3c18..a2c3a61e71defc004e9935c739377e2573531013 100644 +index e14df2c76b65e700936982f55c8cda37e785391d..ea3347d7d780b4a5c4b1b7ff3844f42e22fcaace 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -64,6 +64,7 @@ android_library("java") { +@@ -65,6 +65,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java", "java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java", ] diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 328f1228d87c..593a9feb8395 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 049d34f2785db516c28bfb4372224aa8e4b6f1a0..364a62d562fbc693f309555120b707e96d37b023 100644 +index 8a1af8eb8efd51d51e9ea4155dc55a493673a74b..568629ec3b016a594aab95eb5e286ab6d1d5d921 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -441,6 +441,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { +@@ -440,6 +440,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { // static Browser* Browser::Create(const CreateParams& params) { CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -10,7 +10,7 @@ index 049d34f2785db516c28bfb4372224aa8e4b6f1a0..364a62d562fbc693f309555120b707e9 return new Browser(params); } -@@ -452,7 +453,7 @@ Browser::Browser(const CreateParams& params) +@@ -451,7 +452,7 @@ Browser::Browser(const CreateParams& params) tab_strip_model_delegate_( std::make_unique(this)), tab_strip_model_( 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 d9b911e38b15..d2441e413e3d 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 b9fade99e7fe0c8d23fd20672ffae88c5e5fe3fc..100ecfbc28bfa4c84667e4a0da461ab169d7299d 100644 +index f96f9080d0c84235c45e4ef377278d392739322c..fba4f16f60f2446a6a7da7873da199d4e661f3c0 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -600,6 +600,7 @@ class TabStripModel : public TabGroupController { +@@ -602,6 +602,7 @@ class TabStripModel : public TabGroupController { // Serialise this object into a trace. void WriteIntoTrace(perfetto::TracedValue context) const; diff --git a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch index 32197faf408c..600ae17fa5b5 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc -index c564cacec15a23955b9353b4e62d0111fb52d0e5..479b1287ca79f4b25071a3a764cfe55c9aa7a5c0 100644 +index b36090fb7ecb49cece5fd10e1ecb8b3a5436b432..09af745a47167c81457d985a415f0929f998ff9c 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc @@ -469,6 +469,8 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { diff --git a/patches/chrome-browser-ui-views-frame-browser_view.h.patch b/patches/chrome-browser-ui-views-frame-browser_view.h.patch index a88a2fef9383..0a5c04fdc72d 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view.h.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h -index 0611981d8eafd03e16011775a172fc6a4192485d..9c0466747a56826f9e33baba5d39d5bb4d0a460b 100644 +index 52a17e3e33beffb48402bf4eb99c45656a142ef2..212eb42b4efade8bdf08dbf48787d3126d790178 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h -@@ -656,6 +656,7 @@ class BrowserView : public BrowserWindow, +@@ -657,6 +657,7 @@ class BrowserView : public BrowserWindow, return accessibility_focus_highlight_.get(); } diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 538e19118470..739ceca2b514 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index eab58689553750700f0b770910cd47c9dc28b8b4..99b56213735795497eecc4b33c2ba4eacb14b243 100644 +index 31ba3d1198e216b04cc6bdeb0eb8c3956023c163..60342006b734b1f1a91e2e890a658a1bde4fbdd6 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -341,6 +341,7 @@ void ToolbarView::Init() { +@@ -342,6 +342,7 @@ void ToolbarView::Init() { } else { // TODO(crbug.com/932818): Remove this once the // |kAutofillEnableToolbarStatusChip| is fully launched. diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch index fad45e3e3bcc..6080eede2985 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h -index 89ab036296e5b20963f321f62ec55915d5adb518..45e3bcfa8e89bd45da83a6b7b453af1fd2f90530 100644 +index 8346b612cfbe61a420ee0f4a1c2ceb168086b365..a1a6efd5363e951033230fbbe20454409b232203 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.h +++ b/chrome/browser/ui/views/toolbar/toolbar_view.h @@ -96,12 +96,14 @@ class ToolbarView : public views::AccessiblePaneView, 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 f756a357b229..205fb3488075 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,8 +1,8 @@ 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 834c70bf6d188591ee1fc92ef87b0eda6b498279..f9023adc5cff24977dd6e7865dfb7e16b55dcd51 100644 +index d6761fb2cfe4cd53d00dd99d5eb3a3a9302bd612..9bc3da7460a8a96d07beccd8df066f7e0f113f80 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1191,6 +1191,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1194,6 +1194,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { 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 fb5712fdd59b..f1d05d6b38bd 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 f81af2211672a162fefd6c7b703f6335c807bf49..f30f10e6b710152f9ebbf5418ef006b68c95521e 100644 +index e6a03892663fa0a11a378d1b1a4a3681c9a5f7a3..4e8dcbab605dd4090b9215adb46a02072ae6b6ce 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2729,6 +2729,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2734,6 +2734,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index 01d4e06fb92d..462285926ae4 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index 195f082ff6d37c19e37d18170909126c0a8fc47b..4003c4e1ada82097969f7a78eaefc36ed826f06a 100644 +index e2891369fb49ee27eb139a210375bc3f1608440b..3b2063730667edea343698e24342ed36f7c7a780 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -85,6 +85,7 @@ source_set("channel_info") { +@@ -86,6 +86,7 @@ source_set("channel_info") { } else if (is_posix) { sources += [ "channel_info_posix.cc" ] } @@ -10,7 +10,7 @@ index 195f082ff6d37c19e37d18170909126c0a8fc47b..4003c4e1ada82097969f7a78eaefc36e } source_set("ini_parser") { -@@ -546,6 +548,7 @@ static_library("non_code_constants") { +@@ -545,6 +546,7 @@ static_library("non_code_constants") { "//printing/buildflags", "//ui/base:buildflags", ] diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 45f4234494b1..5dabfc3ea128 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 1cc080a2ba6981dce94b0c063708d9e311e88fdc..e0107b244e8acf464a5b4189845655e913e23bf6 100644 +index 2019ac2a1eb1854084a79388813ec4fc3cbdd442..8503cea7e000af149df78b22fc73411b8ef6d6af 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -234,6 +234,7 @@ static_library("renderer") { +@@ -235,6 +235,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 04360821156e..3ed28161cf0d 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 89f15b443f97a98c6472aef2f2c8062ab70b3a9f..387b57d235c27aea3a275f1129fc2546c7554405 100644 +index e427301090fc83c7dd8fb0c7d905e76ea988ed9a..b9b1d3df251913953ee5253c9dcabce11f235b7d 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -523,7 +523,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -522,7 +522,7 @@ void ChromeContentRendererClient::RenderFrameCreated( ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 4d53491cea0f..ef81767e0e75 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 f65d94d4bf7cf9d8d91fe7520599fcae95af5bd6..09f7568a20fe077dcda39770eb89ee3808905ed7 100644 +index f51ad2e7b6df421c902c61b5c0f0d3c4ca541cb1..0b3ca7925595a742db6d45fe06a68ebe540bbfca 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1239,6 +1239,7 @@ if (!is_android) { +@@ -1235,6 +1235,7 @@ if (!is_android) { "//v8", ] diff --git a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch index d5be97527d62..014da5e33499 100644 --- a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index 692dc9fd7c5820fc8931cab745e81c21e3dba1eb..2377ee444a5ee8712b970d85af868bfc028eed0d 100644 +index 4445900c8a7a544f7f5cce557f94cc3ce589a3c0..fb4b4b90e06465b02e9a676b0bf13afcc413dbb5 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -622,6 +622,7 @@ void ContentSettingsRegistry::Init() { +@@ -623,6 +623,7 @@ void ContentSettingsRegistry::Init() { ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::PERSISTENT, ContentSettingsInfo::EXCEPTIONS_ON_SECURE_AND_INSECURE_ORIGINS); diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch index e5101d143f24..650603f00967 100644 --- a/patches/components-history-core-browser-history_types.h.patch +++ b/patches/components-history-core-browser-history_types.h.patch @@ -1,5 +1,5 @@ diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h -index 66f2e3e36cb8945c4f0a15d10e61dbc89e9e4ee8..1f1b058f7f0115eabf38c69ab8d0357519158655 100644 +index 1710dc0d4c98ba840789490158285586f6b01fc0..be8e40f5289ae6e142afc44bcc474779c2ed8f1c 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h @@ -49,6 +49,8 @@ enum VisitSource { diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index 6bb26a92e463..bd48411c133a 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 62ef6cabd2fd33535d8f9bf7d31a632dd4de007b..b04d53d39746dd0ba610cb54da73cb95a47e1d78 100644 +index c41f5035c812183311ee588c1253b9fd06a60f9b..4ddba2b929f7de08b27e06fb94a59aa5661ab822 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -272,6 +272,7 @@ static_library("browser") { +@@ -273,6 +273,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] diff --git a/patches/components-page_info-BUILD.gn.patch b/patches/components-page_info-BUILD.gn.patch index 2bdbfab6967e..fe2c71f123f6 100644 --- a/patches/components-page_info-BUILD.gn.patch +++ b/patches/components-page_info-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/page_info/BUILD.gn b/components/page_info/BUILD.gn -index 17371dc77e439256ec1adad5d993ab7e3778cdaa..a3aea553872c6eca70d9fa09618ccce97beb4b8c 100644 +index 090e99cf272e59c744598c5ce121bc9cd7aec590..cbdc37eb8f8cbdc5e9b2b46f0396937e04e75dbb 100644 --- a/components/page_info/BUILD.gn +++ b/components/page_info/BUILD.gn @@ -43,6 +43,7 @@ static_library("page_info") { diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index e48403cfb930..54e946a0e8ea 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 875820b849b0cfc6da64213fb7a72cf311bfb7a6..7d090973551584c89563b2385e8bc8efdd86f36c 100644 +index 3ff1308b8f9dad34e24788d00e3dcea9f7d03d2a..124210469167e465497e164d5b802bdd6fb5537d 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -979,6 +979,7 @@ void PageInfo::PresentSitePermissions() { +@@ -988,6 +988,7 @@ void PageInfo::PresentSitePermissions() { } } 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 22c8cfd40b4f..97f08f3b8ded 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 624b0f54d004f8cf32789212754621473c758395..0125ee6e7c082278cf6de906351f3772a9c3eb90 100644 +index a39936e3425859097e859e94dfb4d19433e88a6a..874904b4452a85916ac4da2b7362758d523551bb 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc -@@ -2037,6 +2037,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( +@@ -2045,6 +2045,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( EncryptionResult result = InitPasswordFormFromStatement( *statement, /*decrypt_and_fill_password_value=*/true, &primary_key, new_form.get()); diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index 7e254472306a..16ecfe0cee5d 100644 --- a/patches/components-permissions-BUILD.gn.patch +++ b/patches/components-permissions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn -index 51b1cae4cf796e6b3e65e1af12d93cb03a22da89..9d50f092098044366a25d6585046dd1b8274f296 100644 +index 224170f8596e4fda79c03d14621114f8aaefb42b..46b9db131f0c97c3b74a07bc4081625cfcc5af22 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn -@@ -122,6 +122,7 @@ source_set("permissions") { +@@ -124,6 +124,7 @@ source_set("permissions") { "contexts/geolocation_permission_context_mac.h", ] } diff --git a/patches/components-permissions-android-BUILD.gn.patch b/patches/components-permissions-android-BUILD.gn.patch index 62e9a6d1cb43..64fbba01d7bd 100644 --- a/patches/components-permissions-android-BUILD.gn.patch +++ b/patches/components-permissions-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/android/BUILD.gn b/components/permissions/android/BUILD.gn -index 3ff25d2e2d3191911e47dd8fbe50df35666176bc..059f56e414592371c50784bd8456400df8071a03 100644 +index 8ac239febaa96ad8ef3ae3227c0a0159c253f450..fb9839266b63f0e1f9f2b28c3d398e191f385a15 100644 --- a/components/permissions/android/BUILD.gn +++ b/components/permissions/android/BUILD.gn -@@ -101,6 +101,7 @@ android_library("java") { +@@ -126,6 +126,7 @@ android_library("java") { "java/src/org/chromium/components/permissions/nfc/NfcSystemLevelPrompt.java", "java/src/org/chromium/components/permissions/nfc/NfcSystemLevelSetting.java", ] diff --git a/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch b/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch index 37645f42e1ff..64c76b6243a2 100644 --- a/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch +++ b/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/safe_browsing/content/browser/client_side_model_loader.cc b/components/safe_browsing/content/browser/client_side_model_loader.cc -index 4af8f484bb2dc04970c51f76ae015c10380f4802..0738b1d3a4c1bc5d35fe730d4a3d3f096bf5f77e 100644 +index 8f7e3fb9bb9f7368e90a481454253b98605cc226..330caad55c89b67aad1c7d994be073de91b6b054 100644 --- a/components/safe_browsing/content/browser/client_side_model_loader.cc +++ b/components/safe_browsing/content/browser/client_side_model_loader.cc @@ -61,7 +61,7 @@ std::string ReadFileIntoString(base::FilePath path) { diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index 2a4c721bd472..de6f4955654d 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 e6235ee6991d1f8b66524654301b1c7e6e2a4f54..4f7e55552a3574cf6fbb1b16230a077217809014 100644 +index 51974ad6471c1ff9117ce7ddde6dc84a1a6357c7..6fa9189cb2e134973453dc976e2a9ea079fa091d 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h -@@ -389,6 +389,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -390,6 +390,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT(manufacturer); VISIT(last_updated_timestamp); VISIT(feature_fields); @@ -10,7 +10,7 @@ index e6235ee6991d1f8b66524654301b1c7e6e2a4f54..4f7e55552a3574cf6fbb1b16230a0772 VISIT(sharing_fields); VISIT(invalidation_fields); VISIT(paask_fields); -@@ -401,6 +402,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { +@@ -402,6 +403,7 @@ 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 637b46809d31..84de992cc4f0 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 2c1534b8d7e0d29c00a9b025ed432fc1ce76f10f..ded36a0a42290f0ece6f4930a160f82e88c428b2 100644 +index 5fe3bf1f5b3df84a756224fe3eb7c1d3b095dca0..7a1e218bec38364b111175497a9fa7b51d694ca0 100644 --- a/components/sync/protocol/protocol_sources.gni +++ b/components/sync/protocol/protocol_sources.gni -@@ -75,3 +75,4 @@ foreach(base, sync_protocol_bases) { +@@ -76,3 +76,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.h.patch b/patches/components-sync_device_info-device_info.h.patch index cce096af30e8..bd7d048e14f8 100644 --- a/patches/components-sync_device_info-device_info.h.patch +++ b/patches/components-sync_device_info-device_info.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync_device_info/device_info.h b/components/sync_device_info/device_info.h -index 832bc5eb8f65941061b5d3efd0a59c90b8f6f295..7e9590f96a32adc8eff72b9705d149a9deafb723 100644 +index fbaa5c9b1b2ec5184372058be00c890d2e565428..f93da86da5aaf60526d56adc78e1b4fa63b5b9a6 100644 --- a/components/sync_device_info/device_info.h +++ b/components/sync_device_info/device_info.h -@@ -109,6 +109,7 @@ class DeviceInfo { +@@ -112,6 +112,7 @@ class DeviceInfo { const absl::optional& paask_info, const std::string& fcm_registration_token, const ModelTypeSet& interested_data_types); 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 4b957fb73c37..577af4d99641 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 5d56e530777392c6e0846f4ad4c3f281e6e67962..2421ab2c36f0120ee70bf464423cf53b742c55fe 100644 +index f97d419ed5991d027dde43682022c3e8220f7959..63bd7569eaaf3d6b1aaf156caf4394b6f33e6b08 100644 --- a/components/sync_device_info/device_info_sync_bridge.cc +++ b/components/sync_device_info/device_info_sync_bridge.cc @@ -258,6 +258,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( @@ -10,7 +10,7 @@ index 5d56e530777392c6e0846f4ad4c3f281e6e67962..2421ab2c36f0120ee70bf464423cf53b return specifics; } -@@ -402,7 +403,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( +@@ -429,7 +430,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( // Each device is the authoritative source for itself, ignore any remote // changes that have a cache guid that is or was this local device. if (device_info_prefs_->IsRecentLocalCacheGuid(guid)) { 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 67ab4f8de943..1363f0a745b8 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 b57bb2b6fa4457157af5b90d702b739826bcffcb..383b37fab86d17f5422ab865443dc32e6dc27ef1 100644 +index 95915dfbd3f3c1ffa354d8220f7075f4658bd177..5265d4cd04ec8f60b4cc69598ba1ed0e2f03e78a 100644 --- a/components/sync_device_info/device_info_sync_bridge_unittest.cc +++ b/components/sync_device_info/device_info_sync_bridge_unittest.cc -@@ -901,7 +901,7 @@ TEST_F(DeviceInfoSyncBridgeTest, ApplySyncChangesWithLocalGuid) { +@@ -911,7 +911,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/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index 314632fec80b..6467233a2f92 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index fb118bd70df304374f6b6baedfaca2b2c243ecfa..fe810e413ba596ae6d5cdd5abec47344150e491b 100644 +index 4f88ba8bae251e26fd53157ffda484e3cfd16b9d..652d50d93d2bb5ff60cddb615dbbe9992f0d6ebc 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3136,16 +3136,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3119,16 +3119,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 6aac8bd54fb3..b1f6ed4addce 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 827dfe863389d029aa273d5e9ae2ed8b7de9876b..d52afc86aeab8f8d70c1e0eb76ee447d8448da40 100644 +index 184725fff60669184e051b5414b917c79706efbe..001c912eaec7be5dc8006ec2f66153afc44fa950 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2189,6 +2189,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2204,6 +2204,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 827dfe863389d029aa273d5e9ae2ed8b7de9876b..d52afc86aeab8f8d70c1e0eb76ee447d common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -3359,6 +3360,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -3387,6 +3388,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index f76d77f655d7..f84fafd93ab8 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 4fea169ce6d9cfa12bb695e8fe5f0c5c4e0f7952..5aa7932249ba7423d642c54b15f71f0e1e3ee88c 100644 +index c55ec4f5a15f0c4d8abc318cc3de7100813dbe8c..bebe57d28b6d90874a05bd0de269efb588b20594 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -42,6 +42,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 80e3e8985abf..ef1a4e6525c1 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 57947a93614a66892ddcc1e7a03d1a9afa87d5f1..c07ac32d4c53861b924008fae9bfe35f52122f8f 100644 +index 6000d0326898e33cdf4b311c88e5400d8be71ed2..9bdfacc581b1c98b73908accf8544991c3b35f68 100644 --- a/content/public/browser/content_browser_client.h +++ b/content/public/browser/content_browser_client.h -@@ -1860,6 +1860,7 @@ class CONTENT_EXPORT ContentBrowserClient { +@@ -1854,6 +1854,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 5d1ad2270651..ba94a646636e 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 43276a29e2015d6200d64c730d77bbb4a6c37cf6..d71e3a759500d9d71665d848a88664bd3be11b8b 100644 +index 9ae95b8118e37e22d6faddf62cd06b182d2033db..891aa4e0a5468a085fe8a79fe23d267b73ccbd18 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4367,6 +4367,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4456,6 +4456,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) 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 7e647074b53b..3ab11bfd45af 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,5 +1,5 @@ diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc -index 0e2f0e28f15c9172c0621e70c34f752662c2a478..de819f5428982ce83f9a08ac81b25ea7853f7fb0 100644 +index 43f1a286fc0a5cc0689cd8a29e9ccb9a10b9da61..85896f5e9a6c6faf5f15eb9f94ab4698758f4c99 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc @@ -1300,6 +1300,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( diff --git a/patches/extensions-common-api-_api_features.json.patch b/patches/extensions-common-api-_api_features.json.patch index d1ef6567d5d8..84415972b8b0 100644 --- a/patches/extensions-common-api-_api_features.json.patch +++ b/patches/extensions-common-api-_api_features.json.patch @@ -1,8 +1,8 @@ diff --git a/extensions/common/api/_api_features.json b/extensions/common/api/_api_features.json -index 725c27e6ada9a8f6cf2338921f5f33b51179ee1c..363817f8d6c9aa1cc8894a57b50a55286fac0f0a 100644 +index ba741dfdbc766f3301cd279735dd1ff71b723aeb..c387625867a075114259054e6f2eacc27620ad24 100644 --- a/extensions/common/api/_api_features.json +++ b/extensions/common/api/_api_features.json -@@ -526,6 +526,7 @@ +@@ -527,6 +527,7 @@ "matches": [ "chrome://password-change/*", "chrome://file-manager/*" diff --git a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch index 8de44cdd872e..e2f1e62c8537 100644 --- a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch +++ b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm -index ae6e4b43615b4580619af8d23f563f9c78bc57ac..49e0670f1437adb85643b11d2fe0a3b5baad2b71 100644 +index b59505129fe91f3f91333c220f536fc59c80f47a..f58b016b1ff58f55c0c2b1b66e7945937233d47f 100644 --- a/ios/chrome/browser/prefs/browser_prefs.mm +++ b/ios/chrome/browser/prefs/browser_prefs.mm -@@ -260,6 +260,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -262,6 +262,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterIntegerPref(kPasswordManagerOnboardingState, 0); registry->RegisterBooleanPref(kWasOnboardingFeatureCheckedBefore, false); registry->RegisterDictionaryPref(kDomainsWithCookiePref); diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch index 4dfadfffe3b9..0b2d89ee1dc2 100644 --- a/patches/net-cookies-canonical_cookie.cc.patch +++ b/patches/net-cookies-canonical_cookie.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc -index d99dc66115fb46625289af3388f4a9bf941a22c6..098c44421c53ca333ccbdc764fc582465b86cfc7 100644 +index 59ad668988d036c52da34a8638355b37bd857a3a..81bb646467f2f3db2c4f65be6d0e0e11de2e492e 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc @@ -459,6 +459,7 @@ std::unique_ptr CanonicalCookie::Create( 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 d83109d345ad..4c777e4c6203 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 3cb2253ae8003c814704cb3502a8e864b983fa83..a320e16ef271677193bed7da9c5e35759188327c 100644 +index 9f0c7e09b19689c81a2fadca326b1958a632aecc..042d3f78e7eb339050aa767679fd689b112ace1f 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2450,6 +2450,7 @@ generated_interface_sources_in_modules = [ +@@ -2460,6 +2460,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.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 c2ce611a99bb..f4c11fe1054e 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 132db2456d8f5cb457dbdc84d5aac8b6902fed04..44eba76efb13d6e26d20a63b70fdbd396d6e74a5 100644 +index 7ee40fcc50803ce344b14964bf5502aef375a2f5..44d6a5e9c8bdc2fd4de0d4182f0ff823ba748990 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1132,6 +1132,7 @@ static_idl_files_in_modules = get_path_info( +@@ -1137,6 +1137,7 @@ static_idl_files_in_modules = get_path_info( "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.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 9c17a152922e..8a0bec12572a 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index 6564708d81f9b5d3b43659faea1b3738c375ae00..172782b18379063305cddd8a291da88385aed162 100644 +index 73edcb3e88be22f9210330d3be4d1f5a7f3e5388..1b2d1fd6db295006c279bc8e4f09f0e2e08ebf70 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn -@@ -174,6 +174,7 @@ component("core") { +@@ -167,6 +167,7 @@ component("core") { visibility = [] # Allow re-assignment of list. visibility = [ "//third_party/blink/*" ] @@ -10,7 +10,7 @@ index 6564708d81f9b5d3b43659faea1b3738c375ae00..172782b18379063305cddd8a291da883 sources = [ "core_initializer.cc", -@@ -279,6 +280,7 @@ component("core") { +@@ -271,6 +272,7 @@ component("core") { "//v8", ] 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 b1d9d7ed9372..ee8edd6cc82b 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 a19eb7684feb09ab382dbee743f3b4950cb1d45e..d2059b1581c79bab927a71fb5ee87b54e1f30b53 100644 +index 6c2a539a519a09c41481a0e82cfe86581be67182..61b0e052560aaf57c9a0dd2c30e370f335183912 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 -@@ -936,6 +936,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -934,6 +934,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index ff036e77e19e..3830f0351147 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index 49946d8ac920facefd63112614d62aca20eb4ff4..a0b2387f87d32bac36fcfdab84230f6c0f6335a6 100644 +index 40847847af68591ab77f689260c8d14e9df8d57b..c5d9a3af5b8f69706b6af2e7bd92c3a88e949a8f 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn -@@ -17,6 +17,7 @@ if (is_android) { +@@ -16,6 +16,7 @@ if (is_android) { } visibility = [ "//third_party/blink/renderer/*" ] @@ -10,7 +10,7 @@ index 49946d8ac920facefd63112614d62aca20eb4ff4..a0b2387f87d32bac36fcfdab84230f6c config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -185,6 +186,7 @@ component("modules") { +@@ -184,6 +185,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 19929a9d3dc0..7e1c733c31cd 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 5e53812a85483a5571f9273c61dbbb6d05d67e10..984c43aeac90ab0859b373da0736634922c9bd81 100644 +index a4ea7de64e8f6a0b17918e1a869af45f3c717e17..9d0a0717d9abedf11336ff5ea3fb50614e256595 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 -@@ -1926,6 +1926,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -1938,6 +1938,7 @@ ImageData* BaseRenderingContext2D::getImageData( } ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index 5e53812a85483a5571f9273c61dbbb6d05d67e10..984c43aeac90ab0859b373da07366349 int sx, int sy, int sw, -@@ -2043,6 +2044,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2055,6 +2056,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } 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 a67976326305..88405450d591 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,5 +1,5 @@ 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 69676393cc7d403579cbd4a65c1c08c973319af0..eb5717363408f7a0652a876424dd1168c2654c58 100644 +index 98694f745c81798de619bebfb36e852e83e5083a..32a8f2ba036045ceb245010d6eb2e6453f6e6186 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 @@ -925,6 +925,7 @@ TextMetrics* CanvasRenderingContext2D::measureText(const String& text) { 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 81764187e6f4..35594fab34a8 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,8 +1,8 @@ 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 634afcccad4c563f46458c876fdf4f8ce828a9e6..b4e35b16eb44f33dd67516bfe97d75fe6a7830f3 100644 +index 1cb922800bef34d2f1940745ed4b847ae176c99f..affb1a45c5fac3c79a3988739eac22868297dd63 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 -@@ -121,9 +121,13 @@ interface CanvasRenderingContext2D { +@@ -123,9 +123,13 @@ interface CanvasRenderingContext2D { [RuntimeEnabled=Canvas2dScrollPathIntoView] void scrollPathIntoView(optional Path2D path); void clip(optional CanvasFillRule winding); void clip(Path2D path, optional CanvasFillRule winding); @@ -16,7 +16,7 @@ index 634afcccad4c563f46458c876fdf4f8ce828a9e6..b4e35b16eb44f33dd67516bfe97d75fe boolean isPointInStroke(Path2D path, unrestricted double x, unrestricted double y); // text (see also the CanvasDrawingStyles interface) -@@ -148,8 +152,8 @@ interface CanvasRenderingContext2D { +@@ -150,8 +154,8 @@ interface CanvasRenderingContext2D { [RaisesException] ImageData createImageData(ImageData imagedata); [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh); [RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); 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 e9ffdf988545..2f00808f53e7 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,8 +1,8 @@ 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 1d56039e8040d4fa7c5444ec465752f0dda1ddeb..2d2720532044ff16a32f1095c472d4a40834b485 100644 +index d710e166a8587eece2fd6e853933c5807e7d414d..875eb2d7ac3641d9280a92cb81dd16e7ab3ffd5a 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 -@@ -76,10 +76,10 @@ +@@ -79,10 +79,10 @@ void stroke(Path2D path); void clip(optional CanvasFillRule winding); void clip(Path2D path, optional CanvasFillRule winding); @@ -17,7 +17,7 @@ index 1d56039e8040d4fa7c5444ec465752f0dda1ddeb..2d2720532044ff16a32f1095c472d4a4 // text (see also the CanvasDrawingStyles interface) void fillText(DOMString text, unrestricted double x, unrestricted double y, optional unrestricted double maxWidth); -@@ -95,8 +95,8 @@ +@@ -98,8 +98,8 @@ [RaisesException] ImageData createImageData(ImageData imagedata); [RaisesException] ImageData createImageData(long sw, long sh); [RaisesException, RuntimeEnabled=CanvasColorManagement] ImageData createImageData(long sw, long sh, ImageDataSettings imageDataSettings); diff --git a/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch index bd7689b2158c..d5f6d0c198b1 100644 --- a/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-csspaint-paint_rendering_context_2d.idl.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl b/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl -index 114ed2167a76842a55ff87277db2f4be02376c33..10af33aae57b7dc97a58607d6e8787d6c1f753c1 100644 +index 8726ee6f54b94a37353d50942c56c14a28a4ccb4..3d4661b523e529006d739c12de69a8d7383a682b 100644 --- a/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/csspaint/paint_rendering_context_2d.idl -@@ -69,10 +69,10 @@ +@@ -71,10 +71,10 @@ void clip(optional CanvasFillRule winding); void clip(Path2D path, optional CanvasFillRule winding); 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 456c9590731d..11576f352ab8 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 649be40f02084f449ea33c349f52941a683a7f5a..806059b4e1ef927957a424b5bc1605c71bae34ee 100644 +index d706480b2ce4c7d3da4c22784da9d040df0dfe20..e09dd620026bd695669e93b059cc9e69d5f6baf0 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 -@@ -5245,6 +5245,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, +@@ -5250,6 +5250,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -10,7 +10,7 @@ index 649be40f02084f449ea33c349f52941a683a7f5a..806059b4e1ef927957a424b5bc1605c7 switch (pname) { case GL_SHADING_LANGUAGE_VERSION: { return WebGLAny( -@@ -5802,6 +5803,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( +@@ -5807,6 +5808,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( if (isContextLost() || !ValidateGetFramebufferAttachmentParameterFunc( kFunctionName, target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -18,7 +18,7 @@ index 649be40f02084f449ea33c349f52941a683a7f5a..806059b4e1ef927957a424b5bc1605c7 WebGLFramebuffer* framebuffer_binding = GetFramebufferBinding(target); DCHECK(!framebuffer_binding || framebuffer_binding->Object()); -@@ -6014,6 +6016,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( +@@ -6019,6 +6021,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 457a9c7e4f9a..bb9714f6f36e 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,5 +1,5 @@ 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 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe560af609f3 100644 +index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9cd92a253 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 @@ -2928,6 +2928,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( @@ -50,7 +50,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3573,6 +3579,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3572,6 +3578,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 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3588,6 +3595,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3587,6 +3594,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 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3680,6 +3688,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3679,6 +3687,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3735,6 +3744,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3734,6 +3743,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3745,6 +3755,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3744,6 +3754,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3796,6 +3807,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3795,6 +3806,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3827,6 +3839,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3826,6 +3838,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3857,6 +3870,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3856,6 +3869,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSample( -@@ -3869,6 +3883,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3868,6 +3882,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 return EnsureNotNull(shader->Source()); } -@@ -3898,6 +3913,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3897,6 +3912,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3932,6 +3948,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3931,6 +3947,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4191,6 +4208,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4190,6 +4207,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4215,6 +4233,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4214,6 +4232,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4292,6 +4311,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4291,6 +4310,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 0df4c02938aed10bfccf6c1ee761f74038927cb7..cfecc0dfbae514f992a6fa045fadfe56 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4639,6 +4659,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4638,6 +4658,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 ac7af6b9ed9f..3dba1679b16b 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 e3addfe13662b37a1ed27ffb5355478515dfa8c6..8e051599f1573652fa73e7676cd38bd95270ae59 100644 +index 7669ab4ed8d048a75c779636cbe4bc43dcf96507..9851dff8c61f44e67ad1806544113857e506bcb8 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -47,6 +47,9 @@ 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 8ec6b6e57c73..f915574cb0f0 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 e6b8943db0915d1b68768c50b123cec65531c052..7df114b65d9a4f491c4c350010a333c719406ebd 100644 +index ce25749a7ada703eaffd40452557b2461965e1bb..dec5e27e1e9c68ebf136a59e1cb36f03a6bc050f 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -14394,6 +14394,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -14407,6 +14407,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. diff --git a/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch index 71657b5ad38b..b7efa213ff65 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_mac.mm b/ui/accessibility/platform/ax_platform_node_mac.mm -index 55ffe6f60b06de3b31513880345619dbd876b8f6..4702d770fd5b170a4db8a76fe80dcc2b25409ff7 100644 +index 0cc1227adb636920ecf44598739a8704dd22dca1..ec9ffe629c8e2dfb2f4f8268b65073660695a6ea 100644 --- a/ui/accessibility/platform/ax_platform_node_mac.mm +++ b/ui/accessibility/platform/ax_platform_node_mac.mm -@@ -1162,6 +1162,7 @@ bool IsAXSetter(SEL selector) { +@@ -1169,6 +1169,7 @@ bool IsAXSetter(SEL selector) { if (!_node) return nil; diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index 33672151585e..6c6d3ceb8e12 100644 --- a/patches/ui-base-BUILD.gn.patch +++ b/patches/ui-base-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index 9155fa3d991649b6883f378d9fe3833b366ce7ec..47b19317b47d5f20b95ef7748ef68abebd5983da 100644 +index 76f3bfb35e2c8dd353115137359921be989945da..cb8b412df31102a19868ed1ce7a6f3b2decce8b9 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -465,6 +465,7 @@ component("base") { From 28022768b28407cdfd0083a8958f8e022deb9373 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 12:35:09 +0200 Subject: [PATCH 081/205] Conflict-resolved patches from Chromium 93.0.4549.4 to Chromium 93.0.4557.4. --- patches/chrome-VERSION.patch | 4 +-- ...e-android-chrome_public_apk_tmpl.gni.patch | 16 ++++----- ...vacy_page-personalization_options.js.patch | 36 +++++++++---------- ...-common-client_hints-client_hints.cc.patch | 8 ++--- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index b2afa033f01c..9043b2ed2ea0 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 8b7fcb0a332de9a4300bcf012f0f92bacd72410b..c5cfdaaa37bdde933d93e031426a28b7344a3a94 100644 +index 9841d1c3695c37516777dcd4ece9da3e53099c7c..c5cfdaaa37bdde933d93e031426a28b7344a3a94 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=93 -MINOR=0 --BUILD=4549 +-BUILD=4557 -PATCH=4 +MINOR=1 +BUILD=30 diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index 9e9fad01ee24..18f371c315c3 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,16 +1,16 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index c5089ddf516cd0576a6710267aa288938ffd6686..182c2672ee321bcb08c55fec1732d94e67d22812 100644 +index 3b81be1be7d054d177649e79f9a27aa22aa41d1b..0a4fdbe4f2b22c51f9b8a635c19a8a0810efc886 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni -@@ -168,6 +168,7 @@ template("chrome_public_common_apk_or_module_tmpl") { - - # Remove unneeded entries from material design values.xml files. - resource_values_filter_rules = [ "${_material_package}:[Tt]oolbarLayout" ] +@@ -149,6 +149,7 @@ template("chrome_public_common_apk_or_module_tmpl") { + "*ic_file_download_white*", # Bottom edge seems misaligned. + "*ic_lock.*", # Bottom edge seems misaligned. + ] + resource_exclusion_exceptions += brave_resources_exclusion_exceptions - if (!_is_monochrome) { - product_config_java_packages = [ "org.chromium.chrome.browser" ] -@@ -248,6 +249,7 @@ template("chrome_public_common_apk_or_module_tmpl") { + # Note most of these, with the exception of resource_exclusion_exceptions, + # are currently duplicated in system_webview_apk_tmpl.gni. +@@ -245,6 +246,7 @@ template("chrome_public_common_apk_or_module_tmpl") { if (!defined(proguard_configs)) { proguard_configs = [] } diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch index 203ebf11313e..b0d1840ba876 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch @@ -1,18 +1,18 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.js b/chrome/browser/resources/settings/privacy_page/personalization_options.js -index 868be6eab0d36ea429d474852aa631a77e14eb1d..26e2be6a3b71ca4ccfad4f2919658f3cd577391c 100644 +index fd6a7b11cda563c1e462d6244cce2b4f01c2be77..de554fbd716054b5cf771034062f7d66173df7d6 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.js +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.js -@@ -54,7 +54,7 @@ Polymer({ - /** @type {SyncStatus} */ - syncStatus: Object, +@@ -66,7 +66,7 @@ export class SettingsPersonalizationOptionsElement extends + /** @type {SyncStatus} */ + syncStatus: Object, + +- // ++ // + // TODO(dbeam): make a virtual.* pref namespace and set/get this normally + // (but handled differently in C++). + /** @private {chrome.settingsPrivate.PrefObject} */ +@@ -125,7 +125,7 @@ export class SettingsPersonalizationOptionsElement extends -- // -+ // - // TODO(dbeam): make a virtual.* pref namespace and set/get this normally - // (but handled differently in C++). - /** @private {chrome.settingsPrivate.PrefObject} */ -@@ -105,7 +105,7 @@ Polymer({ - ready() { this.browserProxy_ = PrivacyPageBrowserProxyImpl.getInstance(); - // @@ -20,27 +20,27 @@ index 868be6eab0d36ea429d474852aa631a77e14eb1d..26e2be6a3b71ca4ccfad4f2919658f3c const setMetricsReportingPref = this.setMetricsReportingPref_.bind(this); this.addWebUIListener('metrics-reporting-change', setMetricsReportingPref); this.browserProxy_.getMetricsReporting().then(setMetricsReportingPref); -@@ -136,7 +136,7 @@ Polymer({ - return /** @type {?CrToggleElement} */ (this.$$('#driveSuggestControl')); - }, +@@ -159,7 +159,7 @@ export class SettingsPersonalizationOptionsElement extends + this.shadowRoot.querySelector('#driveSuggestControl')); + } - // + // /** @private */ onMetricsReportingChange_() { const enabled = this.$.metricsReportingControl.checked; -@@ -186,6 +186,7 @@ Polymer({ - }, +@@ -209,6 +209,7 @@ export class SettingsPersonalizationOptionsElement extends + } // + // /** * @return {boolean} * @private -@@ -234,6 +235,7 @@ Polymer({ +@@ -258,6 +259,7 @@ export class SettingsPersonalizationOptionsElement extends } this.showSignoutDialog_ = false; - }, + } + // /** diff --git a/patches/third_party-blink-common-client_hints-client_hints.cc.patch b/patches/third_party-blink-common-client_hints-client_hints.cc.patch index 56fbeff447dd..d0d780743eca 100644 --- a/patches/third_party-blink-common-client_hints-client_hints.cc.patch +++ b/patches/third_party-blink-common-client_hints-client_hints.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc -index 1610d6110cdf1acc3b6ca1b27d4f9621dd279ebe..1692dd4fcc83c4ec92f90c1b057e03df180e4cdf 100644 +index 831c3bab4201764ebd201f513f0448fbdb0725ca..793ed4d92c3c4a8d2c12c4ac5a35dbea7af6825b 100644 --- a/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc @@ -133,6 +133,7 @@ absl::optional> FilterAcceptCH( @@ -7,6 +7,6 @@ index 1610d6110cdf1acc3b6ca1b27d4f9621dd279ebe..1692dd4fcc83c4ec92f90c1b057e03df bool IsClientHintSentByDefault(network::mojom::WebClientHintsType type) { + BRAVE_CLIENT_HINTS_IS_CLIENT_HINT_SENT_BY_DEFAULT - return (type == network::mojom::WebClientHintsType::kUA || - type == network::mojom::WebClientHintsType::kUAMobile); - } + switch (type) { + case network::mojom::WebClientHintsType::kUA: + case network::mojom::WebClientHintsType::kUAMobile: From d50ebcc8a9780740e69379ec06e2c3cb2321f089 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 16:05:32 +0200 Subject: [PATCH 082/205] Updated strings for Chromium 93.0.4557.4. --- app/app_management_strings.grdp | 9 ++ app/brave_strings.grd | 3 + app/generated_resources.grd | 15 +-- app/os_settings_strings.grdp | 35 +++++- app/profiles_strings.grdp | 6 + app/settings_strings.grdp | 71 +++++++----- app/settings_strings_override.grdp | 4 +- app/url_handler_intent_picker_strings.grdp | 3 - .../strings/android_chrome_strings.grd | 108 +++++------------- components/arc_strings.grdp | 3 + components/autofill_payments_strings.grdp | 15 --- components/flags_strings.grdp | 8 +- components/page_info_strings.grdp | 12 +- components/payments_strings.grdp | 6 +- components/permissions_strings.grdp | 12 ++ 15 files changed, 161 insertions(+), 149 deletions(-) diff --git a/app/app_management_strings.grdp b/app/app_management_strings.grdp index 5de0ef291505..2e9cebf8d48c 100644 --- a/app/app_management_strings.grdp +++ b/app/app_management_strings.grdp @@ -49,4 +49,13 @@ This app has been installed by your administrator. + + Opening supported links + + + Open in $1Brave browser + + + Open in Brave browser + diff --git a/app/brave_strings.grd b/app/brave_strings.grd index 06bfe672cf3f..c2c2063cc061 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -1127,6 +1127,9 @@ Brave is unable to recover your settings. Chrome OS installation in progress + + Installation is in progress. Don't turn off the device. Install should take no longer than twenty minutes. The machine will automatically shut down after installing. + diff --git a/app/generated_resources.grd b/app/generated_resources.grd index d6b3d2bb2606..45f8d83ae7b8 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -6894,6 +6894,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Recently Closed Tab + + Recently Closed Tab Group + Open Tabs @@ -9210,6 +9213,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Location is turned off in Mac System Preferences + + Turn on "Brave" in Location Services on your Mac + Location turned off @@ -10194,18 +10200,9 @@ Please help our engineers fix this problem. Tell us what happened right before y - - No nearby devices found. - $1www.google.com wants to scan for nearby Bluetooth devices. The following devices have been found: - - Allow - - - Block - Unknown or unsupported device ($1A1:B2:C3:D4:E5:F6) diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index a18725417448..36cec614bd49 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -346,6 +346,9 @@ Language used when translating pages + + Language used for translating pages and Quick answers + Offer to translate pages in this language @@ -765,6 +768,18 @@ Off + + Accent color + + + Choose the color theme for Launcher, shelf, Quick Settings, and more + + + Based on your wallpaper + + + Neutral + @@ -812,7 +827,7 @@ Translation - Add your preferred website languages. The top language from the list will be used for translations. + Add your preferred <a target="_blank" rel="noopener noreferrer" href="#">website languages</a>. The top language from the list will be used for translations. Unit Conversion @@ -1221,6 +1236,9 @@ Press an assigned switch to remove assignment. To get started, please make sure your USB or Bluetooth switch is connected to your Bravebook. You can also use keyboard keys. + + Assign switch: Select + Auto-scan enabled @@ -1254,12 +1272,21 @@ Press an assigned switch to remove assignment. Choose how long the highlight should stay on each item + + Assign switch: Next + + + Assign switch: Previous + You're all set! Press your switch when the focus is on the Done button to close the guide. + + Now that you have more switches to navigate, auto-scan has been turned off. Navigate to the Done button and press the Select switch to close the guide. + You can always change additional settings or open the setup guide again from Switch Access settings. @@ -1880,7 +1907,11 @@ Press an assigned switch to remove assignment. Remove from list - + + + Your administrator has blocked some functionality for this device + + Pair diff --git a/app/profiles_strings.grdp b/app/profiles_strings.grdp index 21e538e832ac..48fe432f43eb 100644 --- a/app/profiles_strings.grdp +++ b/app/profiles_strings.grdp @@ -565,6 +565,12 @@ You’re adding a managed profile to this browser. Your administrator has control over the profile and can access its data. + + Your organization requires a profile + + + Create + diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index d8a8110511b1..735d9e08a608 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -959,7 +959,7 @@ Signs you out of most sites. You'll stay signed in to your Brave sync chain so your synced data can be cleared. - Clears history and autocompletions in the search box + Clears history in the search box Clears history and autocompletions in the search box. Your Brave sync chain may have other forms of browsing history at <a target='_blank' href='$1'>myactivity.google.com</a></a>. @@ -2191,11 +2191,23 @@ Not allowed to send pop-ups or use redirects + + Protected content + + + protected content + + + Protected content IDs + + + Allow sites to play protected content (recommended) + - When a site plays content protected by copyright, it might ask to recognize your device + To play content protected by copyright, sites may need to use a content protection service - Sites can ask to play protected content + Sites can play protected content Don't allow sites to play protected content @@ -2203,12 +2215,29 @@ Media with a copyright might not play - - Allowed to play protected content - - - Not allowed to play protected content - + + + Sites may also need to recognize your device using an identifier + + + Allow identifiers for protected content (computer restart may be required) + + + Sites can use identifiers to play protected content + + + Don't allow sites to use identifiers to play protected content + + + Media quality may be reduced + + + Allowed to use identifiers to play protected content + + + Not allowed to use identifiers to play protected content + + Sites can handle special tasks when you click on certain types of links, like creating a new message in your email client or adding new events to your online calendar @@ -2399,10 +2428,10 @@ cookies and site data - Handlers + Protocol handlers - handlers + protocol handlers Location @@ -2488,18 +2517,6 @@ pop-ups and redirects - - Protected content - - - protected content - - - Protected content identifiers - - - Allow sites to play protected content (recommended) - Virtual reality @@ -2515,14 +2532,6 @@ Do not allow sites to use your virtual reality devices and data - - - Some content services use unique identifiers for the purposes of authorizing access to protected content - - - Allow identifiers for protected content (computer restart may be required) - - Recent activity diff --git a/app/settings_strings_override.grdp b/app/settings_strings_override.grdp index 5ce352c9224c..3d798692e042 100644 --- a/app/settings_strings_override.grdp +++ b/app/settings_strings_override.grdp @@ -68,14 +68,14 @@ + + Block third-party cookies in Private While in Private, sites can't use your cookies to see your browsing activity across different sites, for example, to personalize ads. Features on some sites may break. - - Third-party cookies are blocked in Private mode diff --git a/app/url_handler_intent_picker_strings.grdp b/app/url_handler_intent_picker_strings.grdp index a302b3f7a410..b2232835281c 100644 --- a/app/url_handler_intent_picker_strings.grdp +++ b/app/url_handler_intent_picker_strings.grdp @@ -20,7 +20,4 @@ Publisher: $1example.com - - $1Brave, $21 of $32 - diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 5277b00916f6..343de760e234 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -953,9 +953,6 @@ Your Brave account may have other forms of browsing history like searches and ac Last 4 weeks - - Older than 30 days - All time @@ -1245,12 +1242,6 @@ Your Brave account may have other forms of browsing history like searches and ac Your keyboard won’t change - - No thanks - - - Change language - Loading %1$sHindi @@ -1815,62 +1806,6 @@ To change this setting, <resetlink>reset sync

- - - %1$shttps://www.google.com wants to pair - - <link>Get help</link> while scanning for devices… - - - Pair - - - <link1>Get help</link1> or <link2>re-scan</link2> - - - No compatible devices found - - - <link>Turn on Bluetooth</link> to allow pairing - - - Brave is unable to turn on Bluetooth adapter - - - <link>Get help</link> - - - Brave needs location access to scan for devices. <permission_link>Update permissions</permission_link> - - - Brave needs location access to scan for devices. Location access is <services_link>turned off for this device</services_link>. - - - Brave needs location access to scan for devices. <permission_link>Update permissions</permission_link>. Location access is also <services_link>turned off for this device</services_link>. - - - <link>Get help</link> - - - Brave needs permission to scan for nearby devices. <permission_link>Update permissions</permission_link>. - - - Connected Device - - - {N_BARS, plural, - =1 {Signal Strength Level: # bar} - other {Signal Strength Level: # bars}} - - - - - %1$swww.google.com wants to scan for nearby Bluetooth devices. The following devices have been found: - - - Unknown or unsupported device (%1$sA1:B2:C3:D4:E5:F6) - - Sync isn't working @@ -3010,6 +2945,15 @@ To change this setting, <resetlink>reset sync

Quickly search with your voice. To edit this shortcut, touch and hold. + + Quickly open a new tab. To edit this shortcut, go to Settings. + + + Quickly share this page. To edit this shortcut, go to Settings. + + + Quickly search with your voice. To edit this shortcut, go to Settings. + Edit shortcut @@ -3784,11 +3728,6 @@ To change this setting, <resetlink>reset sync

- - - %1$sitem_name (%2$sitem id) - - Running in Brave @@ -4217,17 +4156,24 @@ To change this setting, <resetlink>reset sync

- - Verify your phone number on other device + + Submit %1$s123 on %2$sZoe's Macbook? - - Verify your phone number on %1$sZoe's Macbook + + Let %1$sexample.com verify it's you - - Let Brave submit %1$s123 on %2$sexample.com + + Let %1$spayment.com verify it's you for %2$sshopping.com - - Tap OK to submit %1$s123 on %3$spayment.com to continue on %2$sshopping.com + + + Submit %1$s123 to %2$sexample.com? + + + Submit %1$s123 to %2$spayment.com? + + + %1$sshopping.com %2$sZoe's Macbook @@ -4798,6 +4744,12 @@ To change this setting, <resetlink>reset sync

Highlight was shortened + + “ + + + ” + diff --git a/components/arc_strings.grdp b/components/arc_strings.grdp index 5a532bdb856a..5c5d4991bb94 100644 --- a/components/arc_strings.grdp +++ b/components/arc_strings.grdp @@ -38,6 +38,9 @@ $1Gmail app may not resize well. Use preset window sizes to prevent the app from misbehaving. + + This app can't be resized. + Got it diff --git a/components/autofill_payments_strings.grdp b/components/autofill_payments_strings.grdp index 2096fce84f69..bfe798a65ba2 100644 --- a/components/autofill_payments_strings.grdp +++ b/components/autofill_payments_strings.grdp @@ -337,21 +337,6 @@ Enter the expiration date and CVC for $1Visa - 5679 to update your card details. Once you confirm, your card details will be shared with this site. - - Keep a copy of this card on this device - - - - - If checked, Brave will store a copy of your card on this device for faster form filling. - - - - - If checked, Brave will store a copy of your card on this device for faster form filling. - - - diff --git a/components/flags_strings.grdp b/components/flags_strings.grdp index e62539e72dc6..12cb231a13d8 100644 --- a/components/flags_strings.grdp +++ b/components/flags_strings.grdp @@ -16,10 +16,10 @@ Reset all - + Warning: Experimental features ahead! - + By enabling these features, you could lose browser data or compromise your security or privacy. Enabled features apply to all users of this browser. If you are an enterprise admin you should @@ -65,12 +65,12 @@ Experiment enabled - + 1 result for ' $1cookies ' - + $115 results for ' diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp index 857598218493..83b86bd0b03b 100644 --- a/components/page_info_strings.grdp +++ b/components/page_info_strings.grdp @@ -309,8 +309,8 @@ Ads - - Protected content + + Protected content IDs Background Sync @@ -689,4 +689,12 @@ Security + + + + Manage + + + Remember this setting + diff --git a/components/payments_strings.grdp b/components/payments_strings.grdp index c224dd9c006e..aa1eaf2f3f92 100644 --- a/components/payments_strings.grdp +++ b/components/payments_strings.grdp @@ -626,7 +626,7 @@ - + Verify your purchase @@ -657,10 +657,10 @@ Use Windows Hello - + Store - + Total diff --git a/components/permissions_strings.grdp b/components/permissions_strings.grdp index 8fd0ede87332..a51cd6c060f5 100644 --- a/components/permissions_strings.grdp +++ b/components/permissions_strings.grdp @@ -159,6 +159,18 @@ This will otherwise be blocked by your privacy settings. This will allow the con Scanning for Bluetooth devices... + + + + No nearby devices found. + + + Allow + + + Block + + Cancel From b016a4bd92a41a463b3b3973b64aae79adb46619 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 20:03:06 +0200 Subject: [PATCH 083/205] Revert "Revert "Added a new value to chrome_constants.cc override."" This reverts commit 86b16de11b7d3d3691c448a564ee4be74c7c349c. This change does undo the temporary build fix introduced for Chromium 93.0.4549.4, that didn't include kSegmentationPlatformStorageDirName. --- chromium_src/chrome/common/chrome_constants.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/chromium_src/chrome/common/chrome_constants.cc b/chromium_src/chrome/common/chrome_constants.cc index 104c1a0694a6..90299ac93a15 100644 --- a/chromium_src/chrome/common/chrome_constants.cc +++ b/chromium_src/chrome/common/chrome_constants.cc @@ -129,12 +129,12 @@ const base::FilePath::CharType kPreferencesFilename[] = FPL("Preferences"); const base::FilePath::CharType kPreviewsOptOutDBFilename[] = FPL("previews_opt_out.db"); const base::FilePath::CharType kQueryTileStorageDirname[] = FPL("Query Tiles"); -const base::FilePath::CharType kVideoTutorialsStorageDirname[] = - FPL("Video Tutorials"); const base::FilePath::CharType kReadmeFilename[] = FPL("README"); const base::FilePath::CharType kSecurePreferencesFilename[] = FPL("Secure Preferences"); const base::FilePath::CharType kServiceStateFileName[] = FPL("Service State"); +const base::FilePath::CharType kSegmentationPlatformStorageDirName[] = + FPL("Segmentation Platform"); const base::FilePath::CharType kSingletonCookieFilename[] = FPL("SingletonCookie"); const base::FilePath::CharType kSingletonLockFilename[] = FPL("SingletonLock"); @@ -144,6 +144,8 @@ const base::FilePath::CharType kSupervisedUserSettingsFilename[] = FPL("Managed Mode Settings"); const base::FilePath::CharType kThemePackFilename[] = FPL("Cached Theme.pak"); const base::FilePath::CharType kTrustTokenFilename[] = FPL("Trust Tokens"); +const base::FilePath::CharType kVideoTutorialsStorageDirname[] = + FPL("Video Tutorials"); const base::FilePath::CharType kWebAppDirname[] = FPL("Web Applications"); // Only use if the ENABLE_REPORTING build flag is true const base::FilePath::CharType kReportingAndNelStoreFilename[] = From 41963547be3e7822adac85a688766f92d9b9a383 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 12:41:06 +0200 Subject: [PATCH 084/205] Adapt to {PageInfoUI -> PageInfoViewFactory}::GetPermissionIcon() move The switch statement in PageInfoViewFactory::GetPermissionIcon() to be patched is now in page_info_view_factory.cc. Chromium change: https://chromium.googlesource.com/chromium/src/+/0429a54efa5e04cffe61634107206abcaa7313d3 commit 0429a54efa5e04cffe61634107206abcaa7313d3 Author: Olesia Marukhno Date: Mon Jun 21 09:43:20 2021 +0000 Reland "Update icons in page info" This is a reland of 242829fbd44212a65e30dadcaf383c52b0a0eb65 Original change's description: > Update icons in page info > > Updated all icons to size 16px. Most of them are 16px by default, some > of them require size to set (permissions, certificate). There was a > comment about why permission icons were 18px: some of them have internal > padding which might make them look smaller. I checked with a UX > designer, it looks fine in 16px (screenshots attached in the bug). > > Added layout constant for page info icon size instead of constant field > in page_info_ui. Moved icons methods from page_info_ui to > PageInfoViewFactory since they are for desktop only and it makes sense > to keep them closer to usages. Also, this makes using layout constant > easier. > > Icons have Get*Icon methods if they: > 1. are used in multiple views > 2. require a size to set > 3. require logic to determine the right icon (permissions) > > Added new icon - secondary back arrow. kBackArrowIcon doesn't fit here > and looks too big compared to other icons. > > Screenshots: https://bugs.chromium.org/p/chromium/issues/detail?id=1188101#c25 > > Bug: 1188101 > Change-Id: Id72aa6055275d4b12d986fb39e34369aa163a5a3 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2949468 > Reviewed-by: Peter Kasting > Reviewed-by: Evan Stade > Reviewed-by: Emily Stark > Commit-Queue: Olesia Marukhno > Cr-Commit-Position: refs/heads/master@{#893515} Bug: 1188101 --- chromium_src/chrome/browser/DEPS | 1 + .../ui/views/page_info/page_info_view_factory.cc | 15 +++++++++++++++ chromium_src/components/page_info/page_info_ui.cc | 8 -------- ...iews-page_info-page_info_view_factory.cc.patch | 12 ++++++++++++ .../components-page_info-page_info_ui.cc.patch | 12 ------------ 5 files changed, 28 insertions(+), 20 deletions(-) create mode 100644 chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc create mode 100644 patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch delete mode 100644 patches/components-page_info-page_info_ui.cc.patch diff --git a/chromium_src/chrome/browser/DEPS b/chromium_src/chrome/browser/DEPS index 0a64cdbdd4d5..3349b5c37cc1 100644 --- a/chromium_src/chrome/browser/DEPS +++ b/chromium_src/chrome/browser/DEPS @@ -63,6 +63,7 @@ include_rules = [ "+../../../../../../../chrome/browser/ui/views/frame", "+../../../../../../../chrome/browser/ui/views/location_bar", "+../../../../../../../chrome/browser/ui/views/page_action", + "+../../../../../../../chrome/browser/ui/views/page_info", "+../../../../../../../chrome/browser/ui/views/profiles", "+../../../../../../../chrome/browser/ui/views/tabs", "+../../../../../../../chrome/browser/ui/views/toolbar", diff --git a/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc new file mode 100644 index 000000000000..a7e9fa1037aa --- /dev/null +++ b/chromium_src/chrome/browser/ui/views/page_info/page_info_view_factory.cc @@ -0,0 +1,15 @@ +/* Copyright (c) 2021 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "brave/components/vector_icons/vector_icons.h" + +#define BRAVE_PAGE_INFO_VIEW_FACTORY_GET_PERMISSION_ICON \ + case ContentSettingsType::AUTOPLAY: \ + icon = &kAutoplayStatusIcon; \ + break; + +#include "../../../../../../../chrome/browser/ui/views/page_info/page_info_view_factory.cc" + +#undef BRAVE_PAGE_INFO_VIEW_FACTORY_GET_PERMISSION_ICON diff --git a/chromium_src/components/page_info/page_info_ui.cc b/chromium_src/components/page_info/page_info_ui.cc index 2ae5054ae916..724d204210c4 100644 --- a/chromium_src/components/page_info/page_info_ui.cc +++ b/chromium_src/components/page_info/page_info_ui.cc @@ -5,18 +5,12 @@ #include "components/page_info/page_info_ui.h" #include "brave/components/ipfs/buildflags/buildflags.h" -#include "brave/components/vector_icons/vector_icons.h" #if BUILDFLAG(ENABLE_IPFS) #include "brave/components/ipfs/ipfs_utils.h" #include "components/grit/brave_components_strings.h" #endif // BUILDFLAG(ENABLE_IPFS) -#define BRAVE_PAGE_INFO_UI_GET_PERMISSION_ICON \ - case ContentSettingsType::AUTOPLAY: \ - icon = &kAutoplayStatusIcon; \ - break; - #if BUILDFLAG(ENABLE_IPFS) #define GetSecurityDescription GetSecurityDescription_ChromiumImpl #endif // BUILDFLAG(ENABLE_IPFS) @@ -35,5 +29,3 @@ PageInfoUI::GetSecurityDescription(const IdentityInfo& identity_info) const { IDS_PAGE_INFO_IPFS_BUBBLE_TEXT, SecurityDescriptionType::CONNECTION); } #endif // BUILDFLAG(ENABLE_IPFS) - -#undef BRAVE_PAGE_INFO_UI_GET_PERMISSION_ICON diff --git a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch new file mode 100644 index 000000000000..4769036bfbc6 --- /dev/null +++ b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc +index 774d9b5083c67388c1eecf4192002d85e4d03e07..30c3fe746182df28403ccaa385b34279ff65a754 100644 +--- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc ++++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc +@@ -186,6 +186,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( + const PageInfo::PermissionInfo& info) { + const gfx::VectorIcon* icon = &gfx::kNoneIcon; + switch (info.type) { ++ BRAVE_PAGE_INFO_VIEW_FACTORY_GET_PERMISSION_ICON + case ContentSettingsType::COOKIES: + icon = &vector_icons::kCookieIcon; + break; diff --git a/patches/components-page_info-page_info_ui.cc.patch b/patches/components-page_info-page_info_ui.cc.patch deleted file mode 100644 index 6da8306311c6..000000000000 --- a/patches/components-page_info-page_info_ui.cc.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/components/page_info/page_info_ui.cc b/components/page_info/page_info_ui.cc -index 38ebccd57d3b915344eff4b061d1abb2f28e698a..92b60cc14895776e64eaea71e23a4bd295e80158 100644 ---- a/components/page_info/page_info_ui.cc -+++ b/components/page_info/page_info_ui.cc -@@ -626,6 +626,7 @@ const ui::ImageModel PageInfoUI::GetPermissionIcon( - const PageInfo::PermissionInfo& info) { - const gfx::VectorIcon* icon = &gfx::kNoneIcon; - switch (info.type) { -+ BRAVE_PAGE_INFO_UI_GET_PERMISSION_ICON - case ContentSettingsType::COOKIES: - icon = &vector_icons::kCookieIcon; - break; From 445fc22256d8df04dc603cc70350a414c1dc43c4 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 12:41:40 +0200 Subject: [PATCH 085/205] Adapt to removal of FocusRing focus-aura functionality MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No need to explicitly set ui::NativeTheme::kColorId_FocusAuraColor anymore now, since there's no focus aura at all. Chromium change: https://chromium.googlesource.com/chromium/src/+/18b030938672b327ff05cb7e019ec772b22c230c commit 18b030938672b327ff05cb7e019ec772b22c230c Author: Peter Boström Date: Tue Jun 22 16:41:38 2021 +0000 Remove FocusRing focus-aura functionality This was specifically used for ToggleButton, but the aura would paint on top of the control as part of the FocusRing. Instead this makes sure that the InkDrop only triggers when the ToggleButton isn't focused, that way the InkDrop highlight can remain through keyboard triggering. A TODO is left to investigate making sure that the InkDrop highlight returns to the control as it's still focused, this would let us remove this special case. Bug: 1221137 --- chromium_src/ui/DEPS | 1 + chromium_src/ui/views/controls/focus_ring.cc | 16 +++++++-------- patches/ui-views-controls-focus_ring.cc.patch | 20 ------------------- 3 files changed, 9 insertions(+), 28 deletions(-) delete mode 100644 patches/ui-views-controls-focus_ring.cc.patch diff --git a/chromium_src/ui/DEPS b/chromium_src/ui/DEPS index 9ca442b95227..6eba700c82e0 100644 --- a/chromium_src/ui/DEPS +++ b/chromium_src/ui/DEPS @@ -8,5 +8,6 @@ include_rules = [ "+../../../../../ui/views/controls", "+../../../../../ui/views/window", "+../../../../../../ui/views/controls/button", + "+cc/paint/paint_flags.h", "+ui", ] diff --git a/chromium_src/ui/views/controls/focus_ring.cc b/chromium_src/ui/views/controls/focus_ring.cc index 75527bf6d619..5dd39872f6ac 100644 --- a/chromium_src/ui/views/controls/focus_ring.cc +++ b/chromium_src/ui/views/controls/focus_ring.cc @@ -4,6 +4,8 @@ // you can obtain one at http://mozilla.org/MPL/2.0/. #include "base/no_destructor.h" +// include this header so that setStyle redefine doesn't flow to cc::PaintFlags +#include "cc/paint/paint_flags.h" #include "ui/gfx/skia_util.h" #include "ui/gfx/color_palette.h" @@ -45,13 +47,11 @@ FocusRingTheme* GetFocusRingTheme() { } // namespace -#define BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_VALIDITY \ - paint.setColor(color_.value_or( \ - GetFocusRingTheme()->GetSystemColor(ColorIdForValidity(!invalid_)))); +#define setStyle \ + setColor(color_.value_or( \ + GetFocusRingTheme()->GetSystemColor(ColorIdForValidity(!invalid_)))); \ + paint.setStyle -#define BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_FOCUS_AURA \ - flags.setColor(GetFocusRingTheme()->GetSystemColor( \ - ui::NativeTheme::kColorId_FocusAuraColor)); #include "../../../../../ui/views/controls/focus_ring.cc" -#undef BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_FOCUS_AURA -#undef BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_VALIDITY + +#undef setStyle diff --git a/patches/ui-views-controls-focus_ring.cc.patch b/patches/ui-views-controls-focus_ring.cc.patch deleted file mode 100644 index 8f6ebb5fa1f4..000000000000 --- a/patches/ui-views-controls-focus_ring.cc.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/ui/views/controls/focus_ring.cc b/ui/views/controls/focus_ring.cc -index bc8136a77df0edbe40bb3b6c8bb12a07a22a1512..251428a95f9f797e0d464d0d18c0aee9e8617ab4 100644 ---- a/ui/views/controls/focus_ring.cc -+++ b/ui/views/controls/focus_ring.cc -@@ -213,6 +213,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { - flags.setAntiAlias(true); - flags.setColor(GetNativeTheme()->GetSystemColor( - ui::NativeTheme::kColorId_FocusAuraColor)); -+ BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_FOCUS_AURA - flags.setStyle(cc::PaintFlags::kFill_Style); - - canvas->sk_canvas()->drawRRect(ring_rect, flags); -@@ -221,6 +222,7 @@ void FocusRing::OnPaint(gfx::Canvas* canvas) { - cc::PaintFlags paint; - paint.setAntiAlias(true); - paint.setColor(color_.value_or(GetColor(this, !invalid_))); -+ BRAVE_FOCUS_RING_ON_PAINT_SET_COLOR_VALIDITY - paint.setStyle(cc::PaintFlags::kStroke_Style); - paint.setStrokeWidth(PlatformStyle::kFocusHaloThickness); - From bc1c273607d37c1392dc6d3fb35f4243c838ab25 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 12:40:34 +0200 Subject: [PATCH 086/205] Adapt to two new parameters in MenuButtonCoordinator's constructor Also needed to adapt the constructor of BraveMenuButtonCoordinator to pass the two newly-added parameters to the base class. Chromium change: https://chromium.googlesource.com/chromium/src/+/4a6f627495111794c56c46873349521bcc9b5b22 commit 4a6f627495111794c56c46873349521bcc9b5b22 Author: Jinsuk Kim Date: Wed Jun 23 01:35:50 2021 +0000 Toolbar: Remove deps on chrome/browser/omaha This CL applies some refactoring around toolbar/omaha in preparation for toolbar modularization: - Moves menu button/ui/item state definitions from c.b.omaha.UpdateMenuItemHelper to toolbar/menu_button - Inject MenuButtonState supplier to MenuButton MVC instead of the components calling UpdateMenuItemHelper directly Bug: 1127732 --- .../BraveMenuButtonCoordinator.java | 4 +++- ...-browser-toolbar-ToolbarManager.java.patch | 24 +++++++++---------- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java index 7f15de3bc577..bea5077d6b1a 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java @@ -33,10 +33,12 @@ public BraveMenuButtonCoordinator( WindowAndroid windowAndroid, SetFocusFunction setUrlBarFocusFunction, Runnable requestRenderRunnable, boolean shouldShowAppUpdateBadge, Supplier isInOverviewModeSupplier, ThemeColorProvider themeColorProvider, + Supplier menuButtonStateSupplier, Runnable onMenuButtonClicked, @IdRes int menuButtonId) { super(appMenuCoordinatorSupplier, controlsVisibilityDelegate, windowAndroid, setUrlBarFocusFunction, requestRenderRunnable, shouldShowAppUpdateBadge, - isInOverviewModeSupplier, themeColorProvider, menuButtonId); + isInOverviewModeSupplier, themeColorProvider, menuButtonStateSupplier, + onMenuButtonClicked, menuButtonId); mActivity = windowAndroid.getActivity().get(); } 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 af632dc16ae2..3e4355d9ae57 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,24 +1,24 @@ 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 23eb3c3548fbadd38ea4e36bffe878cd99220766..0c2ac92bc74cb98c781670cea4a3331425975030 100644 +index 002333dfcc4aba1bb7122a4793200995a1d6a400..65a2efb964adb8725ba4b73a9c91867ae5dd1387 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 -@@ -488,13 +488,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve - boolean isCustomTab = toolbarLayout instanceof CustomTabToolbar; - ThemeColorProvider menuButtonThemeColorProvider = - isCustomTab ? mCustomTabThemeColorProvider : browsingModeThemeColorProvider; +@@ -499,13 +499,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve + Runnable onMenuButtonClicked = + () -> UpdateMenuItemHelper.getInstance().onMenuButtonClicked(); + // clang-format off - mMenuButtonCoordinator = new MenuButtonCoordinator(appMenuCoordinatorSupplier, + mMenuButtonCoordinator = new org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator(appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mWindowAndroid, - (focus, type) - -> setUrlBarFocus(focus, type), - requestFocusRunnable, shouldShowUpdateBadge, isInOverviewModeSupplier, - menuButtonThemeColorProvider, R.id.menu_button_wrapper); + (focus, type) -> setUrlBarFocus(focus, type), requestFocusRunnable, + shouldShowUpdateBadge, isInOverviewModeSupplier, menuButtonThemeColorProvider, + menuButtonStateSupplier, onMenuButtonClicked, R.id.menu_button_wrapper); + if (shouldShowUpdateBadge) mMenuStateObserver = mMenuButtonCoordinator.getStateObserver(); - MenuButtonCoordinator startSurfaceMenuButtonCoordinator = new MenuButtonCoordinator( + MenuButtonCoordinator startSurfaceMenuButtonCoordinator = new org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator( appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mWindowAndroid, - (focus, type) - -> setUrlBarFocus(focus, type), -@@ -929,7 +929,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve + (focus, type) -> setUrlBarFocus(focus, type), requestFocusRunnable, + shouldShowUpdateBadge, isInOverviewModeSupplier, overviewModeThemeColorProvider, +@@ -942,7 +942,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled, boolean isTabGroupsAndroidContinuationEnabled) { // clang-format off From 3341c06efb23f4984a995af8ce656ccce4df70db Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 13:13:54 +0200 Subject: [PATCH 087/205] Adapt to //components/safe_browsing/content/{web_ui->browser/web_ui} Chromium change: https://chromium.googlesource.com/chromium/src/+/641e4e46425a0325b3f2841277a78986025534ad commit 641e4e46425a0325b3f2841277a78986025534ad Author: Colin Blundell Date: Thu Jun 24 16:09:53 2021 +0000 [//components/safe_browsing] Move content/web_ui/ subdir This subdirectory is browser-side code and thus should be located nested under //components/safe_browsing/content/browser. This CL completes the reorganization of //components/safe_browsing/content into the canonical structure of having only {browser, common, renderer} subdirectories. Bug: 1216341 --- .../check_client_download_request_base_browsertest.cc | 2 +- test/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base_browsertest.cc b/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base_browsertest.cc index 920d06d8d08a..022dddbae2bf 100644 --- a/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base_browsertest.cc +++ b/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base_browsertest.cc @@ -13,7 +13,7 @@ #include "chrome/test/base/ui_test_utils.h" #include "components/network_session_configurator/common/network_switches.h" #include "components/prefs/pref_service.h" -#include "components/safe_browsing/content/web_ui/safe_browsing_ui.h" +#include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" #include "components/safe_browsing/core/proto/csd.pb.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/download_manager.h" diff --git a/test/BUILD.gn b/test/BUILD.gn index 7c1f2408a1e3..feca36dbd99e 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -904,7 +904,7 @@ if (!is_android) { "//components/policy/core/common:test_support", "//components/prefs", "//components/renderer_context_menu", - "//components/safe_browsing/content/web_ui", + "//components/safe_browsing/content/browser/web_ui", "//components/safe_browsing/core:features", "//components/spellcheck/browser", "//extensions/browser:test_support", From 2496405888109ae82db9e7a312bcb4a4e8340901 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 16:17:47 +0200 Subject: [PATCH 088/205] Remove our own GetFirstPartyURL() method and use upstream's one. Chromium change: https://chromium.googlesource.com/chromium/src/+/aba4a46c62f5f3ec198e7b7bd8ac1bbd6c953d1d commit aba4a46c62f5f3ec198e7b7bd8ac1bbd6c953d1d Author: cfredric Date: Tue Jun 22 18:29:13 2021 +0000 Add new --sameparty-considered-first-party flag and logic. This flag will resolve https://github.com/cfredric/sameparty/issues/4, and will allow developers to test the eventual interaction of SameParty cookies and third-party-cookie-blocking. It causes SameParty cookies to not be blocked by the user's third-party-cookie-blocking settings, as they are considered first-party. Bug: 1203706 --- .../core/common/cookie_settings_base.cc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc index 44859ea7343f..f27d438d1f12 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc @@ -74,11 +74,6 @@ bool BraveIsAllowedThirdParty(const GURL& url, return false; } -GURL GetFirstPartyURL(const GURL& site_for_cookies, - const absl::optional& top_frame_origin) { - return top_frame_origin ? top_frame_origin->GetURL() : site_for_cookies; -} - bool IsFirstPartyAccessAllowed( const GURL& first_party_url, const CookieSettingsBase* const cookie_settings) { @@ -105,8 +100,8 @@ bool CookieSettingsBase::ShouldUseEphemeralStorage( if (!base::FeatureList::IsEnabled(net::features::kBraveEphemeralStorage)) return false; - const GURL first_party_url = - GetFirstPartyURL(site_for_cookies, top_frame_origin); + const GURL first_party_url = GetFirstPartyURL( + site_for_cookies, base::OptionalOrNullptr(top_frame_origin)); if (!first_party_url.is_valid()) return false; @@ -172,8 +167,8 @@ bool CookieSettingsBase::IsCookieAccessAllowedImpl( if (allow) return true; - const GURL first_party_url = - GetFirstPartyURL(site_for_cookies, top_frame_origin); + const GURL first_party_url = GetFirstPartyURL( + site_for_cookies, base::OptionalOrNullptr(top_frame_origin)); if (!IsFirstPartyAccessAllowed(first_party_url, this)) return false; From 1b68fed2df96d03dc71d514ecc5e403626849454 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 16:41:42 +0200 Subject: [PATCH 089/205] Adapt to NTP preference names relocating once again. This time from ntp_tiles::prefs:: to ntp_prefs:: namespace. Chromium change: https://chromium.googlesource.com/chromium/src/+/dca3350f9cdba0d34d80dfe22869487a73bda8a4 commit dca3350f9cdba0d34d80dfe22869487a73bda8a4 Author: Tibor Goldschwendt Date: Thu Jun 24 01:01:45 2021 +0000 [ntp] Move custom links and visibility MV tile prefs to 1P NTP Previously, these prefs where owned by the MostVisitedSites, which is also used for 3P NTPs. However, the 1P NTP is the only surface where these prefs should be applied. This CL makes the 1P NTP the owner of the prefs and isolates them from other NTPs. Fixed: 1219971 --- browser/brave_prefs_browsertest.cc | 4 ++-- browser/brave_profile_prefs.cc | 4 ++-- browser/search/BUILD.gn | 1 + browser/search/ntp_utils.cc | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/browser/brave_prefs_browsertest.cc b/browser/brave_prefs_browsertest.cc index 58414d7ae0a2..edf3715385a9 100644 --- a/browser/brave_prefs_browsertest.cc +++ b/browser/brave_prefs_browsertest.cc @@ -13,10 +13,10 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/net/prediction_options.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/browser/ui/webui/new_tab_page/ntp_pref_names.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/chrome_test_utils.h" #include "components/embedder_support/pref_names.h" -#include "components/ntp_tiles/pref_names.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/core/common/safe_browsing_prefs.h" #include "components/spellcheck/browser/pref_names.h" @@ -146,7 +146,7 @@ IN_PROC_BROWSER_TEST_F(BraveProfilePrefsBrowserTest, prefs::kCloudPrintSubmitEnabled)); #if !defined(OS_ANDROID) EXPECT_TRUE(chrome_test_utils::GetProfile(this)->GetPrefs()->GetBoolean( - ntp_tiles::prefs::kNtpUseMostVisitedTiles)); + ntp_prefs::kNtpUseMostVisitedTiles)); #endif EXPECT_TRUE(chrome_test_utils::GetProfile(this)->GetPrefs()->GetBoolean( prefs::kHideWebStoreIcon)); diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index 1db8ce6e60b2..49870d5d059c 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -38,12 +38,12 @@ #include "brave/components/tor/buildflags/buildflags.h" #include "chrome/browser/net/prediction_options.h" #include "chrome/browser/prefs/session_startup_pref.h" +#include "chrome/browser/ui/webui/new_tab_page/ntp_pref_names.h" #include "chrome/common/pref_names.h" #include "components/autofill/core/common/autofill_prefs.h" #include "components/content_settings/core/common/pref_names.h" #include "components/embedder_support/pref_names.h" #include "components/gcm_driver/gcm_buildflags.h" -#include "components/ntp_tiles/pref_names.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/safe_browsing/core/common/safe_browsing_prefs.h" @@ -391,7 +391,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { #if !defined(OS_ANDROID) // Turn on most visited mode on NTP by default. // We can turn customization mode on when we have add-shortcut feature. - registry->SetDefaultPrefValue(ntp_tiles::prefs::kNtpUseMostVisitedTiles, + registry->SetDefaultPrefValue(ntp_prefs::kNtpUseMostVisitedTiles, base::Value(true)); RegisterDefaultBraveBrowserPromptPrefs(registry); #endif diff --git a/browser/search/BUILD.gn b/browser/search/BUILD.gn index 8789a2f42fe3..533ae575d132 100644 --- a/browser/search/BUILD.gn +++ b/browser/search/BUILD.gn @@ -17,6 +17,7 @@ source_set("search") { "//brave/common:pref_names", "//brave/components/crypto_dot_com/browser/buildflags", "//brave/components/crypto_dot_com/common", + "//chrome/browser/ui", "//chrome/common", "//components/pref_registry", "//components/prefs", diff --git a/browser/search/ntp_utils.cc b/browser/search/ntp_utils.cc index 3d6223a3d840..b132a4618433 100644 --- a/browser/search/ntp_utils.cc +++ b/browser/search/ntp_utils.cc @@ -9,7 +9,7 @@ #include "brave/browser/profiles/profile_util.h" #include "brave/common/pref_names.h" #include "brave/components/crypto_dot_com/browser/buildflags/buildflags.h" -#include "components/ntp_tiles/pref_names.h" +#include "chrome/browser/ui/webui/new_tab_page/ntp_pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" @@ -46,7 +46,7 @@ void MigrateNewTabPagePrefs(Profile* profile) { const PrefService::Preference* top_sites_pref = prefs->FindPreference(kNewTabPageShowTopSites); if (top_sites_pref->HasUserSetting()) { - prefs->SetBoolean(ntp_tiles::prefs::kNtpShortcutsVisible, + prefs->SetBoolean(ntp_prefs::kNtpShortcutsVisible, prefs->GetBoolean(kNewTabPageShowTopSites)); } From b155e28fcb5489577531561466d47928dc3c26ab Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 16:47:34 +0200 Subject: [PATCH 090/205] IWYU: ui/gfx/canvas.h --- .../ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc | 1 + browser/ui/views/sidebar/sidebar_items_contents_view.cc | 1 + .../ui/views/sidebar/sidebar_show_options_event_detect_widget.cc | 1 + browser/ui/views/tabs/brave_alert_indicator.cc | 1 + 4 files changed, 4 insertions(+) diff --git a/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc b/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc index 2882ebd2a375..042e04c9d05f 100644 --- a/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc +++ b/browser/ui/views/sidebar/sidebar_add_item_bubble_delegate_view.cc @@ -23,6 +23,7 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" +#include "ui/gfx/canvas.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/label.h" diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.cc b/browser/ui/views/sidebar/sidebar_items_contents_view.cc index 5073b630bab8..070b70d390d8 100644 --- a/browser/ui/views/sidebar/sidebar_items_contents_view.cc +++ b/browser/ui/views/sidebar/sidebar_items_contents_view.cc @@ -31,6 +31,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/compositor/compositor.h" +#include "ui/gfx/canvas.h" #include "ui/gfx/image/image_skia_operations.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/views/background.h" diff --git a/browser/ui/views/sidebar/sidebar_show_options_event_detect_widget.cc b/browser/ui/views/sidebar/sidebar_show_options_event_detect_widget.cc index 56020f55205c..728e4b144d34 100644 --- a/browser/ui/views/sidebar/sidebar_show_options_event_detect_widget.cc +++ b/browser/ui/views/sidebar/sidebar_show_options_event_detect_widget.cc @@ -11,6 +11,7 @@ #include "brave/browser/ui/views/frame/brave_browser_view.h" #include "brave/grit/brave_generated_resources.h" #include "ui/base/l10n/l10n_util.h" +#include "ui/gfx/canvas.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/paint_vector_icon.h" #include "ui/views/background.h" diff --git a/browser/ui/views/tabs/brave_alert_indicator.cc b/browser/ui/views/tabs/brave_alert_indicator.cc index 96c5e904c1c0..001aca4c9a56 100644 --- a/browser/ui/views/tabs/brave_alert_indicator.cc +++ b/browser/ui/views/tabs/brave_alert_indicator.cc @@ -18,6 +18,7 @@ #include "content/public/browser/web_contents.h" #include "third_party/abseil-cpp/absl/types/optional.h" #include "third_party/skia/include/core/SkPathTypes.h" +#include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" #include "ui/views/background.h" From 78761b3c388ecc5c6a81b0b41e9eafe3a0ad6ca5 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 18:20:13 +0200 Subject: [PATCH 091/205] Relocate chromium_src override of kChooserBluetoothOverviewURL This is now defined in components/permissions/constants.cc instead of chrome/common/url_constants.cc, and relocated from the chrome:: to the permissions:: namespace. Chromium change: https://chromium.googlesource.com/chromium/src/+/c5c08e7b157f1c2534098701fb5fc3c98e7ca737 commit c5c08e7b157f1c2534098701fb5fc3c98e7ca737 Author: Michael van Ouwerkerk Date: Thu Jun 24 08:53:27 2021 +0000 Move BluetoothChooserAndroid to //components/permissions/android This depends on the following which are also moved: * DeviceItemAdapter * DeviceItemRow * ItemChooserDialog * resources for strings, layouts, colors, drawables, and styles Bug: 1076462 --- chromium_src/chrome/common/url_constants.cc | 3 --- chromium_src/components/permissions/constants.cc | 13 +++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 chromium_src/components/permissions/constants.cc diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc index 1fb48acb4310..e70224832bd5 100644 --- a/chromium_src/chrome/common/url_constants.cc +++ b/chromium_src/chrome/common/url_constants.cc @@ -29,9 +29,6 @@ const char kCastCloudServicesHelpURL[] = const char kCastNoDestinationFoundURL[] = "https://support.brave.com/"; -const char kChooserBluetoothOverviewURL[] = - "https://github.com/brave/brave-browser/wiki/Web-API-Permissions"; - const char kChooserHidOverviewUrl[] = "https://github.com/brave/brave-browser/wiki/Web-API-Permissions"; diff --git a/chromium_src/components/permissions/constants.cc b/chromium_src/components/permissions/constants.cc new file mode 100644 index 000000000000..75030d50cf85 --- /dev/null +++ b/chromium_src/components/permissions/constants.cc @@ -0,0 +1,13 @@ +/* Copyright 2021 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "components/permissions/constants.h" + +namespace permissions { + +const char kChooserBluetoothOverviewURL[] = + "https://github.com/brave/brave-browser/wiki/Web-API-Permissions"; + +} // namespace permissions From 5e8d3db8449b72e3e0428206faf86c6ba49893fa Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 18:38:50 +0200 Subject: [PATCH 092/205] Add Brave-specific definition of newly-added kSyncTrustedVaultOptInURL Chromium change: https://chromium.googlesource.com/chromium/src/+/9e64611bf897a38c939ab40c1ab7d4c3c5a243fc commit 9e64611bf897a38c939ab40c1ab7d4c3c5a243fc Author: Mikel Astiz Date: Fri Jun 25 11:17:03 2021 +0000 [sync] Configure URL for trusted vault opt in flow This patch adjusts the URL used for the opt-in entrypoint for the sync trusted vault passphrase type, in settings. Change-Id: I9c4a0c52674e92775a564980f8ac696df2b985cb Bug: 1202088 --- chromium_src/chrome/common/url_constants.cc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chromium_src/chrome/common/url_constants.cc b/chromium_src/chrome/common/url_constants.cc index e70224832bd5..d0c04219db49 100644 --- a/chromium_src/chrome/common/url_constants.cc +++ b/chromium_src/chrome/common/url_constants.cc @@ -198,6 +198,10 @@ const char kSyncGoogleDashboardURL[] = const char kSyncLearnMoreURL[] = "https://support.brave.com/"; +#if !defined(OS_ANDROID) +const char kSyncTrustedVaultOptInURL[] = "https://support.brave.com/"; +#endif + const char kUpgradeHelpCenterBaseURL[] = "https://support.brave.com/hc/en-us/articles/" "360025390311-How-do-I-download-and-install-Brave-"; From 3bdb91746792c3f980d566acf82080fb55fe8535 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Wed, 7 Jul 2021 20:02:20 +0200 Subject: [PATCH 093/205] Fix build errors due to the -Wc++11-narrowing compilation flag Since now this flag is being passed to the compiler, we can't use the list-initializing syntax to build types when any of the parameters specified for constructing the new object would need to be implicitly converted into a different type of smaller size than the original one. For instance, we can't now list initialize kPageTransitionQualifierMask in the |PageTransitionType| enumeration to 0xFFFFFF00: enum PageTransitionType : int32_t { [...] // General mask defining the bits used for the qualifiers. kPageTransitionQualifierMask = 0xFFFFFF00, // THIS WILL FAIL NOW }; ...which would give us the following error at build time: enumerator value evaluates to 4294967040, which cannot be narrowed to type 'int32_t' (aka 'int') [-Wc++11-narrowing] This is because 0xFFFFFF00 can't be fitted inside a 32-bit unsigned int as the highest bit is reserved for the sign. Instead we could either define the enumeration as of type uint32_t or use 0x7FFFFF00 instead: enum PageTransitionType : int32_t { [...] // General mask defining the bits used for the qualifiers. kPageTransitionQualifierMask = 0x7FFFFF00, // THIS WORKS }; Since in this case this is used for defining types, we just define the enumeration of type uint8, so that we can use the more intuitive 0xFFFFFFFF mask instead. The right solution depends on each case, which is why this patch fixes the few problems found differently, in some cases by simply silencing the compilers using a static_cast(value), in others by avoiding to use the list-initializing syntax, calling the constructor instead, and in some others adjusting the type used to a more appropriate one. --- .../ethereum_remote_client_unittest.cc | 113 ++++++++++-------- .../sidebar/sidebar_item_drag_context.cc | 4 +- .../sidebar/sidebar_items_contents_view.cc | 5 +- browser/ui/webui/brave_welcome_ui.cc | 3 +- components/tor/tor_control_unittest.cc | 6 +- .../net-socket-socks5_client_socket.cc.patch | 4 +- .../include/bat/ads/page_transition_types.h | 2 +- 7 files changed, 74 insertions(+), 63 deletions(-) diff --git a/browser/extensions/ethereum_remote_client_unittest.cc b/browser/extensions/ethereum_remote_client_unittest.cc index e7adbc4a3c08..c7a2294b93a5 100644 --- a/browser/extensions/ethereum_remote_client_unittest.cc +++ b/browser/extensions/ethereum_remote_client_unittest.cc @@ -5,6 +5,8 @@ #include "brave/browser/ethereum_remote_client/ethereum_remote_client_service.h" +#include + #include "brave/browser/ethereum_remote_client/pref_names.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/test/base/testing_browser_process.h" @@ -46,77 +48,83 @@ TEST_F(BraveWalletUnitTest, TestGetRandomSeed) { } TEST_F(BraveWalletUnitTest, TestGetEthereumRemoteClientSeedFromRootSeed) { - const char seed[32] = {48, 196, 56, 174, 243, 75, 120, 235, 37, 174, 254, - 97, 37, 205, 101, 93, 181, 23, 190, 82, 53, 180, - 51, 198, 232, 187, 188, 220, 160, 187, 212, 28}; - const char expected_derived_seed[32] = { + constexpr std::array seed = { + 48, 196, 56, 174, 243, 75, 120, 235, 37, 174, 254, + 97, 37, 205, 101, 93, 181, 23, 190, 82, 53, 180, + 51, 198, 232, 187, 188, 220, 160, 187, 212, 28}; + constexpr std::array expected_derived_seed = { 142, 147, 10, 180, 36, 89, 142, 110, 52, 85, 216, 222, 83, 56, 38, 206, 104, 133, 77, 246, 219, 90, 105, 35, 52, 76, 223, 24, 183, 138, 244, 72}; std::string derived = EthereumRemoteClientService::GetEthereumRemoteClientSeedFromRootSeed( - std::string(seed, base::size(seed))); - ASSERT_EQ(derived, std::string(expected_derived_seed, - base::size(expected_derived_seed))); + std::string(seed.begin(), seed.end())); + ASSERT_EQ(derived, std::string(expected_derived_seed.begin(), + expected_derived_seed.end())); } TEST_F(BraveWalletUnitTest, TestBitGoSeedFromRootSeed) { - const char seed[32] = {48, 196, 56, 174, 243, 75, 120, 235, 37, 174, 254, - 97, 37, 205, 101, 93, 181, 23, 190, 82, 53, 180, - 51, 198, 232, 187, 188, 220, 160, 187, 212, 28}; - const char expected_derived_seed[32] = { + constexpr std::array seed = { + 48, 196, 56, 174, 243, 75, 120, 235, 37, 174, 254, + 97, 37, 205, 101, 93, 181, 23, 190, 82, 53, 180, + 51, 198, 232, 187, 188, 220, 160, 187, 212, 28}; + constexpr std::array expected_derived_seed = { 101, 6, 89, 61, 129, 81, 104, 13, 48, 59, 117, 46, 73, 177, 168, 248, 91, 84, 145, 54, 61, 157, 27, 254, 45, 203, 71, 123, 188, 29, 224, 203}; std::string derived = EthereumRemoteClientService::GetBitGoSeedFromRootSeed( - std::string(seed, base::size(seed))); - ASSERT_EQ(derived, std::string(expected_derived_seed, - base::size(expected_derived_seed))); + std::string(seed.begin(), seed.end())); + ASSERT_EQ(derived, std::string(expected_derived_seed.begin(), + expected_derived_seed.end())); } TEST_F(BraveWalletUnitTest, TestSealSeed) { - const char seed[32] = {48, 196, 56, 174, 243, 75, 120, 235, 37, 174, 254, - 97, 37, 205, 101, 93, 181, 23, 190, 82, 53, 180, - 51, 198, 232, 187, 188, 220, 160, 187, 212, 28}; - const char key[32] = {196, 34, 104, 152, 91, 63, 78, 171, 234, 163, 25, - 221, 80, 73, 158, 89, 52, 53, 227, 231, 152, 214, - 61, 210, 33, 54, 68, 171, 140, 239, 3, 158}; - const char nonce[12] = {200, 153, 224, 40, 58, 249, - 156, 33, 152, 207, 177, 12}; - const char expected_cipher_seed[48] = { + constexpr std::array seed = { + 48, 196, 56, 174, 243, 75, 120, 235, 37, 174, 254, + 97, 37, 205, 101, 93, 181, 23, 190, 82, 53, 180, + 51, 198, 232, 187, 188, 220, 160, 187, 212, 28}; + constexpr std::array key = { + 196, 34, 104, 152, 91, 63, 78, 171, 234, 163, 25, + 221, 80, 73, 158, 89, 52, 53, 227, 231, 152, 214, + 61, 210, 33, 54, 68, 171, 140, 239, 3, 158}; + constexpr std::array nonce = {200, 153, 224, 40, 58, 249, + 156, 33, 152, 207, 177, 12}; + constexpr std::array expected_cipher_seed = { 33, 11, 185, 125, 67, 27, 92, 110, 132, 238, 255, 8, 79, 7, 8, 40, 189, 211, 35, 122, 236, 183, 66, 212, 213, 68, 187, 103, 16, 138, 166, 0, 6, 128, 179, 64, 55, 160, 219, 8, 222, 231, 48, 93, 132, 131, 178, 177}; std::string cipher_seed; ASSERT_TRUE(EthereumRemoteClientService::SealSeed( - std::string(seed, base::size(seed)), std::string(key, base::size(key)), - std::string(nonce, base::size(nonce)), &cipher_seed)); - ASSERT_EQ(cipher_seed, std::string(expected_cipher_seed, - base::size(expected_cipher_seed))); + std::string(seed.begin(), seed.end()), + std::string(key.begin(), key.end()), + std::string(nonce.begin(), nonce.end()), &cipher_seed)); + ASSERT_EQ(cipher_seed, std::string(expected_cipher_seed.begin(), + expected_cipher_seed.end())); } TEST_F(BraveWalletUnitTest, TestOpenSeed) { - const char cipher_seed[48] = { + constexpr std::array cipher_seed = { 33, 11, 185, 125, 67, 27, 92, 110, 132, 238, 255, 8, 79, 7, 8, 40, 189, 211, 35, 122, 236, 183, 66, 212, 213, 68, 187, 103, 16, 138, 166, 0, 6, 128, 179, 64, 55, 160, 219, 8, 222, 231, 48, 93, 132, 131, 178, 177}; - const char key[32] = {196, 34, 104, 152, 91, 63, 78, 171, 234, 163, 25, - 221, 80, 73, 158, 89, 52, 53, 227, 231, 152, 214, - 61, 210, 33, 54, 68, 171, 140, 239, 3, 158}; - const char nonce[12] = {200, 153, 224, 40, 58, 249, - 156, 33, 152, 207, 177, 12}; - const char expected_seed[32] = {48, 196, 56, 174, 243, 75, 120, 235, - 37, 174, 254, 97, 37, 205, 101, 93, - 181, 23, 190, 82, 53, 180, 51, 198, - 232, 187, 188, 220, 160, 187, 212, 28}; + constexpr std::array key = { + 196, 34, 104, 152, 91, 63, 78, 171, 234, 163, 25, + 221, 80, 73, 158, 89, 52, 53, 227, 231, 152, 214, + 61, 210, 33, 54, 68, 171, 140, 239, 3, 158}; + constexpr std::array nonce = {200, 153, 224, 40, 58, 249, + 156, 33, 152, 207, 177, 12}; + constexpr std::array expected_seed = { + 48, 196, 56, 174, 243, 75, 120, 235, 37, 174, 254, + 97, 37, 205, 101, 93, 181, 23, 190, 82, 53, 180, + 51, 198, 232, 187, 188, 220, 160, 187, 212, 28}; std::string seed; ASSERT_TRUE(EthereumRemoteClientService::OpenSeed( - std::string(cipher_seed, base::size(cipher_seed)), - std::string(key, base::size(key)), std::string(nonce, base::size(nonce)), - &seed)); - ASSERT_EQ(seed, std::string(expected_seed, 32)); + std::string(cipher_seed.begin(), cipher_seed.end()), + std::string(key.begin(), key.end()), + std::string(nonce.begin(), nonce.end()), &seed)); + ASSERT_EQ(seed, std::string(expected_seed.begin(), expected_seed.end())); } TEST_F(BraveWalletUnitTest, TestLoadFromPrefs) { @@ -131,30 +139,31 @@ TEST_F(BraveWalletUnitTest, TestLoadFromPrefs) { ProfileManager::GetActiveUserProfile()->GetPrefs(), &cipher_seed, &nonce)); - const char expected_nonce[12] = {200, 153, 224, 40, 58, 249, - 156, 33, 152, 207, 177, 12}; - const char expected_cipher_seed[48] = { + constexpr std::array expected_nonce = { + 200, 153, 224, 40, 58, 249, 156, 33, 152, 207, 177, 12}; + constexpr std::array expected_cipher_seed = { 33, 11, 185, 125, 67, 27, 92, 110, 132, 238, 255, 8, 79, 7, 8, 40, 189, 211, 35, 122, 236, 183, 66, 212, 213, 68, 187, 103, 16, 138, 166, 0, 6, 128, 179, 64, 55, 160, 219, 8, 222, 231, 48, 93, 132, 131, 178, 177}; - ASSERT_EQ(nonce, std::string(expected_nonce, base::size(expected_nonce))); - ASSERT_EQ(std::string(expected_cipher_seed, base::size(expected_cipher_seed)), - cipher_seed); + ASSERT_EQ(nonce, std::string(expected_nonce.begin(), expected_nonce.end())); + ASSERT_EQ( + std::string(expected_cipher_seed.begin(), expected_cipher_seed.end()), + cipher_seed); } TEST_F(BraveWalletUnitTest, TestSaveToPrefs) { - const char nonce[12] = {200, 153, 224, 40, 58, 249, - 156, 33, 152, 207, 177, 12}; - const char cipher_seed[48] = { + constexpr std::array nonce = {200, 153, 224, 40, 58, 249, + 156, 33, 152, 207, 177, 12}; + constexpr std::array cipher_seed = { 33, 11, 185, 125, 67, 27, 92, 110, 132, 238, 255, 8, 79, 7, 8, 40, 189, 211, 35, 122, 236, 183, 66, 212, 213, 68, 187, 103, 16, 138, 166, 0, 6, 128, 179, 64, 55, 160, 219, 8, 222, 231, 48, 93, 132, 131, 178, 177}; EthereumRemoteClientService::SaveToPrefs( ProfileManager::GetActiveUserProfile()->GetPrefs(), - std::string(cipher_seed, base::size(cipher_seed)), - std::string(nonce, base::size(nonce))); + std::string(cipher_seed.begin(), cipher_seed.end()), + std::string(nonce.begin(), nonce.end())); ASSERT_EQ(GetPrefs()->GetString(kERCAES256GCMSivNonce), "yJngKDr5nCGYz7EM"); ASSERT_EQ(GetPrefs()->GetString(kERCEncryptedSeed), diff --git a/browser/ui/views/sidebar/sidebar_item_drag_context.cc b/browser/ui/views/sidebar/sidebar_item_drag_context.cc index 58e5441aa7fd..4ad82525031b 100644 --- a/browser/ui/views/sidebar/sidebar_item_drag_context.cc +++ b/browser/ui/views/sidebar/sidebar_item_drag_context.cc @@ -38,6 +38,6 @@ bool SidebarItemDragContext::CanStartDrag(const gfx::Point press_pt, constexpr int kMinimumDragDistance = 10; int x_offset = abs(p.x() - press_pt.x()); int y_offset = abs(p.y() - press_pt.y()); - return sqrt(pow(float{x_offset}, 2) + pow(float{y_offset}, 2)) > - kMinimumDragDistance; + return sqrt(pow(static_cast(x_offset), 2) + + pow(static_cast(y_offset), 2)) > kMinimumDragDistance; } diff --git a/browser/ui/views/sidebar/sidebar_items_contents_view.cc b/browser/ui/views/sidebar/sidebar_items_contents_view.cc index 070b70d390d8..1c1dc1f7c1eb 100644 --- a/browser/ui/views/sidebar/sidebar_items_contents_view.cc +++ b/browser/ui/views/sidebar/sidebar_items_contents_view.cc @@ -80,8 +80,9 @@ gfx::Size SidebarItemsContentsView::CalculatePreferredSize() const { if (children().empty()) return {0, 0}; const gfx::Size child_size = children()[0]->GetPreferredSize(); - return {child_size.width() + GetInsets().width(), - children().size() * child_size.height() + GetInsets().height()}; + return gfx::Size( + child_size.width() + GetInsets().width(), + children().size() * child_size.height() + GetInsets().height()); } void SidebarItemsContentsView::OnThemeChanged() { diff --git a/browser/ui/webui/brave_welcome_ui.cc b/browser/ui/webui/brave_welcome_ui.cc index 458894d63075..10b82af1041a 100644 --- a/browser/ui/webui/brave_welcome_ui.cc +++ b/browser/ui/webui/brave_welcome_ui.cc @@ -121,7 +121,8 @@ std::string CountryIDToCountryString(int country_id) { if (country_id == country_codes::kCountryIDUnknown) return std::string(); - char chars[3] = {(country_id >> 8) & 0xFF, country_id & 0xFF, 0}; + char chars[3] = {static_cast(country_id >> 8), + static_cast(country_id), 0}; std::string country_string(chars); DCHECK_EQ(country_string.size(), 2U); return country_string; diff --git a/components/tor/tor_control_unittest.cc b/components/tor/tor_control_unittest.cc index 9b5d09e09ba1..c6c02e9de08f 100644 --- a/components/tor/tor_control_unittest.cc +++ b/components/tor/tor_control_unittest.cc @@ -45,8 +45,8 @@ TEST(TorControlTest, ParseQuoted) { {"\"unix:/a\\\"b/c\"", "unix:/a\"b/c", 14}, {"\"unix:/a\\'b/c\"", "unix:/a'b/c", 14}, {"\"unix:/a b/c\" \"127.0.0.1:9050\"", "unix:/a b/c", 13}, - {"\"unix:/a b/c", nullptr, -1}, - {"\"unix:/a\\fb/c\"", nullptr, -1}, + {"\"unix:/a b/c", nullptr, static_cast(-1)}, + {"\"unix:/a\\fb/c\"", nullptr, static_cast(-1)}, }; size_t i; @@ -77,7 +77,7 @@ TEST(TorControlTest, ParseKV) { {"foo=\"bar\\\"baz\"", "foo", "bar\"baz", 14}, {"foo=\"bar\\\"baz\" quux=\"zot\"", "foo", "bar\"baz", 15}, {"foo=barbaz quux=zot", "foo", "barbaz", 11}, - {"foo=\"bar", nullptr, nullptr, -1}, + {"foo=\"bar", nullptr, nullptr, static_cast(-1)}, }; size_t i; diff --git a/patches/net-socket-socks5_client_socket.cc.patch b/patches/net-socket-socks5_client_socket.cc.patch index 688e9ec76c28..8ffb6d889025 100644 --- a/patches/net-socket-socks5_client_socket.cc.patch +++ b/patches/net-socket-socks5_client_socket.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc -index ae130d9b5f8b83ded0bcdc83c1c392904967cd6f..ff8adb800f2d18c25260158b0460b561cc4e209e 100644 +index ae130d9b5f8b83ded0bcdc83c1c392904967cd6f..3335cddfd75ea2da414aef8766333f1235fec4e7 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc @@ -238,6 +238,9 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { @@ -30,7 +30,7 @@ index ae130d9b5f8b83ded0bcdc83c1c392904967cd6f..ff8adb800f2d18c25260158b0460b561 + const char greeting[] = { + 0x05, // SOCKS version + 0x01, // number of authentication methods -+ auth_method(), ++ static_cast(auth_method()), + }; + buffer_ = std::string(greeting, sizeof(greeting)); bytes_sent_ = 0; diff --git a/vendor/bat-native-ads/include/bat/ads/page_transition_types.h b/vendor/bat-native-ads/include/bat/ads/page_transition_types.h index 402cc29fead6..671c93c1c4d7 100644 --- a/vendor/bat-native-ads/include/bat/ads/page_transition_types.h +++ b/vendor/bat-native-ads/include/bat/ads/page_transition_types.h @@ -19,7 +19,7 @@ namespace ads { // A type is made of a core value and a set of qualifiers. A type has one core // value and 0 or or more qualifiers. -enum PageTransitionType : int32_t { +enum PageTransitionType : uint32_t { // User got to this page by clicking a link on another page. kPageTransitionLink = 0, From 4608286bf389c737a9a084e865134230fdf96560 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Thu, 8 Jul 2021 13:51:49 -0400 Subject: [PATCH 094/205] IWYU: early_hints.mojom.h --- browser/net/brave_proxying_url_loader_factory.cc | 1 + browser/net/brave_proxying_url_loader_factory.h | 1 + components/speedreader/speedreader_url_loader.cc | 1 + components/speedreader/speedreader_url_loader.h | 1 + 4 files changed, 4 insertions(+) diff --git a/browser/net/brave_proxying_url_loader_factory.cc b/browser/net/brave_proxying_url_loader_factory.cc index 9ec6bd9aae76..34813f9bd7d1 100644 --- a/browser/net/brave_proxying_url_loader_factory.cc +++ b/browser/net/brave_proxying_url_loader_factory.cc @@ -30,6 +30,7 @@ #include "net/url_request/url_request.h" #include "services/network/public/cpp/features.h" #include "services/network/public/cpp/parsed_headers.h" +#include "services/network/public/mojom/early_hints.mojom.h" #include "url/origin.h" namespace { diff --git a/browser/net/brave_proxying_url_loader_factory.h b/browser/net/brave_proxying_url_loader_factory.h index 1915beea6b33..cdf96d2b7d3b 100644 --- a/browser/net/brave_proxying_url_loader_factory.h +++ b/browser/net/brave_proxying_url_loader_factory.h @@ -28,6 +28,7 @@ #include "net/base/completion_once_callback.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "services/network/public/cpp/resource_request.h" +#include "services/network/public/mojom/early_hints.mojom-forward.h" #include "services/network/public/mojom/network_context.mojom.h" #include "services/network/public/mojom/url_loader.mojom.h" #include "services/network/public/mojom/url_loader_factory.mojom.h" diff --git a/components/speedreader/speedreader_url_loader.cc b/components/speedreader/speedreader_url_loader.cc index 99dcb6f433b3..34536cf0b67f 100644 --- a/components/speedreader/speedreader_url_loader.cc +++ b/components/speedreader/speedreader_url_loader.cc @@ -17,6 +17,7 @@ #include "brave/components/speedreader/speedreader_rewriter_service.h" #include "brave/components/speedreader/speedreader_throttle.h" #include "mojo/public/cpp/bindings/self_owned_receiver.h" +#include "services/network/public/mojom/early_hints.mojom.h" #include "services/network/public/mojom/url_response_head.mojom.h" namespace speedreader { diff --git a/components/speedreader/speedreader_url_loader.h b/components/speedreader/speedreader_url_loader.h index 652ff61208c5..7fd096d5c645 100644 --- a/components/speedreader/speedreader_url_loader.h +++ b/components/speedreader/speedreader_url_loader.h @@ -20,6 +20,7 @@ #include "mojo/public/cpp/bindings/remote.h" #include "mojo/public/cpp/system/data_pipe.h" #include "mojo/public/cpp/system/simple_watcher.h" +#include "services/network/public/mojom/early_hints.mojom-forward.h" #include "services/network/public/mojom/url_loader.mojom.h" #include "services/network/public/mojom/url_response_head.mojom-forward.h" #include "third_party/abseil-cpp/absl/types/optional.h" From e3ebbace0e6c466394f64ebd2c147b559a97358f Mon Sep 17 00:00:00 2001 From: samartnik Date: Thu, 8 Jul 2021 16:38:12 -0400 Subject: [PATCH 095/205] [Android] Java code adjustments Mostly related to changes for various c-tor signatures. --- android/java/apk_for_test.flags | 5 ++++ .../chrome/browser/ntp/BraveNewTabPage.java | 6 +++-- .../browser/signin/BraveSigninManager.java | 6 ++--- ...raveTabSwitcherModeTTCoordinatorPhone.java | 6 +++-- .../toolbar/top/BraveToolbarLayout.java | 8 ++++-- .../top/BraveTopToolbarCoordinator.java | 17 ++++++++---- .../chromium/chrome/browser/BytecodeTest.java | 26 ++++++++++++++++++- browser/brave_profile_prefs.cc | 1 + ...raveTopToolbarCoordinatorClassAdapter.java | 2 ++ ...-browser-toolbar-ToolbarManager.java.patch | 11 +------- test/BUILD.gn | 1 + 11 files changed, 64 insertions(+), 25 deletions(-) diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index 02acb6141ed9..eeebe0dfaa4d 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -137,6 +137,11 @@ -keep class org.chromium.chrome.browser.toolbar.top.TopToolbarCoordinator { *** mTabSwitcherModeCoordinatorPhone; *** mOptionalButtonController; + public (...); +} + +-keep class org.chromium.chrome.browser.toolbar.top.BraveTopToolbarCoordinator { + public (...); } -keep class org.chromium.chrome.browser.toolbar.top.TabSwitcherModeTTCoordinatorPhone { diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java index d2b661cc30ff..99f1ba013bd9 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java @@ -9,6 +9,7 @@ import androidx.annotation.Nullable; +import org.chromium.base.jank_tracker.JankTracker; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; @@ -38,10 +39,11 @@ public BraveNewTabPage(Activity activity, boolean isTablet, NewTabPageUma uma, boolean isInNightMode, NativePageHost nativePageHost, Tab tab, String url, BottomSheetController bottomSheetController, - Supplier shareDelegateSupplier, WindowAndroid windowAndroid) { + Supplier shareDelegateSupplier, WindowAndroid windowAndroid, + JankTracker jankTracker) { super(activity, browserControlsStateProvider, activityTabProvider, snackbarManager, lifecycleDispatcher, tabModelSelector, isTablet, uma, isInNightMode, nativePageHost, - tab, url, bottomSheetController, shareDelegateSupplier, windowAndroid); + tab, url, bottomSheetController, shareDelegateSupplier, windowAndroid, jankTracker); assert mNewTabPageLayout instanceof BraveNewTabPageLayout; if (mNewTabPageLayout instanceof BraveNewTabPageLayout) { diff --git a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java index 43270288b1b0..9adb8ef6ed8c 100644 --- a/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java +++ b/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java @@ -15,7 +15,7 @@ import org.chromium.chrome.browser.AppHooks; import org.chromium.chrome.browser.signin.services.SigninManager; import org.chromium.components.signin.base.CoreAccountInfo; -import org.chromium.components.signin.identitymanager.AccountInfoServiceImpl; +import org.chromium.components.signin.identitymanager.AccountInfoServiceProvider; import org.chromium.components.signin.identitymanager.AccountTrackerService; import org.chromium.components.signin.identitymanager.IdentityManager; import org.chromium.components.signin.identitymanager.IdentityMutator; @@ -102,12 +102,12 @@ public String extractDomainName(String accountEmail) { static SigninManager create(long nativeSigninManagerAndroid, AccountTrackerService accountTrackerService, IdentityManager identityManager, IdentityMutator identityMutator) { - AccountInfoServiceImpl.init(identityManager, accountTrackerService); + AccountInfoServiceProvider.init(identityManager, accountTrackerService); return new BraveSigninManager(identityManager); } @CalledByNative void destroy() { - AccountInfoServiceImpl.get().destroy(); + AccountInfoServiceProvider.get().destroy(); } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java index bc8555ace87a..cb92dabd4394 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java @@ -7,6 +7,7 @@ import android.view.ViewStub; +import org.chromium.base.supplier.BooleanSupplier; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; class BraveTabSwitcherModeTTCoordinatorPhone extends TabSwitcherModeTTCoordinatorPhone { @@ -17,9 +18,10 @@ class BraveTabSwitcherModeTTCoordinatorPhone extends TabSwitcherModeTTCoordinato BraveTabSwitcherModeTTCoordinatorPhone(ViewStub tabSwitcherToolbarStub, MenuButtonCoordinator menuButtonCoordinator, boolean isGridTabSwitcherEnabled, - boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled) { + boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled, + BooleanSupplier isIncognitoModeEnabledSupplier) { super(tabSwitcherToolbarStub, menuButtonCoordinator, isGridTabSwitcherEnabled, - isTabToGtsAnimationEnabled, isStartSurfaceEnabled); + isTabToGtsAnimationEnabled, isStartSurfaceEnabled, isIncognitoModeEnabledSupplier); mBraveMenuButtonCoordinator = menuButtonCoordinator; } diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java index 66af9c4eef12..e57a5757e257 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -62,6 +62,7 @@ import org.chromium.chrome.browser.BraveRewardsNativeWorker; import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.BraveRewardsPanelPopup; +import org.chromium.chrome.browser.NavigationPopup.HistoryDelegate; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.brave_stats.BraveStatsUtil; import org.chromium.chrome.browser.custom_layout.popup_window_tooltip.PopupWindowTooltip; @@ -105,6 +106,7 @@ import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.top.ToolbarLayout; +import org.chromium.chrome.browser.toolbar.top.ToolbarTablet.OfflineDownloader; import org.chromium.chrome.browser.util.PackageUtils; import org.chromium.components.browser_ui.styles.ChromeColors; import org.chromium.components.embedder_support.util.UrlConstants; @@ -1256,8 +1258,10 @@ private boolean isMenuButtonOnBottom() { @Override protected void initialize(ToolbarDataProvider toolbarDataProvider, ToolbarTabController tabController, MenuButtonCoordinator menuButtonCoordinator, - BooleanSupplier isInVrSupplier) { - super.initialize(toolbarDataProvider, tabController, menuButtonCoordinator, isInVrSupplier); + BooleanSupplier isInVrSupplier, HistoryDelegate historyDelegate, + BooleanSupplier partnerHomepageEnabledSupplier, OfflineDownloader offlineDownloader) { + super.initialize(toolbarDataProvider, tabController, menuButtonCoordinator, isInVrSupplier, + historyDelegate, partnerHomepageEnabledSupplier, offlineDownloader); BraveMenuButtonCoordinator.setMenuFromBottom(isMenuButtonOnBottom()); } diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java index 9fbccd9fe112..3e467af87af6 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -13,6 +13,7 @@ import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; +import org.chromium.chrome.browser.NavigationPopup.HistoryDelegate; import org.chromium.chrome.browser.identity_disc.IdentityDiscController; import org.chromium.chrome.browser.layouts.LayoutStateProvider; import org.chromium.chrome.browser.tabmodel.TabModelSelector; @@ -22,6 +23,7 @@ import org.chromium.chrome.browser.toolbar.ToolbarDataProvider; import org.chromium.chrome.browser.toolbar.ToolbarTabController; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; +import org.chromium.chrome.browser.toolbar.top.ToolbarTablet.OfflineDownloader; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.chrome.browser.user_education.UserEducationHelper; import org.chromium.chrome.features.start_surface.StartSurface; @@ -53,8 +55,10 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, Callback invalidatorCallback, Supplier identityDiscButtonSupplier, OneshotSupplier startSurfaceSupplier, Supplier resourceManagerSupplier, BooleanSupplier isInVrSupplier, - boolean isGridTabSwitcherEnabled, boolean isTabToGtsAnimationEnabled, - boolean isStartSurfaceEnabled, boolean isTabGroupsAndroidContinuationEnabled) { + BooleanSupplier isIncognitoModeEnabledSupplier, boolean isGridTabSwitcherEnabled, + boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled, + boolean isTabGroupsAndroidContinuationEnabled, HistoryDelegate historyDelegate, + BooleanSupplier partnerHomepageEnabledSupplier, OfflineDownloader offlineDownloader) { super(controlContainer, toolbarLayout, toolbarDataProvider, tabController, userEducationHelper, buttonDataProviders, layoutStateProviderSupplier, normalThemeColorProvider, overviewThemeColorProvider, @@ -63,8 +67,10 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, startSurfaceAsHomepageSupplier, homepageManagedByPolicySupplier, identityDiscStateSupplier, invalidatorCallback, identityDiscButtonSupplier, startSurfaceSupplier, resourceManagerSupplier, isInVrSupplier, - isGridTabSwitcherEnabled, isTabToGtsAnimationEnabled, isStartSurfaceEnabled, - isTabGroupsAndroidContinuationEnabled); + isIncognitoModeEnabledSupplier, isGridTabSwitcherEnabled, + isTabToGtsAnimationEnabled, isStartSurfaceEnabled, + isTabGroupsAndroidContinuationEnabled, historyDelegate, + partnerHomepageEnabledSupplier, offlineDownloader); mBraveToolbarLayout = toolbarLayout; @@ -73,7 +79,8 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, mTabSwitcherModeCoordinatorPhone = new BraveTabSwitcherModeTTCoordinatorPhone( controlContainer.getRootView().findViewById(R.id.tab_switcher_toolbar_stub), overviewModeMenuButtonCoordinator, isGridTabSwitcherEnabled, - isTabToGtsAnimationEnabled, isStartSurfaceEnabled); + isTabToGtsAnimationEnabled, isStartSurfaceEnabled, + isIncognitoModeEnabledSupplier); } } } diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 86863be9960d..0a47bd788026 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -19,10 +19,13 @@ import org.junit.runner.RunWith; import org.chromium.base.Callback; +import org.chromium.base.jank_tracker.JankTracker; +import org.chromium.base.supplier.BooleanSupplier; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.NavigationPopup.HistoryDelegate; import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; @@ -50,14 +53,20 @@ import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.theme.ThemeColorProvider; import org.chromium.chrome.browser.theme.TopUiThemeColorProvider; +import org.chromium.chrome.browser.toolbar.ToolbarDataProvider; import org.chromium.chrome.browser.toolbar.ToolbarManager; +import org.chromium.chrome.browser.toolbar.ToolbarTabController; +import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.top.ToolbarActionModeCallback; import org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer; +import org.chromium.chrome.browser.toolbar.top.ToolbarLayout; +import org.chromium.chrome.browser.toolbar.top.ToolbarTablet.OfflineDownloader; import org.chromium.chrome.browser.ui.TabObscuringHandler; import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; import org.chromium.chrome.browser.ui.messages.snackbar.SnackbarManager; import org.chromium.chrome.browser.ui.native_page.NativePageHost; import org.chromium.chrome.browser.ui.system.StatusBarColorController; +import org.chromium.chrome.browser.user_education.UserEducationHelper; import org.chromium.chrome.test.ChromeJUnit4ClassRunner; import org.chromium.components.browser_ui.bottomsheet.BottomSheetController; import org.chromium.components.browser_ui.widget.scrim.ScrimCoordinator; @@ -107,6 +116,8 @@ public void testClassesExist() throws Exception { Assert.assertTrue(classExists("org/chromium/chrome/browser/toolbar/BraveToolbarManager")); Assert.assertTrue( classExists("org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator")); + Assert.assertTrue( + classExists("org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator")); Assert.assertTrue(classExists( "org/chromium/chrome/browser/toolbar/top/TabSwitcherModeTTCoordinatorPhone")); Assert.assertTrue( @@ -361,12 +372,25 @@ public void testConstructorsExistAndMatch() throws Exception { BrowserControlsStateProvider.class, Supplier.class, SnackbarManager.class, ActivityLifecycleDispatcher.class, TabModelSelector.class, boolean.class, NewTabPageUma.class, boolean.class, NativePageHost.class, Tab.class, String.class, - BottomSheetController.class, Supplier.class, WindowAndroid.class)); + BottomSheetController.class, Supplier.class, WindowAndroid.class, + JankTracker.class)); Assert.assertTrue(constructorsMatch( "org/chromium/chrome/browser/omnibox/suggestions/editurl/EditUrlSuggestionProcessor", "org/chromium/chrome/browser/omnibox/suggestions/editurl/BraveEditUrlSuggestionProcessor", Context.class, SuggestionHost.class, UrlBarDelegate.class, Supplier.class, Supplier.class, Supplier.class)); + Assert.assertTrue(constructorsMatch( + "org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator", + "org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator", + ToolbarControlContainer.class, ToolbarLayout.class, ToolbarDataProvider.class, + ToolbarTabController.class, UserEducationHelper.class, List.class, + OneshotSupplier.class, ThemeColorProvider.class, ThemeColorProvider.class, + MenuButtonCoordinator.class, MenuButtonCoordinator.class, ObservableSupplier.class, + ObservableSupplier.class, ObservableSupplier.class, ObservableSupplier.class, + ObservableSupplier.class, ObservableSupplier.class, Callback.class, Supplier.class, + OneshotSupplier.class, Supplier.class, BooleanSupplier.class, BooleanSupplier.class, + boolean.class, boolean.class, boolean.class, boolean.class, HistoryDelegate.class, + BooleanSupplier.class, OfflineDownloader.class)); } @Test diff --git a/browser/brave_profile_prefs.cc b/browser/brave_profile_prefs.cc index 49870d5d059c..237f1850b30c 100644 --- a/browser/brave_profile_prefs.cc +++ b/browser/brave_profile_prefs.cc @@ -109,6 +109,7 @@ #if defined(OS_ANDROID) #include "components/feed/core/shared_prefs/pref_names.h" +#include "components/ntp_tiles/pref_names.h" #include "components/translate/core/browser/translate_pref_names.h" #endif diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveTopToolbarCoordinatorClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveTopToolbarCoordinatorClassAdapter.java index 4b8b0200db26..6568f102a38a 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveTopToolbarCoordinatorClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveTopToolbarCoordinatorClassAdapter.java @@ -16,6 +16,8 @@ public class BraveTopToolbarCoordinatorClassAdapter extends BraveClassVisitor { public BraveTopToolbarCoordinatorClassAdapter(ClassVisitor visitor) { super(visitor); + redirectConstructor(sTopToolbarCoordinatorClassName, sBraveTopToolbarCoordinatorClassName); + deleteField(sBraveTopToolbarCoordinatorClassName, "mTabSwitcherModeCoordinatorPhone"); makeProtectedField(sTopToolbarCoordinatorClassName, "mTabSwitcherModeCoordinatorPhone"); 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 3e4355d9ae57..9de25e8afece 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,5 +1,5 @@ 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 002333dfcc4aba1bb7122a4793200995a1d6a400..65a2efb964adb8725ba4b73a9c91867ae5dd1387 100644 +index 002333dfcc4aba1bb7122a4793200995a1d6a400..12c6e399cd8ad1fad50f3abc2ebfc250eadf46ff 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 @@ -499,13 +499,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve @@ -18,12 +18,3 @@ index 002333dfcc4aba1bb7122a4793200995a1d6a400..65a2efb964adb8725ba4b73a9c91867a appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mWindowAndroid, (focus, type) -> setUrlBarFocus(focus, type), requestFocusRunnable, shouldShowUpdateBadge, isInOverviewModeSupplier, overviewModeThemeColorProvider, -@@ -942,7 +942,7 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve - boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled, - boolean isTabGroupsAndroidContinuationEnabled) { - // clang-format off -- TopToolbarCoordinator toolbar = new TopToolbarCoordinator(controlContainer, toolbarLayout, -+ TopToolbarCoordinator toolbar = new org.chromium.chrome.browser.toolbar.top.BraveTopToolbarCoordinator(controlContainer, toolbarLayout, - mLocationBarModel, mToolbarTabController, - new UserEducationHelper(mActivity, mHandler), - buttonDataProviders, mLayoutStateProviderSupplier, browsingModeThemeColorProvider, diff --git a/test/BUILD.gn b/test/BUILD.gn index feca36dbd99e..1a7eca3b778b 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -1103,6 +1103,7 @@ if (is_android) { "//chrome/browser/ui/android/theme:java", "//chrome/browser/ui/android/toolbar:java", "//chrome/browser/ui/messages/android:java", + "//chrome/browser/user_education:java", "//chrome/test/android:chrome_java_test_support", "//components/browser_ui/bottomsheet/android:java", "//components/browser_ui/widget/android:java", From 866683157a4ed5e18790e521c34abdcaf35f2fe4 Mon Sep 17 00:00:00 2001 From: samartnik Date: Fri, 9 Jul 2021 16:53:52 -0400 Subject: [PATCH 096/205] [Android] Changes for MenuButton implementation Chromium change: https://chromium.googlesource.com/chromium/src/+/4a6f627495111794c56c46873349521bcc9b5b22 Toolbar: Remove deps on chrome/browser/omaha This CL applies some refactoring around toolbar/omaha in preparation for toolbar modularization: - Moves menu button/ui/item state definitions from c.b.omaha.UpdateMenuItemHelper to toolbar/menu_button - Inject MenuButtonState supplier to MenuButton MVC instead of the components calling UpdateMenuItemHelper directly Bug: 1127732 --- android/java/apk_for_test.flags | 8 +++++++ .../BrowsingModeBottomToolbarCoordinator.java | 13 ++++++++++-- .../TabSwitcherBottomToolbarCoordinator.java | 9 ++++++++ .../BraveMenuButtonCoordinator.java | 12 +++++++++++ .../chromium/chrome/browser/BytecodeTest.java | 15 ++++++++++++- build/android/bytecode/BUILD.gn | 1 + .../org/brave/bytecode/BraveClassAdapter.java | 1 + ...raveMenuButtonCoordinatorClassAdapter.java | 21 +++++++++++++++++++ ...-browser-toolbar-ToolbarManager.java.patch | 20 ------------------ 9 files changed, 77 insertions(+), 23 deletions(-) create mode 100644 build/android/bytecode/java/org/brave/bytecode/BraveMenuButtonCoordinatorClassAdapter.java delete mode 100644 patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index eeebe0dfaa4d..2dd0d5875d72 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -348,3 +348,11 @@ *** isEnhancedProtectionPromoEnabled(...); *** isReliabilityLoggingEnabled(...); } + +-keep class org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator { + public (...); +} + +-keep class org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator { + public (...); +} diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java index df3dcc90cc23..83a3e2cf4d41 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BrowsingModeBottomToolbarCoordinator.java @@ -14,11 +14,13 @@ import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneShotCallback; import org.chromium.base.supplier.OneshotSupplier; +import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; import org.chromium.chrome.browser.feature_engagement.TrackerFactory; +import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabImpl; @@ -30,7 +32,9 @@ import org.chromium.chrome.browser.toolbar.TabCountProvider; import org.chromium.chrome.browser.toolbar.TabSwitcherButtonCoordinator; import org.chromium.chrome.browser.toolbar.TabSwitcherButtonView; +import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; +import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonState; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.components.feature_engagement.FeatureConstants; import org.chromium.components.feature_engagement.Tracker; @@ -157,8 +161,13 @@ public class BrowsingModeBottomToolbarCoordinator { } mMenuButton = mToolbarRoot.findViewById(R.id.menu_button_wrapper); - if (!BottomToolbarVariationManager.isMenuButtonOnBottom()) { - mMenuButton.setVisibility(View.GONE); + if (mMenuButton != null) { + Supplier menuButtonStateSupplier = + () -> UpdateMenuItemHelper.getInstance().getUiState().buttonState; + BraveMenuButtonCoordinator.setupPropertyModel(mMenuButton, menuButtonStateSupplier); + if (!BottomToolbarVariationManager.isMenuButtonOnBottom()) { + mMenuButton.setVisibility(View.GONE); + } } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java index 4dfb3c410f27..c57f8bfc506e 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/TabSwitcherBottomToolbarCoordinator.java @@ -14,11 +14,15 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneShotCallback; +import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; +import org.chromium.chrome.browser.omaha.UpdateMenuItemHelper; import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; import org.chromium.chrome.browser.theme.ThemeColorProvider; import org.chromium.chrome.browser.toolbar.TabCountProvider; +import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.menu_button.MenuButton; +import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonState; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.ui.modelutil.PropertyModelChangeProcessor; @@ -85,6 +89,11 @@ public class TabSwitcherBottomToolbarCoordinator { mNewTabButton.setThemeColorProvider(themeColorProvider); mMenuButton = root.findViewById(R.id.menu_button_wrapper); + if (mMenuButton != null) { + Supplier menuButtonStateSupplier = + () -> UpdateMenuItemHelper.getInstance().getUiState().buttonState; + BraveMenuButtonCoordinator.setupPropertyModel(mMenuButton, menuButtonStateSupplier); + } new OneShotCallback<>(menuButtonHelperSupplier, (menuButtonHelper) -> { assert menuButtonHelper != null; diff --git a/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java index bea5077d6b1a..5067e64f8139 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java @@ -21,6 +21,8 @@ import org.chromium.chrome.browser.toolbar.top.BraveToolbarLayout; import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinator; import org.chromium.ui.base.WindowAndroid; +import org.chromium.ui.modelutil.PropertyModel; +import org.chromium.ui.modelutil.PropertyModelChangeProcessor; public class BraveMenuButtonCoordinator extends MenuButtonCoordinator { private static final String BRAVE_IS_MENU_FROM_BOTTOM = "brave_is_menu_from_bottom"; @@ -78,4 +80,14 @@ public static boolean isMenuFromBottom() { SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences(); return sharedPreferences.getBoolean(BRAVE_IS_MENU_FROM_BOTTOM, true); } + + public static void setupPropertyModel( + MenuButton menuButton, Supplier menuButtonStateSupplier) { + PropertyModel menuButtonPropertyModel = + new PropertyModel.Builder(MenuButtonProperties.ALL_KEYS) + .with(MenuButtonProperties.STATE_SUPPLIER, menuButtonStateSupplier) + .build(); + PropertyModelChangeProcessor.create( + menuButtonPropertyModel, menuButton, new MenuButtonViewBinder()); + } } diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 0a47bd788026..ad6e87852e08 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -29,6 +29,7 @@ import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; +import org.chromium.chrome.browser.browser_controls.BrowserStateBrowserControlsVisibilityDelegate; import org.chromium.chrome.browser.compositor.CompositorViewHolder; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.feed.webfeed.WebFeedBridge; @@ -97,7 +98,8 @@ public void testClassesExist() throws Exception { Assert.assertTrue(classExists("org/chromium/chrome/browser/LaunchIntentDispatcher")); Assert.assertTrue(classExists("org/chromium/chrome/browser/ntp/NewTabPageLayout")); Assert.assertTrue(classExists("org/chromium/chrome/browser/feed/FeedSurfaceCoordinator")); - Assert.assertTrue(classExists("org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator")); + Assert.assertTrue( + classExists("org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator")); Assert.assertTrue(classExists("org/chromium/chrome/browser/ntp/NewTabPage")); Assert.assertTrue(classExists("org/chromium/chrome/browser/ntp/BraveNewTabPage")); Assert.assertTrue(classExists( @@ -189,6 +191,10 @@ public void testClassesExist() throws Exception { Assert.assertTrue(classExists("org/chromium/chrome/browser/omnibox/status/StatusMediator")); Assert.assertTrue( classExists("org/chromium/chrome/browser/omnibox/status/BraveStatusMediator")); + Assert.assertTrue(classExists( + "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator")); + Assert.assertTrue(classExists( + "org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator")); } @Test @@ -391,6 +397,13 @@ public void testConstructorsExistAndMatch() throws Exception { OneshotSupplier.class, Supplier.class, BooleanSupplier.class, BooleanSupplier.class, boolean.class, boolean.class, boolean.class, boolean.class, HistoryDelegate.class, BooleanSupplier.class, OfflineDownloader.class)); + Assert.assertTrue(constructorsMatch( + "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator", + "org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator", + OneshotSupplier.class, BrowserStateBrowserControlsVisibilityDelegate.class, + WindowAndroid.class, MenuButtonCoordinator.SetFocusFunction.class, Runnable.class, + boolean.class, Supplier.class, ThemeColorProvider.class, Supplier.class, + Runnable.class, int.class)); } @Test diff --git a/build/android/bytecode/BUILD.gn b/build/android/bytecode/BUILD.gn index 9fc3d43c0e8b..b0bc803138bb 100644 --- a/build/android/bytecode/BUILD.gn +++ b/build/android/bytecode/BUILD.gn @@ -26,6 +26,7 @@ java_binary("java_bytecode_rewriter") { "//brave/build/android/bytecode/java/org/brave/bytecode/BraveLayoutManagerChromeClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveMainPreferenceBaseClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveManageSyncSettingsClassAdapter.java", + "//brave/build/android/bytecode/java/org/brave/bytecode/BraveMenuButtonCoordinatorClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveMimeUtilsClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageClassAdapter.java", "//brave/build/android/bytecode/java/org/brave/bytecode/BraveNewTabPageLayoutClassAdapter.java", diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java index 8e800477c517..0e94782999b4 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveClassAdapter.java @@ -25,6 +25,7 @@ public static ClassVisitor createAdapter(ClassVisitor chain) { chain = new BraveLayoutManagerChromeClassAdapter(chain); chain = new BraveMainPreferenceBaseClassAdapter(chain); chain = new BraveManageSyncSettingsClassAdapter(chain); + chain = new BraveMenuButtonCoordinatorClassAdapter(chain); chain = new BraveMimeUtilsClassAdapter(chain); chain = new BraveNewTabPageClassAdapter(chain); chain = new BraveNewTabPageLayoutClassAdapter(chain); diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveMenuButtonCoordinatorClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveMenuButtonCoordinatorClassAdapter.java new file mode 100644 index 000000000000..ffe0f73e4e50 --- /dev/null +++ b/build/android/bytecode/java/org/brave/bytecode/BraveMenuButtonCoordinatorClassAdapter.java @@ -0,0 +1,21 @@ +/* Copyright (c) 2021 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.brave.bytecode; + +import org.objectweb.asm.ClassVisitor; + +public class BraveMenuButtonCoordinatorClassAdapter extends BraveClassVisitor { + static String sMenuButtonCoordinator = + "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator"; + static String sBraveMenuButtonCoordinator = + "org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator"; + + public BraveMenuButtonCoordinatorClassAdapter(ClassVisitor visitor) { + super(visitor); + + redirectConstructor(sMenuButtonCoordinator, sBraveMenuButtonCoordinator); + } +} 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 deleted file mode 100644 index 9de25e8afece..000000000000 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-ToolbarManager.java.patch +++ /dev/null @@ -1,20 +0,0 @@ -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 002333dfcc4aba1bb7122a4793200995a1d6a400..12c6e399cd8ad1fad50f3abc2ebfc250eadf46ff 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 -@@ -499,13 +499,13 @@ public class ToolbarManager implements UrlFocusChangeListener, ThemeColorObserve - Runnable onMenuButtonClicked = - () -> UpdateMenuItemHelper.getInstance().onMenuButtonClicked(); - // clang-format off -- mMenuButtonCoordinator = new MenuButtonCoordinator(appMenuCoordinatorSupplier, -+ mMenuButtonCoordinator = new org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator(appMenuCoordinatorSupplier, - mControlsVisibilityDelegate, mWindowAndroid, - (focus, type) -> setUrlBarFocus(focus, type), requestFocusRunnable, - shouldShowUpdateBadge, isInOverviewModeSupplier, menuButtonThemeColorProvider, - menuButtonStateSupplier, onMenuButtonClicked, R.id.menu_button_wrapper); - if (shouldShowUpdateBadge) mMenuStateObserver = mMenuButtonCoordinator.getStateObserver(); -- MenuButtonCoordinator startSurfaceMenuButtonCoordinator = new MenuButtonCoordinator( -+ MenuButtonCoordinator startSurfaceMenuButtonCoordinator = new org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator( - appMenuCoordinatorSupplier, mControlsVisibilityDelegate, mWindowAndroid, - (focus, type) -> setUrlBarFocus(focus, type), requestFocusRunnable, - shouldShowUpdateBadge, isInOverviewModeSupplier, overviewModeThemeColorProvider, From 37e80754e926ebfdb5f547c3258f46f285267d55 Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Mon, 12 Jul 2021 19:08:04 -0400 Subject: [PATCH 097/205] [iOS] iOS 12 has been deprecated. Chromium change: https://chromium.googlesource.com/chromium/src/+/b452ca696d154bb46945947cf2964f4955f3ad07 commit b452ca696d154bb46945947cf2964f4955f3ad07 Author: David Jean Date: Wed Jun 16 09:56:21 2021 +0000 [ios] Move ios deployment target to 13.0 To be submitted after https://chromium-review.googlesource.com/c/chromium/src/+/2944943 Bug: 1131852 --- build/commands/lib/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/commands/lib/config.js b/build/commands/lib/config.js index 36d3de79deb2..433a416bc47a 100755 --- a/build/commands/lib/config.js +++ b/build/commands/lib/config.js @@ -409,7 +409,7 @@ Config.prototype.buildArgs = function () { // Component builds are not supported for iOS: // https://chromium.googlesource.com/chromium/src/+/master/docs/component_build.md args.is_component_build = false - args.ios_deployment_target = '12.0' + args.ios_deployment_target = '13.0' args.ios_enable_code_signing = false args.fatal_linker_warnings = !this.isComponentBuild() // DCHECK's crash on Static builds without allowing the debugger to continue From 21ad57ec8dcfd6ccf685237647761eb8851d0a3b Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Mon, 12 Jul 2021 20:43:13 -0400 Subject: [PATCH 098/205] [iOS] ProfileSyncService was renamed to SyncServiceImpl. Chromium change: https://source.chromium.org/chromium/chromium/src/+/b77854267a62e9208b1ac5ceb4167387ec7c56cc commit b77854267a62e9208b1ac5ceb4167387ec7c56cc Author: Victor Hugo Vianna Silva Date: Fri Jun 4 09:15:21 2021 +0000 Reland "Rename ProfileSyncService to SyncServiceImpl" Reason for reland: Original CL was reverted to unwind other changes. Original change's description: > Rename ProfileSyncService to SyncServiceImpl > > Renaming related classes like ProfileSyncServiceAndroid and > ProfileSyncServiceHarness is left for next CLs. We also use this CL as > an opportunity to hide the implementation class when possible: > - Some includes for sync_service_impl.h are removed if unnecessary, or > replaced with sync_service.h. > - Even comments referring to SyncServiceImpl are updated to refer to > the interface if the layer isn't aware SyncServiceImpl is being used. > > The CL also adds one missing include for in > fake_server_helper_android.cc to address one IWYU presubmit warning. Bug: 1201272 --- ios/browser/api/sync/brave_sync_api.mm | 2 +- ios/browser/api/sync/brave_sync_worker.cc | 6 +++--- ios/browser/api/sync/brave_sync_worker.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ios/browser/api/sync/brave_sync_api.mm b/ios/browser/api/sync/brave_sync_api.mm index 966344eb588f..0edec649e866 100644 --- a/ios/browser/api/sync/brave_sync_api.mm +++ b/ios/browser/api/sync/brave_sync_api.mm @@ -217,7 +217,7 @@ - (id)createSyncDeviceObserver:(void (^)())onDeviceInfoChanged { } - (id)createSyncServiceObserver:(void (^)())onSyncServiceStateChanged { - auto* service = SyncServiceFactory::GetAsProfileSyncServiceForBrowserState( + auto* service = SyncServiceFactory::GetAsSyncServiceImplForBrowserState( _chromeBrowserState); return [[BraveSyncServiceObserver alloc] initWithProfileSyncService:service diff --git a/ios/browser/api/sync/brave_sync_worker.cc b/ios/browser/api/sync/brave_sync_worker.cc index d1be5b0264fe..171e98510ac0 100644 --- a/ios/browser/api/sync/brave_sync_worker.cc +++ b/ios/browser/api/sync/brave_sync_worker.cc @@ -54,11 +54,11 @@ void BraveSyncDeviceTracker::OnDeviceInfoChange() { } BraveSyncServiceTracker::BraveSyncServiceTracker( - syncer::SyncServiceImpl* profile_sync_service, + syncer::SyncServiceImpl* sync_service_impl, std::function on_state_changed_callback) : on_state_changed_callback_(on_state_changed_callback) { - DCHECK(profile_sync_service); - sync_service_observer_.Observe(profile_sync_service); + DCHECK(sync_service_impl); + sync_service_observer_.Observe(sync_service_impl); } BraveSyncServiceTracker::~BraveSyncServiceTracker() { diff --git a/ios/browser/api/sync/brave_sync_worker.h b/ios/browser/api/sync/brave_sync_worker.h index c053af15af5d..ab69bb416dfc 100644 --- a/ios/browser/api/sync/brave_sync_worker.h +++ b/ios/browser/api/sync/brave_sync_worker.h @@ -23,7 +23,7 @@ namespace syncer { class BraveProfileSyncService; class DeviceInfo; class BraveDeviceInfo; -class ProfileSyncService; +class SyncServiceImpl; } // namespace syncer class BraveSyncDeviceTracker : public syncer::DeviceInfoTracker::Observer { @@ -44,7 +44,7 @@ class BraveSyncDeviceTracker : public syncer::DeviceInfoTracker::Observer { class BraveSyncServiceTracker : public syncer::SyncServiceObserver { public: - BraveSyncServiceTracker(syncer::ProfileSyncService* profile_sync_service, + BraveSyncServiceTracker(syncer::SyncServiceImpl* sync_service_impl, std::function on_state_changed_callback); ~BraveSyncServiceTracker() override; From 9ebec47adb3d708b92aa0b1c7c81931fe5edbd8a Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Mon, 12 Jul 2021 21:01:40 -0400 Subject: [PATCH 099/205] [iOS] SyncSetupService::IsSyncEnabled has been deprecated. Chromium change: https://source.chromium.org/chromium/chromium/src/+/a5d08cca10836dd75af3118827746bbabf10dc86 commit a5d08cca10836dd75af3118827746bbabf10dc86 Author: Nohemi Fernandez Date: Mon Jun 14 12:36:36 2021 +0000 [iOS] Remove unused API isSyncEnabled from SyncSetupService. Bug: 1215925 --- ios/browser/api/sync/brave_sync_api.mm | 2 +- ios/browser/api/sync/brave_sync_worker.cc | 4 ++-- ios/browser/api/sync/brave_sync_worker.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ios/browser/api/sync/brave_sync_api.mm b/ios/browser/api/sync/brave_sync_api.mm index 0edec649e866..8db48bde9d9e 100644 --- a/ios/browser/api/sync/brave_sync_api.mm +++ b/ios/browser/api/sync/brave_sync_api.mm @@ -105,7 +105,7 @@ - (void)dealloc { } - (bool)syncEnabled { - return _worker->IsSyncEnabled(); + return _worker->CanSyncFeatureStart(); } - (void)setSyncEnabled:(bool)enabled { diff --git a/ios/browser/api/sync/brave_sync_worker.cc b/ios/browser/api/sync/brave_sync_worker.cc index 171e98510ac0..f4d63fcd2b0f 100644 --- a/ios/browser/api/sync/brave_sync_worker.cc +++ b/ios/browser/api/sync/brave_sync_worker.cc @@ -309,7 +309,7 @@ void BraveSyncWorker::OnResetDone() { } } -bool BraveSyncWorker::IsSyncEnabled() { +bool BraveSyncWorker::CanSyncFeatureStart() { DCHECK_CURRENTLY_ON(web::WebThread::UI); auto* setup_service = SyncSetupServiceFactory::GetForBrowserState(browser_state_); @@ -318,7 +318,7 @@ bool BraveSyncWorker::IsSyncEnabled() { return false; } - return setup_service->IsSyncEnabled(); + return setup_service->CanSyncFeatureStart(); } bool BraveSyncWorker::IsSyncFeatureActive() { diff --git a/ios/browser/api/sync/brave_sync_worker.h b/ios/browser/api/sync/brave_sync_worker.h index ab69bb416dfc..a2582351471e 100644 --- a/ios/browser/api/sync/brave_sync_worker.h +++ b/ios/browser/api/sync/brave_sync_worker.h @@ -69,7 +69,7 @@ class BraveSyncWorker : public syncer::SyncServiceObserver { std::string GetSyncCodeFromHexSeed(const std::string& hex_seed); const syncer::DeviceInfo* GetLocalDeviceInfo(); std::vector> GetDeviceList(); - bool IsSyncEnabled(); + bool CanSyncFeatureStart(); bool IsSyncFeatureActive(); bool IsFirstSetupComplete(); void ResetSync(); From 234a1a2e3017cc7cb5e493e7fffc3e42508d8682 Mon Sep 17 00:00:00 2001 From: Max Karolinskiy Date: Mon, 12 Jul 2021 21:05:38 -0400 Subject: [PATCH 100/205] [iOS] ProfileSyncServiceFactory -> SyncServiceFactory. Chromium change: https://source.chromium.org/chromium/chromium/src/+/c17aab02c3bc7cb9732708126a5001d15ad6efd3 commit c17aab02c3bc7cb9732708126a5001d15ad6efd3 Author: Victor Hugo Vianna Silva Date: Tue Jun 1 18:44:24 2021 +0000 Rename ios/'s ProfileSyncServiceFactory-s to SyncServiceFactory Same as crrev.com/c/2928734 but for the 2 factories in ios/: ProfileSyncServiceFactory and WebViewProfileSyncServiceFactory. Bug: 2928734 --- ios/app/brave_core_main.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ios/app/brave_core_main.mm b/ios/app/brave_core_main.mm index 94e600903fa0..1534dc471b90 100644 --- a/ios/app/brave_core_main.mm +++ b/ios/app/brave_core_main.mm @@ -30,7 +30,7 @@ #include "ios/chrome/browser/browser_state/chrome_browser_state_manager.h" #include "ios/chrome/browser/history/history_service_factory.h" #include "ios/chrome/browser/history/web_history_service_factory.h" -#include "ios/chrome/browser/sync/profile_sync_service_factory.h" +#include "ios/chrome/browser/sync/sync_service_factory.h" #include "ios/chrome/browser/undo/bookmark_undo_service_factory.h" #include "ios/public/provider/chrome/browser/chrome_browser_provider.h" #include "ios/web/public/init/web_main.h" @@ -187,7 +187,7 @@ - (BraveHistoryAPI*)historyAPI { - (BraveSyncProfileServiceIOS*)syncProfileService { if (!_syncProfileService) { syncer::SyncService* sync_service_ = - ProfileSyncServiceFactory::GetForBrowserState(_mainBrowserState); + SyncServiceFactory::GetForBrowserState(_mainBrowserState); _syncProfileService = [[BraveSyncProfileServiceIOS alloc] initWithProfileSyncService:sync_service_]; } From bfc0516bf204694f8c65ce479dd4360eb94064cc Mon Sep 17 00:00:00 2001 From: mkarolin Date: Tue, 13 Jul 2021 11:10:30 -0400 Subject: [PATCH 101/205] WIP: Tile customization code was removed from Instant NTPs. Not sure if we need to make additional changes yet. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/7fdd29f commit 7fdd29f0f1782e917bfd1c8ff68824f02d85a926 Author: Tibor Goldschwendt Date: Thu Jun 24 14:24:03 2021 +0000 [ntp] Remove obsolete MV tile customization code from Instant NTPs http://crrev.com/c/2765626 removed 1P support from the local NTP and, thus, obsoleted support of MV tile customizations for Instant NTPs. This CL removes the obsolete code. Bug: 1041125 --- .../chrome/browser/search/instant_service.cc | 17 ----------------- .../chrome/browser/search/instant_service.h | 14 -------------- 2 files changed, 31 deletions(-) delete mode 100644 chromium_src/chrome/browser/search/instant_service.cc delete mode 100644 chromium_src/chrome/browser/search/instant_service.h diff --git a/chromium_src/chrome/browser/search/instant_service.cc b/chromium_src/chrome/browser/search/instant_service.cc deleted file mode 100644 index fb8a8bf531f9..000000000000 --- a/chromium_src/chrome/browser/search/instant_service.cc +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "chrome/browser/search/instant_service.h" -#include "components/search/search_provider_observer.h" - -class AlwaysGoogleSearchProviderObserver : public SearchProviderObserver { - public: - using SearchProviderObserver::SearchProviderObserver; - bool is_google() override { return true; } -}; - -#define SearchProviderObserver AlwaysGoogleSearchProviderObserver -#include "../../../../../chrome/browser/search/instant_service.cc" -#undef SearchProviderObserver diff --git a/chromium_src/chrome/browser/search/instant_service.h b/chromium_src/chrome/browser/search/instant_service.h deleted file mode 100644 index 1f00296e4ba4..000000000000 --- a/chromium_src/chrome/browser/search/instant_service.h +++ /dev/null @@ -1,14 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#ifndef BRAVE_CHROMIUM_SRC_CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ -#define BRAVE_CHROMIUM_SRC_CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ - -// Replaces forward declaration. Class is defined in .cc override. -#define SearchProviderObserver AlwaysGoogleSearchProviderObserver -#include "../../../../../chrome/browser/search/instant_service.h" -#undef SearchProviderObserver - -#endif // BRAVE_CHROMIUM_SRC_CHROME_BROWSER_SEARCH_INSTANT_SERVICE_H_ From 536e3df902880a5eaac9035e409223ce4df69409 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 11:24:07 +0200 Subject: [PATCH 102/205] Remove reference to features::kNewProfilePicker The new profile picker is unconditionally being enabled now upstream. Chromium change: https://source.chromium.org/chromium/chromium/src/+/62060fb114a2f54030c2c5200982eed77fa52d2c commit 62060fb114a2f54030c2c5200982eed77fa52d2c Author: David Roger Date: Tue May 25 23:22:41 2021 +0000 [profiles] Delete flag for new profile picker The new profile picker is now enabled by default, remove the flag to disable it. Bug: 1063856 --- browser/ui/views/profiles/brave_profile_menu_view.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/browser/ui/views/profiles/brave_profile_menu_view.cc b/browser/ui/views/profiles/brave_profile_menu_view.cc index acfab5072dd6..79172290258d 100644 --- a/browser/ui/views/profiles/brave_profile_menu_view.cc +++ b/browser/ui/views/profiles/brave_profile_menu_view.cc @@ -59,12 +59,11 @@ void BraveProfileMenuView::BuildFeatureButtons() { if (!profile->IsOffTheRecord() && profile->HasPrimaryOTRProfile()) window_count += chrome::GetBrowserCount( profile->GetPrimaryOTRProfile(/*create_if_needed=*/true)); - if (base::FeatureList::IsEnabled(features::kNewProfilePicker) && - IsGuest(profile)) { + if (IsGuest(profile)) { AddFeatureButton( l10n_util::GetPluralStringFUTF16(IDS_GUEST_PROFILE_MENU_CLOSE_BUTTON, window_count), - base::BindRepeating(&BraveProfileMenuView::OnExitProfileButtonClicked, + base::BindRepeating(&ProfileMenuView::OnExitProfileButtonClicked, base::Unretained(this)), vector_icons::kCloseIcon); } else { @@ -72,7 +71,7 @@ void BraveProfileMenuView::BuildFeatureButtons() { AddFeatureButton( l10n_util::GetPluralStringFUTF16(IDS_PROFILES_CLOSE_X_WINDOWS_BUTTON, window_count), - base::BindRepeating(&BraveProfileMenuView::OnExitProfileButtonClicked, + base::BindRepeating(&ProfileMenuView::OnExitProfileButtonClicked, base::Unretained(this)), vector_icons::kCloseIcon); } From b3ab8c21161be6111f345ab54b2a5d8630f81808 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 13:13:11 +0200 Subject: [PATCH 103/205] Updated patches from Chromium 93.0.4557.4 to Chromium 93.0.4573.0. --- patches/base-BUILD.gn.patch | 4 +- patches/build-config-android-config.gni.patch | 2 +- ...ld-config-android-internal_rules.gni.patch | 4 +- patches/build-config-android-rules.gni.patch | 2 +- patches/build-config-compiler-BUILD.gn.patch | 4 +- patches/chrome-BUILD.gn.patch | 26 +++++------ patches/chrome-android-BUILD.gn.patch | 14 +++--- ...rome-android-chrome_java_sources.gni.patch | 4 +- ...e-android-chrome_public_apk_tmpl.gni.patch | 2 +- ...ome-android-java-AndroidManifest.xml.patch | 6 +-- ...me-browser-ChromeTabbedActivity.java.patch | 4 +- ...rome-browser-app-ChromeActivity.java.patch | 4 +- patches/chrome-app-BUILD.gn.patch | 6 +-- patches/chrome-browser-BUILD.gn.patch | 4 +- patches/chrome-browser-about_flags.cc.patch | 4 +- ...owser-download-download_item_model.h.patch | 4 +- .../chrome-browser-extensions-BUILD.gn.patch | 4 +- ..._private-extension_info_generator.cc.patch | 2 +- ...r-extensions-extension_management.cc.patch | 4 +- ...flags-android-chrome_feature_list.cc.patch | 4 +- ...-webrtc-webrtc_event_log_uploader.cc.patch | 4 +- ...r-net-stub_resolver_config_reader.cc.patch | 2 +- ...et-system_network_context_manager.cc.patch | 2 +- ...annels-ChromeChannelDefinitions.java.patch | 8 ++-- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 +-- .../chrome-browser-profiles-profile.cc.patch | 2 +- ...ome-browser-profiles-profile_impl.cc.patch | 4 +- ...rome-browser-profiles-profile_impl.h.patch | 4 +- ...e-browser-profiles-profile_manager.h.patch | 4 +- ...ext_menu-render_view_context_menu.cc.patch | 4 +- ...text_menu-render_view_context_menu.h.patch | 8 ++-- ...-browser-resources-settings-BUILD.gn.patch | 2 +- ...ettings-people_page-sync_controls.js.patch | 8 ++-- ...tings-privacy_page-privacy_page.html.patch | 10 ++--- ...ettings-privacy_page-privacy_page.js.patch | 2 +- ...owser-resources-settings-settings.js.patch | 2 +- ...-settings-settings_ui-settings_ui.js.patch | 2 +- ...ings-site_settings-site_details.html.patch | 6 +-- ...e_picker-profile_picker_main_view.js.patch | 2 +- ...heck_client_download_request_base.cc.patch | 2 +- ...browser-sync-sync_service_factory.cc.patch | 4 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 +-- ...-browser-ui-android-toolbar-BUILD.gn.patch | 4 +- patches/chrome-browser-ui-browser.cc.patch | 2 +- patches/chrome-browser-ui-browser.h.patch | 2 +- ...rome-browser-ui-browser_navigator.cc.patch | 2 +- ...owser-ui-cocoa-accelerators_cocoa.mm.patch | 2 +- ...rtup-startup_browser_creator_impl.cc.patch | 4 +- .../chrome-browser-ui-tab_helpers.cc.patch | 4 +- ...oolbar-recent_tabs_sub_menu_model.cc.patch | 2 +- ...views-bookmarks-bookmark_bar_view.cc.patch | 4 +- ...rowser-ui-views-frame-browser_view.h.patch | 4 +- ...ws-location_bar-location_bar_view.cc.patch | 4 +- ...ews-location_bar-location_bar_view.h.patch | 4 +- ...-page_info-page_info_view_factory.cc.patch | 4 +- ...i-views-profiles-profile_menu_view.h.patch | 4 +- ...ws-profiles-profile_menu_view_base.h.patch | 4 +- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 4 +- ...r-ui-webui-bookmarks-bookmarks_ui.cc.patch | 2 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...r-ui-webui-downloads-downloads_ui.cc.patch | 2 +- ...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 +- ...ttings_localized_strings_provider.cc.patch | 4 +- ...ome-browser-ui-webui-theme_source.cc.patch | 2 +- ...de_detector-upgrade_detector_impl.cc.patch | 4 +- ...s-components-web_app_shortcut_mac.mm.patch | 4 +- .../chrome-chrome_repack_locales.gni.patch | 2 +- patches/chrome-common-BUILD.gn.patch | 6 +-- ...aller-linux-common-installer.include.patch | 4 +- .../chrome-installer-util-shell_util.cc.patch | 2 +- patches/chrome-renderer-BUILD.gn.patch | 2 +- ...er-chrome_content_renderer_client.cc.patch | 4 +- patches/chrome-test-BUILD.gn.patch | 4 +- ...t-android-java-res-values-dimens.xml.patch | 2 +- ...er-page_specific_content_settings.cc.patch | 6 +-- ...ore-browser-content_settings_pref.cc.patch | 4 +- ...derer-content_settings_agent_impl.cc.patch | 4 +- ...nternal-common-download_item_impl.cc.patch | 2 +- ...nts-favicon-core-favicon_database.cc.patch | 6 +-- .../components-omnibox-browser-BUILD.gn.patch | 4 +- patches/components-page_info-BUILD.gn.patch | 2 +- .../components-page_info-page_info.cc.patch | 2 +- ...nager-core-browser-login_database.cc.patch | 4 +- patches/components-permissions-BUILD.gn.patch | 4 +- ...s-permissions-permission_uma_util.cc.patch | 2 +- ...licy-tools-generate_policy_source.py.patch | 4 +- ...-browser-client_side_model_loader.cc.patch | 2 +- ...g-core-common-safe_browsing_prefs.cc.patch | 4 +- ...n-internal-identity_manager-BUILD.gn.patch | 4 +- patches/components-sync-driver-BUILD.gn.patch | 4 +- ...ents-sync-driver-sync_service_impl.h.patch | 4 +- ...protocol-device_info_specifics.proto.patch | 4 +- ...nents-sync-protocol-proto_visitors.h.patch | 2 +- ...nents-sync_device_info-device_info.h.patch | 4 +- ...vice_info-device_info_sync_bridge.cc.patch | 10 ++--- ...-variations-variations_seed_store.cc.patch | 2 +- ...r_host-navigation_controller_impl.cc.patch | 4 +- ...-renderer_host-navigation_request.cc.patch | 6 +-- ...content-browser-webui-web_ui_impl.cc.patch | 2 +- patches/content-common-BUILD.gn.patch | 2 +- patches/content-common-user_agent.cc.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 +- patches/google_apis-google_api_keys.cc.patch | 4 +- ...hrome-browser-prefs-browser_prefs.mm.patch | 4 +- ...browser-sync-sync_service_factory.cc.patch | 4 +- ...o-public-tools-mojom-mojom_parser.py.patch | 2 +- patches/net-BUILD.gn.patch | 4 +- patches/net-cookies-canonical_cookie.cc.patch | 4 +- patches/net-dns-dns_transaction.cc.patch | 2 +- patches/net-dns-host_cache.cc.patch | 2 +- .../net-socket-socks5_client_socket.cc.patch | 10 ++--- patches/net-socket-socks_connect_job.cc.patch | 4 +- ...ices-network-public-cpp-cors-cors.cc.patch | 2 +- ...-common-client_hints-client_hints.cc.patch | 2 +- ...er-bindings-generated_in_modules.gni.patch | 4 +- ...renderer-bindings-idl_in_modules.gni.patch | 4 +- ...d_party-blink-renderer-core-BUILD.gn.patch | 6 +-- ...e-html-canvas-html_canvas_element.cc.patch | 2 +- ...re-html-canvas-html_canvas_element.h.patch | 4 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 6 +-- ...anvas2d-base_rendering_context_2d.cc.patch | 6 +-- ...er-modules-webaudio-analyser_node.cc.patch | 4 +- ...ebgl-webgl_rendering_context_base.cc.patch | 44 +++++++++---------- ...-media-key_system_config_selector.cc.patch | 4 +- ...tools-gritsettings-resource_ids.spec.patch | 4 +- ...rams_xml-histogram_suffixes_list.xml.patch | 4 +- ...ity-platform-ax_platform_node_mac.mm.patch | 4 +- patches/ui-base-BUILD.gn.patch | 2 +- ...ayer-public-java-AndroidManifest.xml.patch | 2 +- 133 files changed, 284 insertions(+), 284 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index e930b92bc4b0..7d3d9433fd5e 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 465f4cdc1a823ca58fbfe538e1a700ff6300645e..ed08d35043da2549e4e45a115facb70069a8740e 100644 +index 576bd49a6198fa992ba94c32ad4ade95e899ec00..9b429532cd574a0c59b966bf3fb611364a80b2f7 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -3945,6 +3945,7 @@ if (is_android) { +@@ -3958,6 +3958,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 911eed0393e2..d18b012dc579 100644 --- a/patches/build-config-android-config.gni.patch +++ b/patches/build-config-android-config.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/config.gni b/build/config/android/config.gni -index 4cf67d96ec9c7b01fa9fe216146517ba6ccf26c8..cef770aec11c8399e1f156533745a457899110d8 100644 +index cbfbba928632a4538cc3b34c58e8ed6d49d0a49e..6f73712562d2bffe6d28f171358a74be90a9cf2c 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -3,6 +3,7 @@ diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index bbd227537d13..7269150d419c 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 8e35d68e658ead8e8f67066e1e72f4e457423d4b..97c9f71eda76866dc79dfe6a63962c6ba28a4407 100644 +index 7bd1a333cdc292f633f28eecd5ebb7e7f6570155..2b77bda0a8284cb8af7358386c01e039d5c2b554 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni -@@ -1955,6 +1955,7 @@ if (enable_java_templates) { +@@ -1940,6 +1940,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 ed93c5acefc0..dbeedb414b0d 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 6755d3579c687369043d0987e1327690bff2315e..80d36b4c3b4dcd754d6b6a8fd883300af73c0f6d 100644 +index 912fde87da945380430c953daa57f786416103a6..d5901985bfd5ee6955123c7888670e00534b8ffe 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -476,6 +476,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-compiler-BUILD.gn.patch b/patches/build-config-compiler-BUILD.gn.patch index 5800500e3260..99112a15d076 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 30dcd618633a463b3d202aaacbbd8fcfc5416957..916317cbe895b90e7133abfebfa17b2e93e81d05 100644 +index f6b07a686396ce9d4091f57a049843ed80e75aa2..89a720a1c9b647adf00d29bf6f12a2ce8b78b50c 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1724,6 +1724,7 @@ config("chromium_code") { +@@ -1730,6 +1730,7 @@ config("chromium_code") { cflags += [ "-Wextra-semi" ] } } diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 029688eb7eee..f0b50cb5da13 100644 --- a/patches/chrome-BUILD.gn.patch +++ b/patches/chrome-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn -index 6c594ef1816c2ff9d1c4e75f4488025079e090b2..af3d62aaf1fc4743576db824d185eb8e7e032d83 100644 +index a512d736c1d603680cc0e5bfb42afbd70a799f9a..0253e7271eaec572d76ce95185cb6fa592ae31b5 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn -@@ -171,6 +171,7 @@ if (!is_android && !is_mac) { +@@ -163,6 +163,7 @@ if (!is_android && !is_mac) { "common/crash_keys.cc", "common/crash_keys.h", ] @@ -10,7 +10,7 @@ index 6c594ef1816c2ff9d1c4e75f4488025079e090b2..af3d62aaf1fc4743576db824d185eb8e deps += [ ":chrome_dll", -@@ -448,11 +449,12 @@ if (is_win) { +@@ -440,11 +441,12 @@ if (is_win) { args += [ "--keystone=0" ] } } @@ -24,7 +24,7 @@ index 6c594ef1816c2ff9d1c4e75f4488025079e090b2..af3d62aaf1fc4743576db824d185eb8e extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -470,6 +472,7 @@ if (is_win) { +@@ -462,6 +464,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -32,7 +32,7 @@ index 6c594ef1816c2ff9d1c4e75f4488025079e090b2..af3d62aaf1fc4743576db824d185eb8e if (enable_stripping) { # At link time, preserve the global symbols specified in the .exports -@@ -542,7 +545,7 @@ if (is_win) { +@@ -534,7 +537,7 @@ if (is_win) { args = [ "-b", @@ -41,7 +41,7 @@ index 6c594ef1816c2ff9d1c4e75f4488025079e090b2..af3d62aaf1fc4743576db824d185eb8e "-v", chrome_version_full, "-g", -@@ -616,6 +619,7 @@ if (is_win) { +@@ -608,6 +611,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -49,7 +49,7 @@ index 6c594ef1816c2ff9d1c4e75f4488025079e090b2..af3d62aaf1fc4743576db824d185eb8e } } -@@ -648,9 +652,11 @@ if (is_win) { +@@ -640,9 +644,11 @@ if (is_win) { "--scm=0", ] } @@ -61,7 +61,7 @@ index 6c594ef1816c2ff9d1c4e75f4488025079e090b2..af3d62aaf1fc4743576db824d185eb8e if (is_chrome_branded) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -677,6 +683,7 @@ if (is_win) { +@@ -669,6 +675,7 @@ if (is_win) { info_plist_target = ":chrome_helper_plist" } @@ -69,7 +69,7 @@ index 6c594ef1816c2ff9d1c4e75f4488025079e090b2..af3d62aaf1fc4743576db824d185eb8e extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -1150,6 +1157,7 @@ if (is_win) { +@@ -1142,6 +1149,7 @@ if (is_win) { if (is_chrome_branded) { bundle_deps += [ ":preinstalled_apps" ] } @@ -77,15 +77,15 @@ index 6c594ef1816c2ff9d1c4e75f4488025079e090b2..af3d62aaf1fc4743576db824d185eb8e ldflags = [ "-compatibility_version", -@@ -1333,6 +1341,7 @@ if (is_win) { +@@ -1325,6 +1333,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ + "//brave:browser_dependencies", "//build:branding_buildflags", "//build:chromeos_buildflags", - "//chrome/app:shutdown_signal_handlers", -@@ -1435,12 +1444,13 @@ group("child_dependencies") { + "//chrome/browser", +@@ -1429,12 +1438,13 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -100,7 +100,7 @@ index 6c594ef1816c2ff9d1c4e75f4488025079e090b2..af3d62aaf1fc4743576db824d185eb8e output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1494,6 +1504,7 @@ group("resources") { +@@ -1488,6 +1498,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 02e3f804c116..3afa118d675d 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 40f4fdca18e8423520adb97360aa2bf519edef41..5fb91fc9e2d551bb0b32c6308d9e690b0443f183 100644 +index 363d43bbc775d4a4b9d01a2a73585ba300640fd8..a4675d80fb39c6add4e3616a44d1162b8f1a153e 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn @@ -247,6 +247,7 @@ android_resources("chrome_app_java_resources") { @@ -10,7 +10,7 @@ index 40f4fdca18e8423520adb97360aa2bf519edef41..5fb91fc9e2d551bb0b32c6308d9e690b } if (enable_vr) { -@@ -592,6 +593,7 @@ android_library("chrome_java") { +@@ -594,6 +595,7 @@ android_library("chrome_java") { deps += feed_deps deps += web_feed_deps @@ -18,7 +18,7 @@ index 40f4fdca18e8423520adb97360aa2bf519edef41..5fb91fc9e2d551bb0b32c6308d9e690b srcjar_deps = [ ":autofill_verification_status_generated_enum", -@@ -623,6 +625,7 @@ android_library("chrome_java") { +@@ -625,6 +627,7 @@ android_library("chrome_java") { "//components/offline_pages/core:offline_page_model_enums_java", "//net:effective_connection_type_java", ] @@ -26,7 +26,7 @@ index 40f4fdca18e8423520adb97360aa2bf519edef41..5fb91fc9e2d551bb0b32c6308d9e690b # From java_sources.gni. sources = chrome_java_sources + [ app_hooks_impl ] -@@ -743,6 +746,7 @@ java_group("chrome_all_java") { +@@ -745,6 +748,7 @@ java_group("chrome_all_java") { "//chrome/android/features/tab_ui:module_desc_java", ] } @@ -34,7 +34,7 @@ index 40f4fdca18e8423520adb97360aa2bf519edef41..5fb91fc9e2d551bb0b32c6308d9e690b } # This is a list of all base module jni headers. New features should add their -@@ -784,6 +788,7 @@ group("jni_headers") { +@@ -787,6 +791,7 @@ group("jni_headers") { "//components/ukm/android:jni_headers", "//components/webauthn/android:jni_headers", ] @@ -42,7 +42,7 @@ index 40f4fdca18e8423520adb97360aa2bf519edef41..5fb91fc9e2d551bb0b32c6308d9e690b } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -2047,6 +2052,7 @@ if (current_toolchain == default_toolchain) { +@@ -2053,6 +2058,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -50,7 +50,7 @@ index 40f4fdca18e8423520adb97360aa2bf519edef41..5fb91fc9e2d551bb0b32c6308d9e690b if (_is_monochrome) { deps += [ "//android_webview:locale_pak_assets" ] if (webview_includes_weblayer && !_is_bundle_module) { -@@ -2440,6 +2446,7 @@ android_library("base_module_java") { +@@ -2446,6 +2452,7 @@ android_library("base_module_java") { "//components/payments/content/android:service_java", "//third_party/androidx:androidx_browser_browser_java", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 900fa68ef557..6941ccca9703 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 9d8b2abadfca888982b3d7b28a172a4c2e4dff20..7858e9a373013c3cca45fdf47e0d43a99f8732a3 100644 +index 97620d40bb78b79a607e5224e416fd5905d2ebce..374b825f22f0a26ed7f7b24ec7a8c311691297a4 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1294,3 +1294,4 @@ chrome_java_sources = [ +@@ -1260,3 +1260,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 18f371c315c3..d63477242638 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index 3b81be1be7d054d177649e79f9a27aa22aa41d1b..0a4fdbe4f2b22c51f9b8a635c19a8a0810efc886 100644 +index 9c5ae20c878b84912b98ab0647f125665ce27388..60f7acdc66f170b00406bb0e75d27f1fdb69124b 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni @@ -149,6 +149,7 @@ template("chrome_public_common_apk_or_module_tmpl") { diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index 947d61f6e8e2..19fcfe9ad292 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 1ff1b646567c94451ed97fbbd5285ac2eade103c..8552ab03b193cb80b468264431d2576f53c4d48f 100644 +index 840f7413842362aced2d7aa52baffb0b303c88b6..566702e8390643cfc7787a17ecf299242dc1345d 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -56,7 +56,9 @@ by a child template that "extends" this file. @@ -57,7 +57,7 @@ index 1ff1b646567c94451ed97fbbd5285ac2eade103c..8552ab03b193cb80b468264431d2576f android:icon="@drawable/ic_launcher" android:roundIcon="@drawable/ic_launcher_round" android:label="{% block application_label %}@string/app_name{% endblock %}" -@@ -1176,6 +1189,7 @@ by a child template that "extends" this file. +@@ -1187,6 +1200,7 @@ by a child template that "extends" this file. android:configChanges="orientation|keyboardHidden|keyboard|screenSize|mcc|mnc|screenLayout|smallestScreenSize" > @@ -65,7 +65,7 @@ index 1ff1b646567c94451ed97fbbd5285ac2eade103c..8552ab03b193cb80b468264431d2576f {% block extra_application_definitions %} {% endblock %} {% endmacro %} -@@ -1254,6 +1268,7 @@ by a child template that "extends" this file. +@@ -1265,6 +1279,7 @@ by a child template that "extends" this file. diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch index 3cc4180417a1..effc34246cbb 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index a0039bbb77ede9fded776e13359ce2c52c56f15f..cf0577c7eb0175970562242bcf9df1062d223280 100644 +index bf0a39c143702b5c0415caa7eb9defd5b24041ed..a85d3369891944a27ee8baa4dc4dbe11b4157b6a 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -2245,6 +2245,7 @@ public class ChromeTabbedActivity extends ChromeActivity +@@ -388,7 +388,7 @@ public abstract class ChromeActivity private boolean mLastPictureInPictureModeForTesting; protected ChromeActivity() { diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index 20ff3cdb8b59..27a166f0ae85 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 89d91f4786ee5af6e639194dc216bd19a7657380..0421f6108de87bb81de0ccedd5df31c1ac0b3bd7 100644 +index dd5fd69345b249aacfc018d24e4f7d5a75f134d5..47ac9c54f2fe0fe21e4878b8a07af4b10103212c 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn -@@ -84,6 +84,8 @@ grit("generated_resources") { +@@ -72,6 +72,8 @@ grit("generated_resources") { if (is_android) { outputs += android_generated_java_resources } @@ -11,7 +11,7 @@ index 89d91f4786ee5af6e639194dc216bd19a7657380..0421f6108de87bb81de0ccedd5df31c1 } if (is_android) { -@@ -106,7 +108,7 @@ grit("google_chrome_strings") { +@@ -94,7 +96,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 fe62aeeed4e4..81742cefa1d9 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 c77a5d0e3eb23fcb6940b333b9eb8e472be0f601..af1ae2735313fae7eea6fc3d2078b45908f88509 100644 +index 25d393b86008beffd56da6ad4497c2cfc63cd936..2628965416c0b6d289f6f36792e94d1508b3c6fa 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2456,6 +2456,7 @@ static_library("browser") { +@@ -2472,6 +2472,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 2de6391ef236..f6e471bb84b3 100644 --- a/patches/chrome-browser-about_flags.cc.patch +++ b/patches/chrome-browser-about_flags.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc -index 321e71e86187f8346679ebfe118345caea8a8f0b..19362b8414e0fc1ec490d1727a3408e93486e382 100644 +index c001f6c57f8ed38cd6c49543d889ac15a750f64d..7553be51d545df9b64bb8abc9202e3305380f581 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -312,14 +312,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { @@ -21,7 +21,7 @@ index 321e71e86187f8346679ebfe118345caea8a8f0b..19362b8414e0fc1ec490d1727a3408e9 const FeatureEntry::Choice kLiteVideoDefaultDownlinkBandwidthKbps[] = { {flags_ui::kGenericExperimentChoiceDefault, "", ""}, -@@ -7336,6 +7336,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7476,6 +7476,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-download-download_item_model.h.patch b/patches/chrome-browser-download-download_item_model.h.patch index 0f6e375006a8..9f436b3b2958 100644 --- a/patches/chrome-browser-download-download_item_model.h.patch +++ b/patches/chrome-browser-download-download_item_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h -index 7299f4dca0e1f0558e0d111b98a5143544b2590a..bd7f60c7f9da66144273dfd6f397dddf7f233860 100644 +index c194f9c310c8513fdf23efe72098ed6e077bda69..21dac81b3eae27195bf1bf947a1871523fc403d7 100644 --- a/chrome/browser/download/download_item_model.h +++ b/chrome/browser/download/download_item_model.h -@@ -106,6 +106,7 @@ class DownloadItemModel : public DownloadUIModel, +@@ -109,6 +109,7 @@ class DownloadItemModel : public DownloadUIModel, void OnDownloadDestroyed(download::DownloadItem* download) override; private: diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index cd49492e3eae..93ae015511d0 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 705a7e4413e86b080a4855d118cd98db887c964e..04630064f77f2fcef8f8f8c5a6a7b63785396926 100644 +index 9348bc9c9c7e6c3b9104936f4f66b37b9a9a5443..81be5553bdadc19bad1c14cfb46cd3334226151e 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1332,6 +1332,7 @@ static_library("extensions") { +@@ -1325,6 +1325,7 @@ static_library("extensions") { } else { sources += [ "api/braille_display_private/braille_controller_stub.cc" ] } diff --git a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch index 0f96013e2ba9..306b8cd64de0 100644 --- a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch +++ b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -index 3a6300c87612cc289bca6884ea610b0db8656978..452c5023a1dc7e4f7d2b2b0fabaa53262e2e0790 100644 +index bb87b5bd4f46e45177ebd6a072dee1faaec5370b..1405182f536cb35f9587622f7a4c01806760df69 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc @@ -619,6 +619,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper( diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 299b79721a5b..851ad8fa2817 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index 949060acf324dfc335a19fd901d429b8dd110985..7090661f1a505b68440df74af9a557edca206807 100644 +index 698932e7d0285c4c3e2152cea0342231491318f0..69ad625b6ce0046ba78e3c6aae160e63000406e6 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -727,6 +727,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( +@@ -729,6 +729,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); 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 93edc36b0f8f..a400ff8d1989 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 a30cd2b7e34af83cede3dddf8ab300f01ea9bba0..992b2e3cc937cca8a5892f894924b726ff4c5790 100644 +index ea850bd669e8757601fb88c012bfbe783cae93da..604715aa7741eda508fbb6c60c4838b08f0658c4 100644 --- a/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chrome/browser/flags/android/chrome_feature_list.cc -@@ -322,6 +322,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { +@@ -330,6 +330,7 @@ const base::Feature* const kFeaturesExposedToJava[] = { }; const base::Feature* FindFeatureExposedToJava(const std::string& feature_name) { diff --git a/patches/chrome-browser-media-webrtc-webrtc_event_log_uploader.cc.patch b/patches/chrome-browser-media-webrtc-webrtc_event_log_uploader.cc.patch index 4e077fc239ea..d71ad5a5a1bf 100644 --- a/patches/chrome-browser-media-webrtc-webrtc_event_log_uploader.cc.patch +++ b/patches/chrome-browser-media-webrtc-webrtc_event_log_uploader.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -index b8f2ec41141f146c4d1cbe95de698cd0c7b7896e..7a5edd34598d8d381580f5175607e8b3d7057f9a 100644 +index dd743c600f4493f9fc233ce45b64bc1bb25a023f..e3706faac46fa0517a331c463104f8082d77bde8 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -@@ -275,6 +275,7 @@ bool WebRtcEventLogUploaderImpl::PrepareUploadData(std::string* upload_data) { +@@ -276,6 +276,7 @@ bool WebRtcEventLogUploaderImpl::PrepareUploadData(std::string* upload_data) { } void WebRtcEventLogUploaderImpl::StartUpload(const std::string& upload_data) { diff --git a/patches/chrome-browser-net-stub_resolver_config_reader.cc.patch b/patches/chrome-browser-net-stub_resolver_config_reader.cc.patch index f9d027f70180..4584fe468e53 100644 --- a/patches/chrome-browser-net-stub_resolver_config_reader.cc.patch +++ b/patches/chrome-browser-net-stub_resolver_config_reader.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/net/stub_resolver_config_reader.cc b/chrome/browser/net/stub_resolver_config_reader.cc -index 559edbf498688d6a8e11a9ce9a711ea314cbf9e6..d7f2dfd161cf7bd87f41d018d7fc04a667e0bedd 100644 +index afd8e4a6432bae11921631a32fc6ea948182c8cd..731e5fcc6fb8bd00a722cc474269a8abfa79d615 100644 --- a/chrome/browser/net/stub_resolver_config_reader.cc +++ b/chrome/browser/net/stub_resolver_config_reader.cc @@ -356,6 +356,7 @@ SecureDnsConfig StubResolverConfigReader::GetAndUpdateConfiguration( 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 e27a5cf87cde..5ab77953bd9d 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index b4f333323d8c2eec17b845526cb1e1b051c79194..f6d278a063324cbac99d8e05c3f9fcbf9c20d9a5 100644 +index e8437bc5e956fb943523e81b1b8ab6f9ad02a3ad..825db921ffbf3143b5a95a69bb6b3b5aee01d79e 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc @@ -224,7 +224,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem diff --git a/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch b/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch index 781c8cc68c12..45197649f14f 100644 --- a/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch +++ b/patches/chrome-browser-notifications-android-java-src-org-chromium-chrome-browser-notifications-channels-ChromeChannelDefinitions.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java -index 80f53e6240dfc8687d850d3a34d682bfb08f464e..757dc6d05e919715bf107323bf0be7bf15ae7b3b 100644 +index 461131cd5a230ef5aa7938594d4baa0b7263439f..b1d8b408bcbd03419feb16a2e864c825b938d02d 100644 --- a/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java +++ b/chrome/browser/notifications/android/java/src/org/chromium/chrome/browser/notifications/channels/ChromeChannelDefinitions.java @@ -43,7 +43,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { @@ -19,7 +19,7 @@ index 80f53e6240dfc8687d850d3a34d682bfb08f464e..757dc6d05e919715bf107323bf0be7bf ChannelId.MEDIA_PLAYBACK, ChannelId.SCREEN_CAPTURE, ChannelId.CONTENT_SUGGESTIONS, ChannelId.WEBAPP_ACTIONS, ChannelId.SITES, ChannelId.SHARING, ChannelId.UPDATES, ChannelId.COMPLETED_DOWNLOADS, ChannelId.PERMISSION_REQUESTS, -@@ -100,7 +101,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { +@@ -99,7 +100,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { String SECURITY_KEY = "security_key"; } @@ -28,7 +28,7 @@ index 80f53e6240dfc8687d850d3a34d682bfb08f464e..757dc6d05e919715bf107323bf0be7bf @Retention(RetentionPolicy.SOURCE) public @interface ChannelGroupId { String SITES = "sites"; -@@ -129,6 +130,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { +@@ -128,6 +129,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { Map map = new HashMap<>(); Set startup = new HashSet<>(); @@ -36,7 +36,7 @@ index 80f53e6240dfc8687d850d3a34d682bfb08f464e..757dc6d05e919715bf107323bf0be7bf map.put(ChannelId.BROWSER, PredefinedChannel.create(ChannelId.BROWSER, R.string.notification_category_browser, -@@ -258,6 +260,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { +@@ -257,6 +259,7 @@ public class ChromeChannelDefinitions extends ChannelDefinitions { static final Map MAP; static { Map map = new HashMap<>(); diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 92b24db83821..b54bf06310dd 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 5abb1d1ff8c9d48d61448bcfe40a3ec2fa52988b..8f04fb4c25e20621e220b2486356b218b7601247 100644 +index 084253e9fcc28f11cac03c692e560e7f9b56f2ec..f20da4f81ecc2320610ca03c2e72db0dec31c6c9 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -986,6 +986,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1006,6 +1006,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index 5abb1d1ff8c9d48d61448bcfe40a3ec2fa52988b..8f04fb4c25e20621e220b2486356b218 // This is intentionally last. RegisterLocalStatePrefsForMigration(registry); -@@ -1278,6 +1279,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -1302,6 +1303,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 586e40b34f1a..ae11f1430119 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 7ee045c66e37b43d7f168b43f0a9c0e0409990f6..be4392c5b9e2f3bebd63999770cd010ff3506a01 100644 +index 24cba6c448ab9c38663098edde6bd7452bd19c35..a1a386b660bed78df4cd10b368f3a891924e2664 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -99,6 +99,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const { diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index 08456ba1af8d..2dcd92132761 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index dd0192c2e6473eb7ae45c8d94c3ab198059fab81..1b16a3595c4c291b22c45a4695968c4114db9f74 100644 +index 48028878ae5002243193255807f34fa7d45c64cb..59c4c07a977f2acb029f0b0873a8955cc3286a3f 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -407,7 +407,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, +@@ -370,7 +370,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, NOTREACHED(); } diff --git a/patches/chrome-browser-profiles-profile_impl.h.patch b/patches/chrome-browser-profiles-profile_impl.h.patch index 469f9d0fea61..df21d8ea0c2e 100644 --- a/patches/chrome-browser-profiles-profile_impl.h.patch +++ b/patches/chrome-browser-profiles-profile_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h -index 30293e97a41e5d13118a4271393887bf221c48d0..e45cd691abd5fcc49f0d715239fc404f5a2cc986 100644 +index 1cd77f4fe8d56719b91011f2240a3e3648212338..8e0cf7ec0d526235b08bb1446f0fb583a013d1ad 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h -@@ -165,6 +165,7 @@ class ProfileImpl : public Profile { +@@ -168,6 +168,7 @@ class ProfileImpl : public Profile { void OnLogin() override; void InitChromeOSPreferences() override; #endif // BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch index 4f2d8c0f2a09..58a2d3c0ca29 100644 --- a/patches/chrome-browser-profiles-profile_manager.h.patch +++ b/patches/chrome-browser-profiles-profile_manager.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h -index 915ae812639cbff69629831e516c51f8b1b997cb..4935cc578579f0a3b32dab34d56267706b2d5eef 100644 +index 915a95e287c587a177c3c7244b9243d75518fa29..b37331c5c54bb480705c714a7bf0f8b3cc457f52 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h -@@ -283,6 +283,7 @@ class ProfileManager : public Profile::Delegate { +@@ -282,6 +282,7 @@ class ProfileManager : public Profile::Delegate { void set_do_final_services_init(bool do_final_services_init) { do_final_services_init_ = do_final_services_init; } 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 205531ede958..743372ffed36 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 3e6c5354f47b0df51e9065b55570cc0ef202a4ef..43a99f5dca28c45b96a5dc501dc4860c5f358b2d 100644 +index 0652a43f3b59bddd87477cdd7fd87e3e7a79d39f..be35a7b9fc472ce6488f9677c015b072abdbda71 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -1694,6 +1694,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -1706,6 +1706,7 @@ void RenderViewContextMenu::AppendSearchProvider() { selection_navigation_url_ = match.destination_url; if (!selection_navigation_url_.is_valid()) return; diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index 8713ee16f45a..976a83bcafd7 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.h b/chrome/browser/renderer_context_menu/render_view_context_menu.h -index b0b04af937235ab583e5c827694acb19598c470b..0168fe2acdb59ed0eb3388d182c0233580de0ca7 100644 +index 9f23d7fed4025254630992dbfff727e7fc405ff2..d922f1ca8d3bcee0c55a0b96f1d91fe12923e692 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -116,6 +116,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { +@@ -125,6 +125,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase, // Returns true if keyboard lock is active and requires the user to press and // hold escape to exit exclusive access mode. bool IsPressAndHoldEscRequiredToExitFullscreen() const; + BRAVE_RENDER_VIEW_CONTEXT_MENU_H_ - private: - friend class RenderViewContextMenuTest; + #if BUILDFLAG(IS_CHROMEOS_ASH) + virtual const policy::DlpRulesManager* GetDlpRulesManager() const; diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index b5619177d531..4532c2c24c35 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 1e20645dcf315fd2341dda92e1e20a21bbaa1059..59ed3facbfe7bee7fac542a5c0c1c3389039759e 100644 +index de135acf580ddf090faffd95accab904d9882c42..918b4879ab49fba46fffa968ada116833080bcad 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn @@ -51,6 +51,7 @@ if (optimize_webui) { diff --git a/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch b/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch index 2db0fe5b98af..442627403ad0 100644 --- a/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch +++ b/patches/chrome-browser-resources-settings-people_page-sync_controls.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/people_page/sync_controls.js b/chrome/browser/resources/settings/people_page/sync_controls.js -index 37932cbc8c8d3962706a8ce436117d736440492f..a232e52bb4c74792f0dcc7ef646c6a536992af1e 100644 +index b7f0e2c3c6c4fc26e25870bd5708f0eb16d7569f..7aaf03dc9916ce3af1581bd109f29824c0ea850b 100644 --- a/chrome/browser/resources/settings/people_page/sync_controls.js +++ b/chrome/browser/resources/settings/people_page/sync_controls.js -@@ -108,7 +108,7 @@ Polymer({ +@@ -124,7 +124,7 @@ class SettingsSyncControlsElement extends SettingsSyncControlsElementBase { const router = Router.getInstance(); if (router.getCurrentRoute() === /** @type {{ SYNC_ADVANCED: !Route }} */ @@ -10,8 +10,8 @@ index 37932cbc8c8d3962706a8ce436117d736440492f..a232e52bb4c74792f0dcc7ef646c6a53 + (router.getRoutes()).BRAVE_SYNC_SETUP) { this.browserProxy_.didNavigateToSyncPage(); } - }, -@@ -241,6 +241,7 @@ Polymer({ + } +@@ -257,6 +257,7 @@ class SettingsSyncControlsElement extends SettingsSyncControlsElementBase { * @private */ syncControlsHidden_() { 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 075a4a15aef1..b7271c730f14 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 0e154e5d8c9fae481d02cbf3af2d0a98d1b7b756..b7d4aca9c368e3bb6f7233b8e139c57ae5e589ca 100644 +index 07c8a1c383f4dbd94b89663394a2dbc69491e435..c0d7619d335801021f99de431c06597f58290eb1 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 @@ @@ -26,7 +26,7 @@ index 0e154e5d8c9fae481d02cbf3af2d0a98d1b7b756..b7d4aca9c368e3bb6f7233b8e139c57a diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch index dce92961d51e..3adb0cc5311f 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.js b/chrome/browser/resources/settings/privacy_page/privacy_page.js -index 2aeed8b82e6a1ad25746c25a0064dbbe3f69c76e..49d5b2aadb1dc032226405b97288d150287aee44 100644 +index 550f542fcb90b104b85068722630cd96dd1e0ae3..4c4d1f284621626c4895df1efa354f457808d718 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.js +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.js @@ -18,6 +18,7 @@ import '../site_settings/settings_category_default_radio_group.js'; diff --git a/patches/chrome-browser-resources-settings-settings.js.patch b/patches/chrome-browser-resources-settings-settings.js.patch index e57f47a52043..9f7d5f73fcc9 100644 --- a/patches/chrome-browser-resources-settings-settings.js.patch +++ b/patches/chrome-browser-resources-settings-settings.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.js b/chrome/browser/resources/settings/settings.js -index 996c180ccb6aafb10dd3d41d9dc2e0019a02fd76..06d3c9873f531435ee302e02b817f2134a1dea19 100644 +index 34a1c12ed105d6cbf2367e64596b836364c60d39..271e9e3bef62f8e56527e81eac1c4228d9788271 100644 --- a/chrome/browser/resources/settings/settings.js +++ b/chrome/browser/resources/settings/settings.js @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch index 16d20f1f2427..172c16d17667 100644 --- a/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch +++ b/patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings_ui/settings_ui.js b/chrome/browser/resources/settings/settings_ui/settings_ui.js -index d61e6510b9b963b78ecc37f6dc3c047663b468b4..f22bacd066e12e83201a3170b59841ce1b16e1ee 100644 +index 05e73d25546f800af1f3a1d64736a56945f3ab18..2de6aed365a051c42b665360be160b7793ae8418 100644 --- a/chrome/browser/resources/settings/settings_ui/settings_ui.js +++ b/chrome/browser/resources/settings/settings_ui/settings_ui.js @@ -22,7 +22,7 @@ import '../settings_shared_css.js'; diff --git a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch index d56dbc631eac..41bb5c03f5e1 100644 --- a/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch +++ b/patches/chrome-browser-resources-settings-site_settings-site_details.html.patch @@ -1,9 +1,9 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_details.html b/chrome/browser/resources/settings/site_settings/site_details.html -index a92d514fa35e99bdcce9100cecc871802df38fb5..a18fc20fd3cc35de62f7ea7ce40b6b61b87a2dc3 100644 +index 17c9267deb17338e6a4269a17b1a04b17e76fe06..3b6fb71dc93ed700eb21a3c7ca737a0c8b798b6f 100644 --- a/chrome/browser/resources/settings/site_settings/site_details.html +++ b/chrome/browser/resources/settings/site_settings/site_details.html @@ -186,6 +186,11 @@ - + BuildSyncService( +@@ -171,7 +171,7 @@ std::unique_ptr BuildSyncService( } auto sync_service = diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 5601c8186858..feeec06c171c 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 6436ea292565707f25a357ba3cc541198d9e9a7f..fb816089bd33b0a9733a15d9cbb2e14943e2ec4c 100644 +index 664e832ea35bd6f0f416caaa4e54849149da4416..a1da95c7ab284d1e29e7866c903a14317c2eb01a 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -609,6 +609,7 @@ static_library("ui") { +@@ -614,6 +614,7 @@ static_library("ui") { "//ui/webui/resources/cr_components/most_visited:mojom", "//v8:v8_version", ] @@ -10,7 +10,7 @@ index 6436ea292565707f25a357ba3cc541198d9e9a7f..fb816089bd33b0a9733a15d9cbb2e149 # TODO(crbug/925153): Remove this circular dependency. allow_circular_includes_from = [ -@@ -3453,10 +3454,13 @@ static_library("ui") { +@@ -3460,10 +3461,13 @@ static_library("ui") { ] deps += [ "//google_update" ] } else { diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index 69361aea6800..81a46554a352 100644 --- a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn -index e14df2c76b65e700936982f55c8cda37e785391d..ea3347d7d780b4a5c4b1b7ff3844f42e22fcaace 100644 +index 8eb7d60f71ac8172780ab9a27b2e095a6b69746b..3821ce22571ff063bd4ed65e0c9e4e5e4a4ed632 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -65,6 +65,7 @@ android_library("java") { +@@ -94,6 +94,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/toolbar/top/TopToolbarSceneLayer.java", "java/src/org/chromium/chrome/browser/toolbar/top/ViewShiftingActionBarDelegate.java", ] diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 593a9feb8395..bf4a083faa99 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index 8a1af8eb8efd51d51e9ea4155dc55a493673a74b..568629ec3b016a594aab95eb5e286ab6d1d5d921 100644 +index 8fdddbadf5e9a202fc20ac9e326a4631f91f4a0d..4c1cd2bef9d9fb7c4fa17ec6733bec4a89a8d717 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -440,6 +440,7 @@ Browser::CreationStatus Browser::GetCreationStatusForProfile(Profile* profile) { diff --git a/patches/chrome-browser-ui-browser.h.patch b/patches/chrome-browser-ui-browser.h.patch index 19835ae8c447..83a1ad4a0968 100644 --- a/patches/chrome-browser-ui-browser.h.patch +++ b/patches/chrome-browser-ui-browser.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h -index ab9c5fb85f83b2ffb04bf21be631d38cfacd8835..f1d511caaa70b0b0ce6fc62f804c3f8f889e3da1 100644 +index 2908b4b70815d02afff0c78c1aa54ab74c79dd83..2e994890ea12484a2dc6539a87d8f51afe0fca80 100644 --- a/chrome/browser/ui/browser.h +++ b/chrome/browser/ui/browser.h @@ -709,6 +709,7 @@ class Browser : public TabStripModelObserver, diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch index 13d0a1c72df3..40fb75077ce7 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 29890d8b342a4392b6736a59b7a7b873af055ce7..6351ca0fa36b636d46217d54122bfca1a9dbd8b2 100644 +index df2bdd20c792d7042d0208664570b3b44897f829..c9d0d03002ba426e0a997eda4d63496e54a7ef6b 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -490,6 +490,7 @@ void Navigate(NavigateParams* params) { diff --git a/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch b/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch index b6755a174cea..cbe9e9048157 100644 --- a/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch +++ b/patches/chrome-browser-ui-cocoa-accelerators_cocoa.mm.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/cocoa/accelerators_cocoa.mm b/chrome/browser/ui/cocoa/accelerators_cocoa.mm -index fcf236f6937fa34f8554f251d110a348c9926f70..6b3d900765790ba4792d81b1470c488b8e105526 100644 +index 2bcdaecf985d76640ed4e996c7f0f08ff01fdd69..d349f07db552f342dc922a930289af4f6e29d675 100644 --- a/chrome/browser/ui/cocoa/accelerators_cocoa.mm +++ b/chrome/browser/ui/cocoa/accelerators_cocoa.mm @@ -41,6 +41,8 @@ const struct AcceleratorMapping { 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 ec98a588cecb..8c0299df3dec 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 5c5076b0e3d1cbdf944bbeef7c4b650c1416ae14..61a1f383c453f4b7c13332ea58524df63afdd164 100644 +index 4bb14bc65341d861511167552d25b837cd7b7402..5fde2c46da2003e62f58f39402fe2d89aef91c83 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc -@@ -371,6 +371,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( +@@ -379,6 +379,7 @@ void StartupBrowserCreatorImpl::DetermineURLsAndLaunch( #if !BUILDFLAG(IS_CHROMEOS_ASH) welcome_enabled = welcome::IsEnabled(profile_) && welcome::HasModulesToShow(profile_); diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index d98cfeb3524c..ca3731ab1372 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 5f644903bb775b3d0d9c0ee2b9b77a8ebcc3f0d4..e01b217c4fdb1909a1f6eecc8b87553063369133 100644 +index f6bfdad8f7ef3610d3324ce1d2d4d63510d8dadb..45284bf55cd5552ed0a296483e54d09c73c11776 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -491,4 +491,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -499,4 +499,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-toolbar-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch index 600ae17fa5b5..4a1e5a5d4fce 100644 --- a/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch +++ b/patches/chrome-browser-ui-toolbar-recent_tabs_sub_menu_model.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc -index b36090fb7ecb49cece5fd10e1ecb8b3a5436b432..09af745a47167c81457d985a415f0929f998ff9c 100644 +index 13ea4873ad0a43d2569ed0834973e4bd1c409fcb..fe8eb58b45020906e034b03be7f95d07305ec5c6 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.cc @@ -469,6 +469,8 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { 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 afa992d64737..a6cb29763b21 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 515fdba2943aa6ac801621cc62688a69a02fb27a..6ba49454fa9bbc07810ef346466d2f01df9dc25b 100644 +index 39ba803b4bf9b9a1872323bc2e45b17a4b2faa8e..ce401b490e9f2fe79cfd1e165532cc0c5ff625e5 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -835,6 +835,7 @@ void BookmarkBarView::Layout() { +@@ -836,6 +836,7 @@ void BookmarkBarView::Layout() { x = next_x; } } diff --git a/patches/chrome-browser-ui-views-frame-browser_view.h.patch b/patches/chrome-browser-ui-views-frame-browser_view.h.patch index 0a5c04fdc72d..178635585ecd 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view.h.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h -index 52a17e3e33beffb48402bf4eb99c45656a142ef2..212eb42b4efade8bdf08dbf48787d3126d790178 100644 +index 02f0019d7d3244f19a0bdf729a757b0142eab9fa..034c0e51f0d9a20675adac48b2c49d681391027a 100644 --- a/chrome/browser/ui/views/frame/browser_view.h +++ b/chrome/browser/ui/views/frame/browser_view.h -@@ -657,6 +657,7 @@ class BrowserView : public BrowserWindow, +@@ -661,6 +661,7 @@ class BrowserView : public BrowserWindow, return accessibility_focus_highlight_.get(); } diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index daa29c6a6fce..bf0d465e82e8 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index c02d31683198226f9d110ad549299c62a32837e8..fe77175e0f6bb4aa6051e56411697244165f8ea0 100644 +index ca31e380a593926dd58ca3342452e7e99c25c278..02d016eb54a943e67331cd2bec8b0583200d3470 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -650,6 +650,7 @@ void LocationBarView::Layout() { +@@ -652,6 +652,7 @@ void LocationBarView::Layout() { } }; diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch index 897f8524ef1f..34644f106eca 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h -index c2cd95767d4eecb9d7dfe439100b716139018e9e..1cd0b3af28ac8fe0e53828376624f92cde978eb7 100644 +index a62759d3a7aaa42edcfb7c4452891c97044c89fe..585cd339fb6b151b35479e067251b895ea1123a3 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h @@ -109,6 +109,7 @@ class LocationBarView : public LocationBar, @@ -18,7 +18,7 @@ index c2cd95767d4eecb9d7dfe439100b716139018e9e..1cd0b3af28ac8fe0e53828376624f92c void Update(content::WebContents* contents); // Clears the location bar's state for |contents|. -@@ -249,6 +251,7 @@ class LocationBarView : public LocationBar, +@@ -254,6 +256,7 @@ class LocationBarView : public LocationBar, std::vector& GetContentSettingViewsForTest() { return content_setting_views_; } diff --git a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch index 4769036bfbc6..866a29fbb052 100644 --- a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch +++ b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -index 774d9b5083c67388c1eecf4192002d85e4d03e07..30c3fe746182df28403ccaa385b34279ff65a754 100644 +index 05d80891faefb18a526242d1ad7bd9260bcedcc2..57bc08842889de088dc61065eb9ccd9c35c69f58 100644 --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -@@ -186,6 +186,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( +@@ -192,6 +192,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( const PageInfo::PermissionInfo& info) { const gfx::VectorIcon* icon = &gfx::kNoneIcon; switch (info.type) { diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch index 4a7f6ba8471a..a59f7fc2cff4 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view.h b/chrome/browser/ui/views/profiles/profile_menu_view.h -index 0420cbae191ec3a8f0a983834ba212a7024a31dd..d7c1ebc18bc8f9be09beec9871f41793b53dc362 100644 +index 2915dbf08be95e500840bdccdb3510d3dc554e87..521f34dff70aa47ac104d4e7a6d1115de2d1b0b0 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view.h @@ -46,6 +46,7 @@ class ProfileMenuView : public ProfileMenuViewBase { @@ -9,4 +9,4 @@ index 0420cbae191ec3a8f0a983834ba212a7024a31dd..d7c1ebc18bc8f9be09beec9871f41793 + BRAVE_PROFILE_MENU_VIEW_H friend class ProfileMenuViewExtensionsTest; friend class ProfileMenuViewSignoutTest; - + friend class ProfileMenuInteractiveUiTest; diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch index 2d715138571f..ab7850b3833f 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -index a70cd56cf2dc17fc30058c17d1912161b77e177f..7e63bacc36132ff971ca5a0940e0ea5141b61e9a 100644 +index cdb557992eb9d93a7c8af780d06ec82d638825ec..4aae1009b6c8bb9746cbd5993a895ff7685a5148 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -@@ -168,6 +168,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, +@@ -167,6 +167,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, void set_perform_menu_actions_for_testing(bool perform_menu_actions) { perform_menu_actions_ = perform_menu_actions; } diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 739ceca2b514..3e732241809e 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index 31ba3d1198e216b04cc6bdeb0eb8c3956023c163..60342006b734b1f1a91e2e890a658a1bde4fbdd6 100644 +index 9fe383741657c10916b0a706e7ec2a04e15227b0..0e190fa54842101dbb25559a65c39de95998063c 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -342,6 +342,7 @@ void ToolbarView::Init() { +@@ -343,6 +343,7 @@ void ToolbarView::Init() { } else { // TODO(crbug.com/932818): Remove this once the // |kAutofillEnableToolbarStatusChip| is fully launched. diff --git a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch index 2cfdb589c04c..7f478557407d 100644 --- a/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-bookmarks-bookmarks_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc -index 629b2ad6acd573609fc85a93dc166f42fe43127a..52785737cb9f5683f5024dd828a99c88cfe7a7cf 100644 +index cec210a5a9153c5b8f2566ecd1a64fa94c8bb112..1f25c24b38edb01eeada306b5b329d16c3b7a677 100644 --- a/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc +++ b/chrome/browser/ui/webui/bookmarks/bookmarks_ui.cc @@ -127,6 +127,7 @@ content::WebUIDataSource* CreateBookmarksUIHTMLSource(Profile* profile) { 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 205fb3488075..3c894ef479df 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,8 +1,8 @@ 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 d6761fb2cfe4cd53d00dd99d5eb3a3a9302bd612..9bc3da7460a8a96d07beccd8df066f7e0f113f80 100644 +index e1ad3a346374beb76142d3deae128645934e7cf2..034b77659a3da6f9690a8684ca287c298ce4b0c2 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -1194,6 +1194,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -1187,6 +1187,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch index 71359c4c3390..5721fafcf1b2 100644 --- a/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-downloads-downloads_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/downloads/downloads_ui.cc b/chrome/browser/ui/webui/downloads/downloads_ui.cc -index 280b85627ac54b45058d8d70915ac0798a7bde21..7796530556d319ba9a19becc9d318519546a9351 100644 +index 8ee534095f81cc513718a2d1bcdac9457ba36235..0b08ead564342bbdec0f849f3a69f3c980a73f7d 100644 --- a/chrome/browser/ui/webui/downloads/downloads_ui.cc +++ b/chrome/browser/ui/webui/downloads/downloads_ui.cc @@ -58,6 +58,7 @@ namespace { 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 057a6be18db7..8e5b295d96c4 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 b49605c0c63da82ba708bdf483ec8eca0c8a4375..9190269e728e1cea4f44d4b78da164b6d0114dbc 100644 +index de516e50e5d8fef7f29ccd4eaac39484f7c10f92..1969bc226b9477a2c39bdda60cf0d5bca6f97fa4 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc @@ -349,6 +349,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 b5531f4c4773..f8c6f8fc6547 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 c8c62c8809ca4fd41b801ea72f806a677b5613dc..30c9eb1b6b89a25ca8ef4f17526a6b3b5de4a57e 100644 +index 6cb4ecac81cd23fb39ecc86993f75df1c8e152a7..0f2b0cedb40a03754f48ba74399756c330485615 100644 --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc @@ -55,6 +55,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 13cdf7f53440..45b7d0dea1d6 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 f1f2fe731b4e4241892a4dfaba31196da25f8d6c..12d39739aa8645053246b676008ad98f3177bb31 100644 +index 954d6b866216fbdcce129d1760d6ad51e491fedd..28e0531d3ceb9c0339a272c1a8a83afb06dddc0b 100644 --- a/chrome/browser/ui/webui/settings/import_data_handler.cc +++ b/chrome/browser/ui/webui/settings/import_data_handler.cc @@ -130,6 +130,7 @@ void ImportDataHandler::HandleImportData(const base::ListValue* args) { 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 f1d05d6b38bd..5072a4706d09 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 e6a03892663fa0a11a378d1b1a4a3681c9a5f7a3..4e8dcbab605dd4090b9215adb46a02072ae6b6ce 100644 +index b413ff5a3d905057fd5c0e976756d1df2188ac33..85381c9d99e0627853a45ebb76021046026ebb7a 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -2734,6 +2734,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -2746,6 +2746,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-ui-webui-theme_source.cc.patch b/patches/chrome-browser-ui-webui-theme_source.cc.patch index 20d1633c6a50..f7ea2c99f2cf 100644 --- a/patches/chrome-browser-ui-webui-theme_source.cc.patch +++ b/patches/chrome-browser-ui-webui-theme_source.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc -index eb9cefd96fbdb418565f94897cf403b7794d65bd..78ef457d91c2f97139c51d2deb63a07e136e5967 100644 +index 3715fd43d38d6c5b5f70cc7332808684bbff7433..d4c08e2976df13cd8f1573b109f8329017fbc533 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -100,7 +100,7 @@ void ThemeSource::StartDataRequest( diff --git a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch index 819e4c258bc7..65d4a73ba2e1 100644 --- a/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch +++ b/patches/chrome-browser-upgrade_detector-upgrade_detector_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -index 4c318c5286ade659c80e5a5946ddec36444c68f4..895b9c8c719a36276985944aa75172dccd634b42 100644 +index 2e9c2ad3e29ed620299dadb9cd56f37ac4cfe245..45a3f00be129b9513a5152f6d0dfa2aa0834aece 100644 --- a/chrome/browser/upgrade_detector/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector/upgrade_detector_impl.cc -@@ -479,7 +479,7 @@ void UpgradeDetectorImpl::Init() { +@@ -488,7 +488,7 @@ void UpgradeDetectorImpl::Init() { // On Windows, only enable upgrade notifications for Google Chrome builds. // Chromium does not use an auto-updater. #if !defined(OS_WIN) || BUILDFLAG(GOOGLE_CHROME_BRANDING) || \ 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 33850fdbcb05..d6447635fd39 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,8 +1,8 @@ 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 92bc8dce8478810159dc88fa4ed99eacd0cd558c..7cbe71bf79bb8f3bdf1aa925b54fee8b49cc8410 100644 +index 75389f85cf41cd99616b6f687937c1d0a6277136..8533184525fdd9eca6bcc98fb61e3fe05a1fb7fd 100644 --- a/chrome/browser/web_applications/components/web_app_shortcut_mac.mm +++ b/chrome/browser/web_applications/components/web_app_shortcut_mac.mm -@@ -763,6 +763,7 @@ base::FilePath GetChromeAppsFolder() { +@@ -760,6 +760,7 @@ base::FilePath GetChromeAppsFolder() { if (path.empty()) return path; diff --git a/patches/chrome-chrome_repack_locales.gni.patch b/patches/chrome-chrome_repack_locales.gni.patch index df19f0a6daa4..c397241b3767 100644 --- a/patches/chrome-chrome_repack_locales.gni.patch +++ b/patches/chrome-chrome_repack_locales.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/chrome_repack_locales.gni b/chrome/chrome_repack_locales.gni -index a64a23560460a17ce39a468d4ccdd81f3089449a..8b3822fa3539dfa21d77bd1d0216568a26051f40 100644 +index 203d54004d3246cc2ac412481c3fdf9e65729619..1585055b3ebcfa17567c76d80d5934b9ec9ac9f9 100644 --- a/chrome/chrome_repack_locales.gni +++ b/chrome/chrome_repack_locales.gni @@ -37,6 +37,7 @@ template("chrome_repack_locales") { diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index 462285926ae4..ca74547d7d04 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index e2891369fb49ee27eb139a210375bc3f1608440b..3b2063730667edea343698e24342ed36f7c7a780 100644 +index 1ad2ed58b40859ed878c81445e4d556e0fc33ea5..72401bd3e51926aa03749d5c0eadd69514342535 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -86,6 +86,7 @@ source_set("channel_info") { +@@ -81,6 +81,7 @@ source_set("channel_info") { } else if (is_posix) { sources += [ "channel_info_posix.cc" ] } @@ -10,7 +10,7 @@ index e2891369fb49ee27eb139a210375bc3f1608440b..3b2063730667edea343698e24342ed36 } source_set("ini_parser") { -@@ -545,6 +546,7 @@ static_library("non_code_constants") { +@@ -544,6 +545,7 @@ static_library("non_code_constants") { "//printing/buildflags", "//ui/base:buildflags", ] diff --git a/patches/chrome-installer-linux-common-installer.include.patch b/patches/chrome-installer-linux-common-installer.include.patch index c651226fafe3..fbb2bf4586e5 100644 --- a/patches/chrome-installer-linux-common-installer.include.patch +++ b/patches/chrome-installer-linux-common-installer.include.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/linux/common/installer.include b/chrome/installer/linux/common/installer.include -index 64f7e3b68b1ce58ed9f104f88362be9946a3f3b5..8a0f61d23693660bd40de9355e2a71bddfad7e05 100644 +index 64f961a0a4162b713d51e577da2f340ad0dadfb2..8cd98452b02177ec5f5cf872df5031edac0ddf6e 100644 --- a/chrome/installer/linux/common/installer.include +++ b/chrome/installer/linux/common/installer.include @@ -75,6 +75,7 @@ process_template() ( @@ -19,7 +19,7 @@ index 64f7e3b68b1ce58ed9f104f88362be9946a3f3b5..8a0f61d23693660bd40de9355e2a71bd # ICU data file; Necessary when the GN icu_use_data_file flag is true. install -m 644 "${OUTPUTDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/" -@@ -307,11 +310,13 @@ stage_install_common() { +@@ -317,11 +320,13 @@ stage_install_common() { # app icons local icon_regex=".*product_logo_[0-9]\+\." diff --git a/patches/chrome-installer-util-shell_util.cc.patch b/patches/chrome-installer-util-shell_util.cc.patch index 0c4b957fdadf..c8e0696e5539 100644 --- a/patches/chrome-installer-util-shell_util.cc.patch +++ b/patches/chrome-installer-util-shell_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc -index 4848567fa024a31236c02e87d06dac9c4666c26b..7489006e37a1fe699f5fcd9d713227f964d38f35 100644 +index d897dd98a37eeb005391961d16ad47e4031b7c74..16b89fb2f224a1eb554d4e098d86a969ae423694 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -358,6 +358,7 @@ void GetChromeProgIdEntries( diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 5dabfc3ea128..64d81f27f0e8 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index 2019ac2a1eb1854084a79388813ec4fc3cbdd442..8503cea7e000af149df78b22fc73411b8ef6d6af 100644 +index 931e8b4e16ef208ead2ad8f310ab961795916637..6a13a1bcc292152a1c2ac1d4f4f4f3b62d5fec98 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn @@ -235,6 +235,7 @@ static_library("renderer") { diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index 3ed28161cf0d..97ae7134fb3c 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 e427301090fc83c7dd8fb0c7d905e76ea988ed9a..b9b1d3df251913953ee5253c9dcabce11f235b7d 100644 +index 468b938235450dfe0bd89a415cd9381a2ee70c08..f92d5ab5f3ac777f350ec2071c2153ee4fd093da 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -522,7 +522,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -526,7 +526,7 @@ void ChromeContentRendererClient::RenderFrameCreated( ChromeExtensionsRendererClient::GetInstance()->extension_dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index ef81767e0e75..543d70f6556f 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 f51ad2e7b6df421c902c61b5c0f0d3c4ca541cb1..0b3ca7925595a742db6d45fe06a68ebe540bbfca 100644 +index 2cc88304b36202e3baa0f2a22728d0ae973f15c4..8fde03a0b7722b92518a2f263b9c846aa9759b90 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -1235,6 +1235,7 @@ if (!is_android) { +@@ -1263,6 +1263,7 @@ if (!is_android) { "//v8", ] diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch index 596ae4141032..024c42606147 100644 --- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch +++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml -index 126a93277ed4bcc2b35b7120da0a52141ee5f59b..57a6f9ba60f65b108665166c6ab8a317116c0ea5 100644 +index 02702a486b1435e06ed33e207a469a2821c5b447..c1007efadb8043883c078ffdb186c52f1652be6a 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml @@ -64,7 +64,7 @@ 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 2c08d62591f7..30a2f21ecd1f 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,8 +1,8 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index bfd0c6a9f82c2fbdbebbc656c2a310b7751b2c39..5cdc5cabbf53bb7fe5f170f582455defbb8e20e9 100644 +index 72bb77a4a0c3ed3330bfb05bd892104f8a57a4b3..f1e7edfb5c5f279da9a50cf73bd2dfbafdd061b0 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc -@@ -453,6 +453,7 @@ bool PageSpecificContentSettings::IsContentBlocked( +@@ -454,6 +454,7 @@ bool PageSpecificContentSettings::IsContentBlocked( content_type == ContentSettingsType::ADS || content_type == ContentSettingsType::SOUND || content_type == ContentSettingsType::CLIPBOARD_READ_WRITE || @@ -10,7 +10,7 @@ index bfd0c6a9f82c2fbdbebbc656c2a310b7751b2c39..5cdc5cabbf53bb7fe5f170f582455def content_type == ContentSettingsType::SENSORS || content_type == ContentSettingsType::GEOLOCATION) { const auto& it = content_settings_status_.find(content_type); -@@ -476,6 +477,7 @@ bool PageSpecificContentSettings::IsContentAllowed( +@@ -477,6 +478,7 @@ bool PageSpecificContentSettings::IsContentAllowed( content_type != ContentSettingsType::PPAPI_BROKER && content_type != ContentSettingsType::MIDI_SYSEX && content_type != ContentSettingsType::CLIPBOARD_READ_WRITE && diff --git a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch index 376e38bf9258..7b7fd24343d3 100644 --- a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc -index 6144f3552a4c2497d4c5ba8cbc17fdd185903fdf..d1dce3680e5e2bd62e4aecd7cff5912554c5103b 100644 +index d38863e6cf909068bda652d212e448369fad6651..ed9560b20bb79e0a5ad21aa428a94485e2428026 100644 --- a/components/content_settings/core/browser/content_settings_pref.cc +++ b/components/content_settings/core/browser/content_settings_pref.cc -@@ -160,6 +160,7 @@ bool ContentSettingsPref::SetWebsiteSetting( +@@ -164,6 +164,7 @@ bool ContentSettingsPref::SetWebsiteSetting( DCHECK(thread_checker_.CalledOnValidThread()); DCHECK(prefs_); DCHECK(primary_pattern != ContentSettingsPattern::Wildcard() || diff --git a/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch b/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch index c0f232b28cf8..9b186254583a 100644 --- a/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch +++ b/patches/components-content_settings-renderer-content_settings_agent_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/renderer/content_settings_agent_impl.cc b/components/content_settings/renderer/content_settings_agent_impl.cc -index ae9907bf2b85f5bb79c01e8cd2a91b2d5cc93b85..91ade721da1190ac0d2f63d13a2ca8de697aac9e 100644 +index 610f6d942998cbb69933c47d59fff172460a433c..d0d2c137373535d2148d00f9f08d9e4a67925cbe 100644 --- a/components/content_settings/renderer/content_settings_agent_impl.cc +++ b/components/content_settings/renderer/content_settings_agent_impl.cc -@@ -458,6 +458,7 @@ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const { +@@ -459,6 +459,7 @@ bool ContentSettingsAgentImpl::IsAllowlistedForContentSettings() const { const WebDocument& document = render_frame()->GetWebFrame()->GetDocument(); WebSecurityOrigin origin = document.GetSecurityOrigin(); WebURL document_url = document.Url(); diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch index e31aaad7eebf..2fe432dbe44b 100644 --- a/patches/components-download-internal-common-download_item_impl.cc.patch +++ b/patches/components-download-internal-common-download_item_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc -index 697dadd5969d79b7fb049faa117fee5cc7842511..a6d2f901d8a839100e970fdb1cca78a4a8a42632 100644 +index dd1dfe270153b375e23e9c69811b78f18d90d21b..29b22d39ccf9fb8cee4a678513cf269324d1b65f 100644 --- a/components/download/internal/common/download_item_impl.cc +++ b/components/download/internal/common/download_item_impl.cc @@ -1991,8 +1991,8 @@ void DownloadItemImpl::OnDownloadCompleting() { diff --git a/patches/components-favicon-core-favicon_database.cc.patch b/patches/components-favicon-core-favicon_database.cc.patch index 338761e80462..6e35d6b98a2c 100644 --- a/patches/components-favicon-core-favicon_database.cc.patch +++ b/patches/components-favicon-core-favicon_database.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/favicon/core/favicon_database.cc b/components/favicon/core/favicon_database.cc -index dedb4f29601a427deae5fc40d271c36f8dc78689..99d77460c7b6ea1d54416d2b9e2017489c07e6d4 100644 +index 940014c87d508c449f2f079e74eaacf5259cb9cf..b7a3ea2d309bbcae69089335edf13be246945d3a 100644 --- a/components/favicon/core/favicon_database.cc +++ b/components/favicon/core/favicon_database.cc @@ -504,6 +504,7 @@ FaviconBitmapID FaviconDatabase::AddFaviconBitmap( @@ -10,7 +10,7 @@ index dedb4f29601a427deae5fc40d271c36f8dc78689..99d77460c7b6ea1d54416d2b9e201748 sql::Statement statement(db_.GetCachedStatement( SQL_FROM_HERE, -@@ -558,8 +559,8 @@ bool FaviconDatabase::SetFaviconBitmap( +@@ -556,8 +557,8 @@ bool FaviconDatabase::SetFaviconBitmap( } else { statement.BindNull(0); } @@ -21,7 +21,7 @@ index dedb4f29601a427deae5fc40d271c36f8dc78689..99d77460c7b6ea1d54416d2b9e201748 statement.BindInt64(3, bitmap_id); return statement.Run(); -@@ -567,6 +568,7 @@ bool FaviconDatabase::SetFaviconBitmap( +@@ -565,6 +566,7 @@ bool FaviconDatabase::SetFaviconBitmap( bool FaviconDatabase::SetFaviconBitmapLastUpdateTime(FaviconBitmapID bitmap_id, base::Time time) { diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index bd48411c133a..f3b748f30f36 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 c41f5035c812183311ee588c1253b9fd06a60f9b..4ddba2b929f7de08b27e06fb94a59aa5661ab822 100644 +index f47e805fddfc745e60d8596ce2d8402c8994d291..7ea6f1f6d708a15e4464e0de99259daab50eac2d 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -273,6 +273,7 @@ static_library("browser") { +@@ -274,6 +274,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] diff --git a/patches/components-page_info-BUILD.gn.patch b/patches/components-page_info-BUILD.gn.patch index fe2c71f123f6..9aa83d38d05f 100644 --- a/patches/components-page_info-BUILD.gn.patch +++ b/patches/components-page_info-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/page_info/BUILD.gn b/components/page_info/BUILD.gn -index 090e99cf272e59c744598c5ce121bc9cd7aec590..cbdc37eb8f8cbdc5e9b2b46f0396937e04e75dbb 100644 +index 0674f0cf1a1898be576166540cad6709b73dbe5d..9ad6af1ed5c0c3bf6088cbb361a7c97d8b1ecd27 100644 --- a/components/page_info/BUILD.gn +++ b/components/page_info/BUILD.gn @@ -43,6 +43,7 @@ static_library("page_info") { diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index 54e946a0e8ea..e6850d861535 100644 --- a/patches/components-page_info-page_info.cc.patch +++ b/patches/components-page_info-page_info.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc -index 3ff1308b8f9dad34e24788d00e3dcea9f7d03d2a..124210469167e465497e164d5b802bdd6fb5537d 100644 +index d06141e503e272b5b100303bd7884a0461ffdb19..790f3a376f4402735cd9f33ab11901039a51d946 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc @@ -988,6 +988,7 @@ void PageInfo::PresentSitePermissions() { 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 97f08f3b8ded..915170c59613 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 a39936e3425859097e859e94dfb4d19433e88a6a..874904b4452a85916ac4da2b7362758d523551bb 100644 +index 86aa8d514e800c2da6ac84ba103cfd182a0eb724..fb7b5ab226deb552c990fb23ecd75bb84541dff0 100644 --- a/components/password_manager/core/browser/login_database.cc +++ b/components/password_manager/core/browser/login_database.cc -@@ -2045,6 +2045,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( +@@ -2065,6 +2065,7 @@ FormRetrievalResult LoginDatabase::StatementToForms( EncryptionResult result = InitPasswordFormFromStatement( *statement, /*decrypt_and_fill_password_value=*/true, &primary_key, new_form.get()); diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index 16ecfe0cee5d..70000810dc24 100644 --- a/patches/components-permissions-BUILD.gn.patch +++ b/patches/components-permissions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn -index 224170f8596e4fda79c03d14621114f8aaefb42b..46b9db131f0c97c3b74a07bc4081625cfcc5af22 100644 +index 861d73ba795692af40c2faee81efea9758f6bdf8..058af16eedec044fbe412842a7a96c1fb9e95005 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn -@@ -124,6 +124,7 @@ source_set("permissions") { +@@ -129,6 +129,7 @@ source_set("permissions") { "contexts/geolocation_permission_context_mac.h", ] } diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index e536e4163c9e..198b4b1779f7 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 c696aa7507554706837cc57cf009db810722fa57..7c6edf7c478befbda09733b568fa78314bf95286 100644 +index 0eef0530b98e0669756a2f5047d3b15d042133bf..29c5f1ad39cf779830bf177915c6169cf1aedf93 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc @@ -107,6 +107,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) { diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch index 4f38f9029586..3ba41aa6dc1c 100644 --- a/patches/components-policy-tools-generate_policy_source.py.patch +++ b/patches/components-policy-tools-generate_policy_source.py.patch @@ -1,5 +1,5 @@ diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py -index f582b5bf4c4cd6163aae55b477f924c5d1c85e68..b326e157aeeb07033c375ee3a565726c3048bc04 100755 +index f8a1c794c3f4629c97158c7974ef26011d67f52e..62625fb3eea1682ae0ea43303a42c6dc72d203f8 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py @@ -52,6 +52,7 @@ PLATFORM_STRINGS = { @@ -10,7 +10,7 @@ index f582b5bf4c4cd6163aae55b477f924c5d1c85e68..b326e157aeeb07033c375ee3a565726c class PolicyDetails: """Parses a policy template and caches all its details.""" -@@ -363,6 +364,7 @@ def main(): +@@ -361,6 +362,7 @@ def main(): chrome_major_version = ParseVersionFile(version_path) template_file_contents = _LoadJSONFile(template_file_name) diff --git a/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch b/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch index 64c76b6243a2..e349ec1f306a 100644 --- a/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch +++ b/patches/components-safe_browsing-content-browser-client_side_model_loader.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/safe_browsing/content/browser/client_side_model_loader.cc b/components/safe_browsing/content/browser/client_side_model_loader.cc -index 8f7e3fb9bb9f7368e90a481454253b98605cc226..330caad55c89b67aad1c7d994be073de91b6b054 100644 +index 7fbcb79da40246d9a77605dec15e85f041a45be4..fbd36247ea4432d32c1453720a4e743e8ad75dca 100644 --- a/components/safe_browsing/content/browser/client_side_model_loader.cc +++ b/components/safe_browsing/content/browser/client_side_model_loader.cc @@ -61,7 +61,7 @@ std::string ReadFileIntoString(base::FilePath path) { diff --git a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch index fe2f69cad500..3e300ab35f60 100644 --- a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch +++ b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc -index c27b9bb975b953d08fe06319069020c04684f4cc..9afd2e0147edeb93f0296a23f4e06995a14d7d93 100644 +index 4bdf58ceda424dec5b54ef892a4bff6847ac2f7d..eb45c1d13d40fe9dc3cb9c95b4b0454516f68a79 100644 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc -@@ -136,6 +136,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) { +@@ -137,6 +137,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) { } bool IsEnhancedProtectionEnabled(const PrefService& prefs) { diff --git a/patches/components-signin-internal-identity_manager-BUILD.gn.patch b/patches/components-signin-internal-identity_manager-BUILD.gn.patch index 95d6bcd709d1..f918a50e4426 100644 --- a/patches/components-signin-internal-identity_manager-BUILD.gn.patch +++ b/patches/components-signin-internal-identity_manager-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/signin/internal/identity_manager/BUILD.gn b/components/signin/internal/identity_manager/BUILD.gn -index adb92f1704b5fb9be9bbf9d0410d95e7df2dad36..a1de9c76a7cba893b48975c23513a608296a0a74 100644 +index e04392e9238a45e0578fe28fcd5c6f78a03c5cd6..fa27d96f68c452d07175f084f9bc811edf0df872 100644 --- a/components/signin/internal/identity_manager/BUILD.gn +++ b/components/signin/internal/identity_manager/BUILD.gn -@@ -139,6 +139,7 @@ source_set("identity_manager") { +@@ -131,6 +131,7 @@ source_set("identity_manager") { "device_accounts_synchronizer_impl.h", ] } diff --git a/patches/components-sync-driver-BUILD.gn.patch b/patches/components-sync-driver-BUILD.gn.patch index 45cd37a2e5b8..16b77dc53504 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 99b3b2f091337d84c4f638f28792fb277e83dffe..5549461bf726d55376be216cddc2f5684e5c3ef9 100644 +index 1d02961c42ba0e6909caba3ac5926703e9d0c803..809e7f19d42603a9b92b59f173e9cd27fd06b5aa 100644 --- a/components/sync/driver/BUILD.gn +++ b/components/sync/driver/BUILD.gn -@@ -107,6 +107,7 @@ static_library("driver") { +@@ -108,6 +108,7 @@ static_library("driver") { } configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/patches/components-sync-driver-sync_service_impl.h.patch b/patches/components-sync-driver-sync_service_impl.h.patch index fb9378a905ef..38c3a7479e12 100644 --- a/patches/components-sync-driver-sync_service_impl.h.patch +++ b/patches/components-sync-driver-sync_service_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/driver/sync_service_impl.h b/components/sync/driver/sync_service_impl.h -index a0282dfe66c8d29a46173f3e074f7cad14d0b638..0161ae54f9fc7f61716be0cc9641d9f46a3a82f7 100644 +index a241c23af686216d463d8b99b982a3a1a8783326..0979c2483d0095460edf6eb129caf9c00c5ce94e 100644 --- a/components/sync/driver/sync_service_impl.h +++ b/components/sync/driver/sync_service_impl.h -@@ -253,6 +253,7 @@ class SyncServiceImpl : public SyncService, +@@ -251,6 +251,7 @@ class SyncServiceImpl : public SyncService, SyncClient* GetSyncClientForTest(); diff --git a/patches/components-sync-protocol-device_info_specifics.proto.patch b/patches/components-sync-protocol-device_info_specifics.proto.patch index 833b7a44c50c..c55a0a506766 100644 --- a/patches/components-sync-protocol-device_info_specifics.proto.patch +++ b/patches/components-sync-protocol-device_info_specifics.proto.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/protocol/device_info_specifics.proto b/components/sync/protocol/device_info_specifics.proto -index b97eafa7434a95a741a55c2b3013521c91641d0c..cc5bdb89369abc926d95e9795921c5327454773d 100644 +index 57f52a59ca9592bc6acba812e18c7d9f034b0722..7e3daebc36ff924eff842711a4fd2f67f767548c 100644 --- a/components/sync/protocol/device_info_specifics.proto +++ b/components/sync/protocol/device_info_specifics.proto @@ -17,6 +17,7 @@ option optimize_for = LITE_RUNTIME; @@ -10,7 +10,7 @@ index b97eafa7434a95a741a55c2b3013521c91641d0c..cc5bdb89369abc926d95e9795921c532 // Information about a device that is running a sync-enabled Chrome browser. We // are mapping the per-client cache guid to more specific information about the -@@ -89,6 +90,7 @@ message DeviceInfoSpecifics { +@@ -90,6 +91,7 @@ message DeviceInfoSpecifics { ChromeVersionInfo chrome_version_info = 17; GooglePlayServicesVersionInfo google_play_services_version_info = 18; } diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index de6f4955654d..faf987b5d877 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 51974ad6471c1ff9117ce7ddde6dc84a1a6357c7..6fa9189cb2e134973453dc976e2a9ea079fa091d 100644 +index cec10aa673965a1764d21dc8d66a5ddcf78ff683..73858d6565b282a6c7fe3aff297c365b1c6110ef 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h @@ -390,6 +390,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { diff --git a/patches/components-sync_device_info-device_info.h.patch b/patches/components-sync_device_info-device_info.h.patch index bd7d048e14f8..7b843e805e4c 100644 --- a/patches/components-sync_device_info-device_info.h.patch +++ b/patches/components-sync_device_info-device_info.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync_device_info/device_info.h b/components/sync_device_info/device_info.h -index fbaa5c9b1b2ec5184372058be00c890d2e565428..f93da86da5aaf60526d56adc78e1b4fa63b5b9a6 100644 +index 86b78de6c664337d15523e8f71930a0f79f13f2c..e47ccd9a7fca1213fb879055c3ce77068fa656c9 100644 --- a/components/sync_device_info/device_info.h +++ b/components/sync_device_info/device_info.h -@@ -112,6 +112,7 @@ class DeviceInfo { +@@ -113,6 +113,7 @@ class DeviceInfo { const absl::optional& paask_info, const std::string& fcm_registration_token, const ModelTypeSet& interested_data_types); 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 577af4d99641..bd38dcedcc73 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,8 +1,8 @@ diff --git a/components/sync_device_info/device_info_sync_bridge.cc b/components/sync_device_info/device_info_sync_bridge.cc -index f97d419ed5991d027dde43682022c3e8220f7959..63bd7569eaaf3d6b1aaf156caf4394b6f33e6b08 100644 +index 15a264d356f174b6603594f2e6525839c2efda75..00ac7334a04f7db7edda93ddaa8078d30fb879ac 100644 --- a/components/sync_device_info/device_info_sync_bridge.cc +++ b/components/sync_device_info/device_info_sync_bridge.cc -@@ -258,6 +258,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( +@@ -259,6 +259,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( GetSpecificsFieldNumberFromModelType(data_type)); } @@ -10,9 +10,9 @@ index f97d419ed5991d027dde43682022c3e8220f7959..63bd7569eaaf3d6b1aaf156caf4394b6 return specifics; } -@@ -429,7 +430,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( - // Each device is the authoritative source for itself, ignore any remote - // changes that have a cache guid that is or was this local device. +@@ -442,7 +443,7 @@ absl::optional DeviceInfoSyncBridge::ApplySyncChanges( + // Ignore any remote changes that have a cache guid that is or was this + // local device. if (device_info_prefs_->IsRecentLocalCacheGuid(guid)) { - continue; + if (change->type() != EntityChange::ACTION_DELETE) continue; diff --git a/patches/components-variations-variations_seed_store.cc.patch b/patches/components-variations-variations_seed_store.cc.patch index bcdaf28c0eb0..8b7ea3b2e273 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 7b6ee96b13a31d55373f506d67eccb0ae2c8fbfa..0772d7d399bae55e4dac636542c8a04d55dbe9b4 100644 +index fd067904a6d93f29f070c60255c520e727f4c63a..a8066e9137d36a515c3cc63bc971589b5f997840 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_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index 6467233a2f92..81924da9837a 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 4f88ba8bae251e26fd53157ffda484e3cfd16b9d..652d50d93d2bb5ff60cddb615dbbe9992f0d6ebc 100644 +index e04121dc5df9dffae00e1cc3de4200a5f3e02d87..3c41958e563d37804d2ef72fa29c7c5d80b57dea 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -3119,16 +3119,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -3139,16 +3139,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index b1f6ed4addce..b889506b0478 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 184725fff60669184e051b5414b917c79706efbe..001c912eaec7be5dc8006ec2f66153afc44fa950 100644 +index 76983356f2822f5049f6e321923214d479f7a493..82e1d5711e2f2127eacb19d565ed830d0d35ab5c 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -2204,6 +2204,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -2283,6 +2283,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 184725fff60669184e051b5414b917c79706efbe..001c912eaec7be5dc8006ec2f66153af common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -3387,6 +3388,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -3446,6 +3447,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 53603297cf44..33479aa7536a 100644 --- a/patches/content-browser-webui-web_ui_impl.cc.patch +++ b/patches/content-browser-webui-web_ui_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc -index 7cc7f68b417b69d3c81a89087316c5651e36194b..98b4ec16419e32a5ba44f7c00fb13ba2bce37e2c 100644 +index c1cb3032acb93880b83b76c0e3594620ad360c05..bf035bd0cff5815717748e9448639362d9bc80dd 100644 --- a/content/browser/webui/web_ui_impl.cc +++ b/content/browser/webui/web_ui_impl.cc @@ -75,6 +75,7 @@ WebUIImpl::WebUIImpl(WebContentsImpl* contents, RenderFrameHostImpl* frame_host) diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index f84fafd93ab8..db111b0b5dcc 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 c55ec4f5a15f0c4d8abc318cc3de7100813dbe8c..bebe57d28b6d90874a05bd0de269efb588b20594 100644 +index e7ce731076817476413af9e82e634318d57c5aef..1d7eb1eae43aadb06f437afa51b194dd80dc6f28 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -42,6 +42,7 @@ source_set("common") { diff --git a/patches/content-common-user_agent.cc.patch b/patches/content-common-user_agent.cc.patch index a3526e6cd16f..07a155af0021 100644 --- a/patches/content-common-user_agent.cc.patch +++ b/patches/content-common-user_agent.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc -index b3e400cf99b07d0b18574a4fbae94a8176d30445..8741b34005183bac3c34dd4adf2d2ef7f907bd9c 100644 +index 25facd610551cefa60a445152e72a9d519f007ca..59fd65496f3a88e3891eaecc9f4d077dc2e29112 100644 --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc -@@ -310,6 +310,7 @@ std::string GetAndroidOSInfo( +@@ -311,6 +311,7 @@ std::string GetAndroidOSInfo( // Send information about the device. bool semicolon_inserted = false; diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index ba94a646636e..11f3e153bb17 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 9ae95b8118e37e22d6faddf62cd06b182d2033db..891aa4e0a5468a085fe8a79fe23d267b73ccbd18 100644 +index 50973ec62592add4a88a1550162da5943fe6a554..3cc58454c70fbf8e53ccbb256d9ae08feb63499b 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4456,6 +4456,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4472,6 +4472,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index 987fec77e374..32f56e3e4145 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 3a5834f68dadd0de9071c8e7c7bd416d59d40d55..bb2e2a4a88dca2bfc78c156ddf6670a3394bde4a 100644 +index 95ab5d2de52ec021867151c8de30c78cd4828a20..2c64b652d03a41b9982d291b81545f529a841626 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -949,6 +949,7 @@ void RenderThreadImpl::InitializeWebKit(mojo::BinderMap* binders) { +@@ -941,6 +941,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 3ab11bfd45af..a22edd235448 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 43f1a286fc0a5cc0689cd8a29e9ccb9a10b9da61..85896f5e9a6c6faf5f15eb9f94ab4698758f4c99 100644 +index 60377a2523cc06995f38b3086f75cecb5aa1f1ec..75aaf99f76112fb6bb225693a4d2e1c4e31109a0 100644 --- a/extensions/browser/api/web_request/web_request_api.cc +++ b/extensions/browser/api/web_request/web_request_api.cc -@@ -1300,6 +1300,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( +@@ -1301,6 +1301,9 @@ ExtensionWebRequestEventRouter::OnAuthRequired( const net::AuthChallengeInfo& auth_info, AuthCallback callback, net::AuthCredentials* credentials) { diff --git a/patches/google_apis-google_api_keys.cc.patch b/patches/google_apis-google_api_keys.cc.patch index b28055316354..e479074e002d 100644 --- a/patches/google_apis-google_api_keys.cc.patch +++ b/patches/google_apis-google_api_keys.cc.patch @@ -1,8 +1,8 @@ diff --git a/google_apis/google_api_keys.cc b/google_apis/google_api_keys.cc -index da3fb4f261991fcd72d35305d1625f81f3ed3694..690bce99d74b95d3a325ac03f201766069e9b837 100644 +index 17327b9bcb620dd57d8615fd59754458b3795737..6be2ce374d161dc6953596da946042151012b54c 100644 --- a/google_apis/google_api_keys.cc +++ b/google_apis/google_api_keys.cc -@@ -218,6 +218,7 @@ class APIKeyCache { +@@ -219,6 +219,7 @@ class APIKeyCache { #if defined(OS_IOS) || defined(OS_FUCHSIA) void set_api_key(const std::string& api_key) { api_key_ = api_key; } #endif diff --git a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch index e2f1e62c8537..01febb785ae7 100644 --- a/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch +++ b/patches/ios-chrome-browser-prefs-browser_prefs.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/prefs/browser_prefs.mm b/ios/chrome/browser/prefs/browser_prefs.mm -index b59505129fe91f3f91333c220f536fc59c80f47a..f58b016b1ff58f55c0c2b1b66e7945937233d47f 100644 +index d2a5d8b3849cc6a8d43056f9221d7936bbe959b4..d69f91dc626fb9495917ec6f50df5306b6367c96 100644 --- a/ios/chrome/browser/prefs/browser_prefs.mm +++ b/ios/chrome/browser/prefs/browser_prefs.mm -@@ -262,6 +262,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -264,6 +264,7 @@ void RegisterBrowserStatePrefs(user_prefs::PrefRegistrySyncable* registry) { registry->RegisterIntegerPref(kPasswordManagerOnboardingState, 0); registry->RegisterBooleanPref(kWasOnboardingFeatureCheckedBefore, false); registry->RegisterDictionaryPref(kDomainsWithCookiePref); diff --git a/patches/ios-chrome-browser-sync-sync_service_factory.cc.patch b/patches/ios-chrome-browser-sync-sync_service_factory.cc.patch index 89c6acf3007f..5db021c5866c 100644 --- a/patches/ios-chrome-browser-sync-sync_service_factory.cc.patch +++ b/patches/ios-chrome-browser-sync-sync_service_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/sync/sync_service_factory.cc b/ios/chrome/browser/sync/sync_service_factory.cc -index fa41cb4d38d4337a1451699eabb7589fcf9c39a1..d237f38d2f2310b1456c9d1c7b875c3ebcfbea2a 100644 +index 754770e9a60c9c0da65344f6b1f4a6d20cdf566e..3c8771e0f0b9b9f7890f197222a0e0bfaaae0731 100644 --- a/ios/chrome/browser/sync/sync_service_factory.cc +++ b/ios/chrome/browser/sync/sync_service_factory.cc -@@ -171,7 +171,7 @@ std::unique_ptr SyncServiceFactory::BuildServiceInstanceFor( +@@ -151,7 +151,7 @@ std::unique_ptr SyncServiceFactory::BuildServiceInstanceFor( policy_connector ? policy_connector->GetPolicyService() : nullptr; auto sync_service = diff --git a/patches/mojo-public-tools-mojom-mojom_parser.py.patch b/patches/mojo-public-tools-mojom-mojom_parser.py.patch index 3e05d5179dd8..e291af2b1757 100644 --- a/patches/mojo-public-tools-mojom-mojom_parser.py.patch +++ b/patches/mojo-public-tools-mojom-mojom_parser.py.patch @@ -1,5 +1,5 @@ diff --git a/mojo/public/tools/mojom/mojom_parser.py b/mojo/public/tools/mojom/mojom_parser.py -index 48431e9f271bc08c4671b2b5fb3c5e083e2492a6..d8430982f07f9a247c136aa36ad6e89338240965 100755 +index 07a7ba5662d20dfec4ed3ba324705944ab63bf5d..db0a4f0a7981539ea159b0739307c18c8de5f62a 100755 --- a/mojo/public/tools/mojom/mojom_parser.py +++ b/mojo/public/tools/mojom/mojom_parser.py @@ -178,6 +178,7 @@ def _ParseAstHelper(mojom_abspath, enabled_features): diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index a316b15fb95a..883b9aa3f997 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 15fc75fcdc16c8afec4e4ff0519e21eede9adc60..153239dcbefb1a009ca8a88a82ba342cd0812ac8 100644 +index 028a63ba6fd4b6c7f3878f5f8a3421997be984b5..bcec0106682e150b92f96672103f1996afda5880 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1135,6 +1135,7 @@ component("net") { +@@ -1136,6 +1136,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 0b2d89ee1dc2..1039250f2e4b 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 59ad668988d036c52da34a8638355b37bd857a3a..81bb646467f2f3db2c4f65be6d0e0e11de2e492e 100644 +index 32b931ce899083d44a3e62743721a92d3748804e..8b2fb30febc97d2009f8d55f839bf7133d3ad054 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc -@@ -459,6 +459,7 @@ std::unique_ptr CanonicalCookie::Create( +@@ -485,6 +485,7 @@ std::unique_ptr CanonicalCookie::Create( // Get the port, this will get a default value if a port isn't provided. int source_port = url.EffectiveIntPort(); diff --git a/patches/net-dns-dns_transaction.cc.patch b/patches/net-dns-dns_transaction.cc.patch index ad7f4a85c865..04685f3069a3 100644 --- a/patches/net-dns-dns_transaction.cc.patch +++ b/patches/net-dns-dns_transaction.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc -index 57d5663ae832636b927f1b4a334f69db0609c1e7..56e2a9b4497042700be2e4e1564e2b885cd9c298 100644 +index 7be16510cf0fe6af16f1cb71ab950efaaecdbc32..2f17e5a2ddd565d6db2f2ad9207607a8697d774b 100644 --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc @@ -1302,6 +1302,7 @@ class DnsTransactionImpl : public DnsTransaction, diff --git a/patches/net-dns-host_cache.cc.patch b/patches/net-dns-host_cache.cc.patch index 3f5572962731..0dc232f4c5a9 100644 --- a/patches/net-dns-host_cache.cc.patch +++ b/patches/net-dns-host_cache.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc -index 17bd553e8785217018cdf2cdceef4dfb32d2cdac..88c499160d7aacf2854534edd7e8bd69e0b8063a 100644 +index 9af27e2c4733588741fb44849ba08d4b347cd1cc..8b60c551596838dcc36b67df639db083edb71760 100644 --- a/net/dns/host_cache.cc +++ b/net/dns/host_cache.cc @@ -221,6 +221,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const { diff --git a/patches/net-socket-socks5_client_socket.cc.patch b/patches/net-socket-socks5_client_socket.cc.patch index 8ffb6d889025..d30e8b893ccc 100644 --- a/patches/net-socket-socks5_client_socket.cc.patch +++ b/patches/net-socket-socks5_client_socket.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc -index ae130d9b5f8b83ded0bcdc83c1c392904967cd6f..3335cddfd75ea2da414aef8766333f1235fec4e7 100644 +index 0390ad8c2cf484b9f80e9237259aab8ee2c75642..0286937c6c60c97e9aae6fbc1467347ca59fd115 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc -@@ -238,6 +238,9 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { +@@ -239,6 +239,9 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { net_log_.EndEventWithNetErrorCode(NetLogEventType::SOCKS5_GREET_READ, rv); break; @@ -12,7 +12,7 @@ index ae130d9b5f8b83ded0bcdc83c1c392904967cd6f..3335cddfd75ea2da414aef8766333f12 case STATE_HANDSHAKE_WRITE: DCHECK_EQ(OK, rv); net_log_.BeginEvent(NetLogEventType::SOCKS5_HANDSHAKE_WRITE); -@@ -267,8 +270,6 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { +@@ -268,8 +271,6 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { return rv; } @@ -21,7 +21,7 @@ index ae130d9b5f8b83ded0bcdc83c1c392904967cd6f..3335cddfd75ea2da414aef8766333f12 int SOCKS5ClientSocket::DoGreetWrite() { // Since we only have 1 byte to send the hostname length in, if the // URL has a hostname longer than 255 characters we can't send it. -@@ -278,8 +279,12 @@ int SOCKS5ClientSocket::DoGreetWrite() { +@@ -279,8 +280,12 @@ int SOCKS5ClientSocket::DoGreetWrite() { } if (buffer_.empty()) { @@ -36,7 +36,7 @@ index ae130d9b5f8b83ded0bcdc83c1c392904967cd6f..3335cddfd75ea2da414aef8766333f12 bytes_sent_ = 0; } -@@ -338,14 +343,14 @@ int SOCKS5ClientSocket::DoGreetReadComplete(int result) { +@@ -339,14 +344,14 @@ int SOCKS5ClientSocket::DoGreetReadComplete(int result) { "version", buffer_[0]); return ERR_SOCKS_CONNECTION_FAILED; } diff --git a/patches/net-socket-socks_connect_job.cc.patch b/patches/net-socket-socks_connect_job.cc.patch index f89a9eeee721..7bf1cdb89079 100644 --- a/patches/net-socket-socks_connect_job.cc.patch +++ b/patches/net-socket-socks_connect_job.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/socket/socks_connect_job.cc b/net/socket/socks_connect_job.cc -index 97ee6f2f5cf196954ef98bca8e5625a3caf1dc8c..9e188e8aed081d56a6b852eff174b16fcaa9cdea 100644 +index c5824014384eafe06bfe6a887a24713b41296b8d..4f89bfa4683a2a80fb14ac1563990eca8b823c96 100644 --- a/net/socket/socks_connect_job.cc +++ b/net/socket/socks_connect_job.cc -@@ -167,9 +167,11 @@ int SOCKSConnectJob::DoSOCKSConnect() { +@@ -179,9 +179,11 @@ int SOCKSConnectJob::DoSOCKSConnect() { // Add a SOCKS connection on top of the tcp socket. if (socks_params_->is_socks_v5()) { diff --git a/patches/services-network-public-cpp-cors-cors.cc.patch b/patches/services-network-public-cpp-cors-cors.cc.patch index 2fdd2c81303f..e586c5c8d49f 100644 --- a/patches/services-network-public-cpp-cors-cors.cc.patch +++ b/patches/services-network-public-cpp-cors-cors.cc.patch @@ -1,5 +1,5 @@ diff --git a/services/network/public/cpp/cors/cors.cc b/services/network/public/cpp/cors/cors.cc -index a1835cda1fb5de26c8393d8fb0d4d4b4e413b1a6..ba7d3efb1d02c6ef72a76e67224ca2a81379de6b 100644 +index d2cff3d494048af28eb5cd3f2953e660b8b17df9..55e62210dac5dc5fa5ff3792f101c78cbc3d2724 100644 --- a/services/network/public/cpp/cors/cors.cc +++ b/services/network/public/cpp/cors/cors.cc @@ -457,6 +457,7 @@ bool IsCorsSafelistedHeader(const std::string& name, const std::string& value) { diff --git a/patches/third_party-blink-common-client_hints-client_hints.cc.patch b/patches/third_party-blink-common-client_hints-client_hints.cc.patch index d0d780743eca..e0174707c060 100644 --- a/patches/third_party-blink-common-client_hints-client_hints.cc.patch +++ b/patches/third_party-blink-common-client_hints-client_hints.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc -index 831c3bab4201764ebd201f513f0448fbdb0725ca..793ed4d92c3c4a8d2c12c4ac5a35dbea7af6825b 100644 +index e6766d80fce2f3163617a7eaf52d3e5bb54a73fe..2b1ad56956f5efd5e25ba6f4e0ae9c368ab3f2ba 100644 --- a/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc @@ -133,6 +133,7 @@ absl::optional> FilterAcceptCH( 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 4c777e4c6203..56de7c69dd4e 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 9f0c7e09b19689c81a2fadca326b1958a632aecc..042d3f78e7eb339050aa767679fd689b112ace1f 100644 +index 68e13ee706b46e3c0012b86796857bf59f14a7d7..4b73f2d6cab44065cdd43f60a330d224ba95148f 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -2460,6 +2460,7 @@ generated_interface_sources_in_modules = [ +@@ -2466,6 +2466,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_layer.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 f4c11fe1054e..36a595ade5b2 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 7ee40fcc50803ce344b14964bf5502aef375a2f5..44d6a5e9c8bdc2fd4de0d4182f0ff823ba748990 100644 +index 0c68db0ce0b84a3b80f2582a98e07d85c3e8d1a3..d9778924de6479772378645d372810bef3c0c129 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1137,6 +1137,7 @@ static_idl_files_in_modules = get_path_info( +@@ -1140,6 +1140,7 @@ static_idl_files_in_modules = get_path_info( "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.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 8a0bec12572a..fa916a7781a3 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 73edcb3e88be22f9210330d3be4d1f5a7f3e5388..1b2d1fd6db295006c279bc8e4f09f0e2e08ebf70 100644 +index db1ce8e3309eb456be4c897c3588342f795f7fc4..c2d1cb9dee2850467ca8a8824d7f79267ca6e237 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn @@ -167,6 +167,7 @@ component("core") { @@ -10,11 +10,11 @@ index 73edcb3e88be22f9210330d3be4d1f5a7f3e5388..1b2d1fd6db295006c279bc8e4f09f0e2 sources = [ "core_initializer.cc", -@@ -271,6 +272,7 @@ component("core") { +@@ -274,6 +275,7 @@ component("core") { "//v8", ] + public_deps += brave_blink_renderer_core_public_deps deps = [ + ":generated_settings_macros", "//build:chromeos_buildflags", - "//components/paint_preview/common", 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 ee8edd6cc82b..45093da21ac7 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,5 +1,5 @@ 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 6c2a539a519a09c41481a0e82cfe86581be67182..61b0e052560aaf57c9a0dd2c30e370f335183912 100644 +index a1857816547cce5fce47097cc8d618d0847c336e..f39d1cee85bc93c5d5e9c813c2ca4a3e0160d395 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 @@ -934,6 +934,7 @@ String HTMLCanvasElement::ToDataURLInternal( diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch index 3f4b97c0b296..7fb54d27d9c4 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h -index 99d45e501ba215201b54ef74bb812c993716517d..18be42578dad947ae2ebfcac933cae6cdcaef72f 100644 +index 96111727c73bd8a0a0f0f59ba11f932fba0fd865..b180b568db6d29c445514eb4b0eca2b6f51b72f5 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h -@@ -321,6 +321,7 @@ class CORE_EXPORT HTMLCanvasElement final +@@ -322,6 +322,7 @@ class CORE_EXPORT HTMLCanvasElement final bool IsCanvasClear() { return canvas_is_clear_; } diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 3830f0351147..272386d2c7eb 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index 40847847af68591ab77f689260c8d14e9df8d57b..c5d9a3af5b8f69706b6af2e7bd92c3a88e949a8f 100644 +index 26cc3459696f6ae6e53fbdd63ae920bd5bf744e7..8a3b4a364a781c80eb0fca1e1b3c58fa710b51bc 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn -@@ -16,6 +16,7 @@ if (is_android) { +@@ -15,6 +15,7 @@ if (is_android) { } visibility = [ "//third_party/blink/renderer/*" ] @@ -10,7 +10,7 @@ index 40847847af68591ab77f689260c8d14e9df8d57b..c5d9a3af5b8f69706b6af2e7bd92c3a8 config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -184,6 +185,7 @@ component("modules") { +@@ -161,6 +162,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 7e1c733c31cd..5315625223c8 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 a4ea7de64e8f6a0b17918e1a869af45f3c717e17..9d0a0717d9abedf11336ff5ea3fb50614e256595 100644 +index 540d09188e345cf842587cdc9ffc24ee57b1b787..9dd4a6f0fea8916300971057beac088242991746 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 -@@ -1938,6 +1938,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -1975,6 +1975,7 @@ ImageData* BaseRenderingContext2D::getImageData( } ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index a4ea7de64e8f6a0b17918e1a869af45f3c717e17..9d0a0717d9abedf11336ff5ea3fb5061 int sx, int sy, int sw, -@@ -2055,6 +2056,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2092,6 +2093,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } diff --git a/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch b/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch index 89a857ae10f1..b5392f1bf0bb 100644 --- a/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch +++ b/patches/third_party-blink-renderer-modules-webaudio-analyser_node.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webaudio/analyser_node.cc b/third_party/blink/renderer/modules/webaudio/analyser_node.cc -index 5359becd83e4d958f7c77e0ad79979211b4ba00f..ce5648ea0bfdc40b25524ab0482c209972cca039 100644 +index 7d717a83f53fda52a564837c1a7bd01bb0dc0d07..068e95fc15e3f4a0585192de0babbae2cc042cd0 100644 --- a/third_party/blink/renderer/modules/webaudio/analyser_node.cc +++ b/third_party/blink/renderer/modules/webaudio/analyser_node.cc -@@ -37,6 +37,7 @@ AnalyserHandler::AnalyserHandler(AudioNode& node, float sample_rate) +@@ -38,6 +38,7 @@ AnalyserHandler::AnalyserHandler(AudioNode& node, float sample_rate) : AudioBasicInspectorHandler(kNodeTypeAnalyser, node, sample_rate), analyser_( node.context()->GetDeferredTaskHandler().RenderQuantumFrames()) { 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 bb9714f6f36e..b4a0d461d3fa 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 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9cd92a253 100644 +index 4b6c92af2c94613e10d628ffe321ac5ab38362ab..e971b2ee0346b8dfc73affa92138e793f8f00853 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 -@@ -2928,6 +2928,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -2929,6 +2929,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -2959,6 +2960,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -2960,6 +2961,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -2989,6 +2991,7 @@ absl::optional>> +@@ -2990,6 +2992,7 @@ absl::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return absl::nullopt; @@ -26,7 +26,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -3003,6 +3006,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3004,6 +3007,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3036,6 +3040,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3037,6 +3041,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 switch (pname) { case GL_BUFFER_USAGE: { -@@ -3172,6 +3177,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3183,6 +3188,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -50,7 +50,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, "getFramebufferAttachmentParameter", "no framebuffer bound"); -@@ -3572,6 +3578,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3583,6 +3589,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 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3587,6 +3594,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3598,6 +3605,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 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSample( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3679,6 +3687,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3690,6 +3698,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3734,6 +3743,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -3745,6 +3754,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -3744,6 +3754,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -3755,6 +3765,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -3795,6 +3806,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3806,6 +3817,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -3826,6 +3838,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -3837,6 +3849,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -3856,6 +3869,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3867,6 +3880,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSample( -@@ -3868,6 +3882,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -3879,6 +3893,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 return EnsureNotNull(shader->Source()); } -@@ -3897,6 +3912,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -3908,6 +3923,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -3931,6 +3947,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -3942,6 +3958,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 DCHECK(uniform_location); if (uniform_location->Program() != program) { SynthesizeGLError(GL_INVALID_OPERATION, "getUniform", -@@ -4190,6 +4207,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4201,6 +4218,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4214,6 +4232,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4225,6 +4243,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4291,6 +4310,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4302,6 +4321,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 37c50c875cd02d2ab0462656c04a060b67d8bd22..d84de68dd235899334a2a8856c5b77d9 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4638,6 +4658,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4649,6 +4669,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch b/patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch index 877a68e6591a..8fc42ae92464 100644 --- a/patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch +++ b/patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/media/key_system_config_selector.cc b/third_party/blink/renderer/platform/media/key_system_config_selector.cc -index 32cf756a08aaef366e8e70050746f39d729d40d3..b1563ecc155bbff8e03ae0b879c99bf91e1a5485 100644 +index 48b6b1fa58efb862a5565c71f2acf58a2a0f3879..6b7971fafec5c3b6bee1896c518c3e44d6173910 100644 --- a/third_party/blink/renderer/platform/media/key_system_config_selector.cc +++ b/third_party/blink/renderer/platform/media/key_system_config_selector.cc -@@ -994,6 +994,7 @@ void KeySystemConfigSelector::SelectConfig( +@@ -997,6 +997,7 @@ void KeySystemConfigSelector::SelectConfig( key_systems_->UpdateIfNeeded(); diff --git a/patches/tools-gritsettings-resource_ids.spec.patch b/patches/tools-gritsettings-resource_ids.spec.patch index 3dba1679b16b..cb9b402bace3 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 7669ab4ed8d048a75c779636cbe4bc43dcf96507..9851dff8c61f44e67ad1806544113857e506bcb8 100644 +index 97f1d7e7b2b6aa3335e6726b9fabd3ec1d9aaccc..ccc047edffbcdc8d251d4d31e35dd2b2e1637734 100644 --- a/tools/gritsettings/resource_ids.spec +++ b/tools/gritsettings/resource_ids.spec @@ -47,6 +47,9 @@ @@ -12,7 +12,7 @@ index 7669ab4ed8d048a75c779636cbe4bc43dcf96507..9851dff8c61f44e67ad1806544113857 "chrome/app/google_chrome_strings.grd": { "messages": [400], }, -@@ -491,6 +494,9 @@ +@@ -499,6 +502,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 f915574cb0f0..7940a4e258ff 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 ce25749a7ada703eaffd40452557b2461965e1bb..dec5e27e1e9c68ebf136a59e1cb36f03a6bc050f 100644 +index a391fa206100b29672ebfc1ebad693adb1d9be1f..19b0f02a9472c836dfd9810822a0f1e06a38184a 100644 --- a/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml +++ b/tools/metrics/histograms/histograms_xml/histogram_suffixes_list.xml -@@ -14407,6 +14407,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. +@@ -14425,6 +14425,7 @@ reviews. Googlers can read more about this at go/gwsq-gerrit. diff --git a/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch index b7efa213ff65..bca57d68eb80 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/ui/accessibility/platform/ax_platform_node_mac.mm b/ui/accessibility/platform/ax_platform_node_mac.mm -index 0cc1227adb636920ecf44598739a8704dd22dca1..ec9ffe629c8e2dfb2f4f8268b65073660695a6ea 100644 +index b067549fe437c3a7152889f3ff5c4aa808aff218..d0e89edfa574fbf14b4f5f3e74a5e3c793301359 100644 --- a/ui/accessibility/platform/ax_platform_node_mac.mm +++ b/ui/accessibility/platform/ax_platform_node_mac.mm -@@ -1169,6 +1169,7 @@ bool IsAXSetter(SEL selector) { +@@ -1179,6 +1179,7 @@ bool IsAXSetter(SEL selector) { if (!_node) return nil; diff --git a/patches/ui-base-BUILD.gn.patch b/patches/ui-base-BUILD.gn.patch index 6c6d3ceb8e12..04b6832d68cd 100644 --- a/patches/ui-base-BUILD.gn.patch +++ b/patches/ui-base-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ui/base/BUILD.gn b/ui/base/BUILD.gn -index 76f3bfb35e2c8dd353115137359921be989945da..cb8b412df31102a19868ed1ce7a6f3b2decce8b9 100644 +index 898f3292fafc7b8fcb4e290c61f5b1395c94376d..da729f6add551eccac6993e3c2b80feee4bd7ae7 100644 --- a/ui/base/BUILD.gn +++ b/ui/base/BUILD.gn @@ -465,6 +465,7 @@ component("base") { diff --git a/patches/weblayer-public-java-AndroidManifest.xml.patch b/patches/weblayer-public-java-AndroidManifest.xml.patch index d1e9a4f57073..1fc0198b811b 100644 --- a/patches/weblayer-public-java-AndroidManifest.xml.patch +++ b/patches/weblayer-public-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/weblayer/public/java/AndroidManifest.xml b/weblayer/public/java/AndroidManifest.xml -index df5a0db8ca02d0573fb801bc5ebd6bdc47779345..2e410982b80ab814601bf167dcf63caa5a630269 100644 +index 574dcf6a14e7ae9c99e03cf484528fdc9e9d196a..e2f73eb6453660c69234373e5f7582194f9f4775 100644 --- a/weblayer/public/java/AndroidManifest.xml +++ b/weblayer/public/java/AndroidManifest.xml @@ -16,7 +16,9 @@ From 2f5a83697169d5bcf30e3895466f540b44e06139 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 13:13:34 +0200 Subject: [PATCH 104/205] Conflict-resolve patches from Chromium 93.0.4557.4 to Chromium 93.0.4573.0. --- patches/chrome-VERSION.patch | 6 +++--- ...urces-settings-about_page-about_page.js.patch | 6 +++--- ...privacy_page-personalization_options.js.patch | 16 ++++++++-------- ...-views-profiles-avatar_toolbar_button.h.patch | 10 +++++----- ...r-core-browser-password_form_filling.cc.patch | 10 +++++----- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 9043b2ed2ea0..bc9b281881fd 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,12 +1,12 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 9841d1c3695c37516777dcd4ece9da3e53099c7c..c5cfdaaa37bdde933d93e031426a28b7344a3a94 100644 +index 367fc786f175eab1807eb5b02515128afce78e0a..c5cfdaaa37bdde933d93e031426a28b7344a3a94 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ MAJOR=93 -MINOR=0 --BUILD=4557 --PATCH=4 +-BUILD=4573 +-PATCH=0 +MINOR=1 +BUILD=30 +PATCH=30 diff --git a/patches/chrome-browser-resources-settings-about_page-about_page.js.patch b/patches/chrome-browser-resources-settings-about_page-about_page.js.patch index 047b1dede3c3..431f8087c7c5 100644 --- a/patches/chrome-browser-resources-settings-about_page-about_page.js.patch +++ b/patches/chrome-browser-resources-settings-about_page-about_page.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/about_page/about_page.js b/chrome/browser/resources/settings/about_page/about_page.js -index 62c28ed75219e05352d72c3ebc481af9c6236f09..c75792d4db3aefe129fcab2c48f0a936ca3ad8c8 100644 +index 14e8d1b3fc83229f54ee10d7bb15e2f278e94e69..23beadf6cf8cf751a487b308e1dcb599aeab4af5 100644 --- a/chrome/browser/resources/settings/about_page/about_page.js +++ b/chrome/browser/resources/settings/about_page/about_page.js -@@ -213,7 +213,14 @@ Polymer({ +@@ -229,7 +229,14 @@ export class SettingsAboutPageElement extends SettingsAboutPageElementBase { /** @private */ onRelaunchTap_() { @@ -14,6 +14,6 @@ index 62c28ed75219e05352d72c3ebc481af9c6236f09..c75792d4db3aefe129fcab2c48f0a936 + // this.lifetimeBrowserProxy_.relaunch(); + // - }, + } // diff --git a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch index b0d1840ba876..c9ef9bd888bb 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-personalization_options.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/privacy_page/personalization_options.js b/chrome/browser/resources/settings/privacy_page/personalization_options.js -index fd6a7b11cda563c1e462d6244cce2b4f01c2be77..de554fbd716054b5cf771034062f7d66173df7d6 100644 +index 5a8630b3a7c10fce3b0f69a74c54e1c2a8a79f12..d031c337bd1c58a9bf7e49f0735c14d3d88afe1c 100644 --- a/chrome/browser/resources/settings/privacy_page/personalization_options.js +++ b/chrome/browser/resources/settings/privacy_page/personalization_options.js -@@ -66,7 +66,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -69,7 +69,7 @@ export class SettingsPersonalizationOptionsElement extends /** @type {SyncStatus} */ syncStatus: Object, @@ -11,16 +11,16 @@ index fd6a7b11cda563c1e462d6244cce2b4f01c2be77..de554fbd716054b5cf771034062f7d66 // TODO(dbeam): make a virtual.* pref namespace and set/get this normally // (but handled differently in C++). /** @private {chrome.settingsPrivate.PrefObject} */ -@@ -125,7 +125,7 @@ export class SettingsPersonalizationOptionsElement extends - - this.browserProxy_ = PrivacyPageBrowserProxyImpl.getInstance(); +@@ -126,7 +126,7 @@ export class SettingsPersonalizationOptionsElement extends + ready() { + super.ready(); - // + // const setMetricsReportingPref = this.setMetricsReportingPref_.bind(this); this.addWebUIListener('metrics-reporting-change', setMetricsReportingPref); this.browserProxy_.getMetricsReporting().then(setMetricsReportingPref); -@@ -159,7 +159,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -160,7 +160,7 @@ export class SettingsPersonalizationOptionsElement extends this.shadowRoot.querySelector('#driveSuggestControl')); } @@ -29,7 +29,7 @@ index fd6a7b11cda563c1e462d6244cce2b4f01c2be77..de554fbd716054b5cf771034062f7d66 /** @private */ onMetricsReportingChange_() { const enabled = this.$.metricsReportingControl.checked; -@@ -209,6 +209,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -210,6 +210,7 @@ export class SettingsPersonalizationOptionsElement extends } // @@ -37,7 +37,7 @@ index fd6a7b11cda563c1e462d6244cce2b4f01c2be77..de554fbd716054b5cf771034062f7d66 /** * @return {boolean} * @private -@@ -258,6 +259,7 @@ export class SettingsPersonalizationOptionsElement extends +@@ -259,6 +260,7 @@ export class SettingsPersonalizationOptionsElement extends } this.showSignoutDialog_ = false; } diff --git a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch index dfbbac3b3303..8e43f76e7e16 100644 --- a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch +++ b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -index 4d5512e5710c6d23938897bb9e1ba8ee0364deb7..00742d568657f46def6ce1a9cd67768dab65d47e 100644 +index b067be7aa84a44add702d5551ea7b440d0186fdd..3e75b08a85d225560841446e589120d45160e8f0 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -@@ -78,6 +78,7 @@ class AvatarToolbarButton : public ToolbarButton, - // ToolbarButton: - void NotifyClick(const ui::Event& event) override; +@@ -75,6 +75,7 @@ class AvatarToolbarButton : public ToolbarButton, + static void SetIPHMinDelayAfterCreationForTesting(base::TimeDelta delay); -+BRAVE_AVATAR_BUTTON_H private: ++ BRAVE_AVATAR_BUTTON_H FRIEND_TEST_ALL_PREFIXES(AvatarToolbarButtonTest, HighlightMeetsMinimumContrast); + 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 6cae2a9ee1fb..ff3bf8bca36d 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,12 +1,12 @@ diff --git a/components/password_manager/core/browser/password_form_filling.cc b/components/password_manager/core/browser/password_form_filling.cc -index eaccd1083b14aacee7cf6f66b50b9d7b646f4ce1..8ed7db137754efb1e2fe6fcab9ea5d77e7594d2b 100644 +index da8f3ccd71b26011376453560be4fd8441f4d1b5..7f3083278b568dee758a9dc2b21aa18f7ea9036e 100644 --- a/components/password_manager/core/browser/password_form_filling.cc +++ b/components/password_manager/core/browser/password_form_filling.cc -@@ -237,6 +237,7 @@ LikelyFormFilling SendFillInformationToRenderer( +@@ -251,6 +251,7 @@ LikelyFormFilling SendFillInformationToRenderer( bool wait_for_username = wait_for_username_reason != WaitForUsernameReason::kDontWait; + wait_for_username = true; - - if (wait_for_username) { - metrics_recorder->SetManagerAction( + #else + bool wait_for_username = true; + #endif // !defined(OS_IOS) && !defined(ANDROID) From 20735c70753d5743360e0f254fe2ed220f4acca7 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 13:14:06 +0200 Subject: [PATCH 105/205] Adapt patches to chrome/{android => browser/ui/android/toolbar} move Chromium change: https://source.chromium.org/chromium/chromium/src/+/2c6cbee37831bffa83494c98eca09a8ca9def489 commit 2c6cbee37831bffa83494c98eca09a8ca9def489 Author: Jinsuk Kim Date: Tue Jun 29 14:39:50 2021 +0000 Modularize toolbar/ Moves the files in chrome/browser/toolbar (except some glue code) and related resources to chrome/browser/ui/android/toolbar. Bug: 1127732 --- ...lbar-java-res-layout-toolbar_phone.xml.patch} | 6 +++--- ...bar-java-res-layout-toolbar_tablet.xml.patch} | 6 +++--- ...-browser-toolbar-top-ToolbarPhone.java.patch} | 16 ++++++++-------- ...browser-toolbar-top-ToolbarTablet.java.patch} | 14 +++++++------- 4 files changed, 21 insertions(+), 21 deletions(-) rename patches/{chrome-android-java-res-layout-toolbar_phone.xml.patch => chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch} (81%) rename patches/{chrome-android-java-res-layout-toolbar_tablet.xml.patch => chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch} (77%) rename patches/{chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch => chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch} (64%) rename patches/{chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch => chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch} (58%) diff --git a/patches/chrome-android-java-res-layout-toolbar_phone.xml.patch b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch similarity index 81% rename from patches/chrome-android-java-res-layout-toolbar_phone.xml.patch rename to patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch index ab4c3255946a..94da365e133f 100644 --- a/patches/chrome-android-java-res-layout-toolbar_phone.xml.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch @@ -1,7 +1,7 @@ -diff --git a/chrome/android/java/res/layout/toolbar_phone.xml b/chrome/android/java/res/layout/toolbar_phone.xml +diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml index 8ba029c3f9a138a01351cc0232a77e97491792df..c7e118e478fac17a9a6778b5c7ab74a7a44d0484 100644 ---- a/chrome/android/java/res/layout/toolbar_phone.xml -+++ b/chrome/android/java/res/layout/toolbar_phone.xml +--- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml ++++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml @@ -13,6 +13,7 @@ android:layout_width="match_parent" android:layout_height="@dimen/toolbar_height_no_shadow" > diff --git a/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch similarity index 77% rename from patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch rename to patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch index 3de9d0c92337..3adf2b305826 100644 --- a/patches/chrome-android-java-res-layout-toolbar_tablet.xml.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch @@ -1,7 +1,7 @@ -diff --git a/chrome/android/java/res/layout/toolbar_tablet.xml b/chrome/android/java/res/layout/toolbar_tablet.xml +diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml index 4fa98ea6b6a6342fa6f9303419b5f551f750e7e3..3ebb7f849268724cb473890a0330a05c7bd5fb91 100644 ---- a/chrome/android/java/res/layout/toolbar_tablet.xml -+++ b/chrome/android/java/res/layout/toolbar_tablet.xml +--- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml ++++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml @@ -58,7 +58,7 @@ android:layout_height="@dimen/modern_toolbar_background_size" android:layout_weight="1" diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch similarity index 64% rename from patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch rename to patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index e3aeb07af324..2a1b66c93feb 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-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 11a5c4d25d8f9c73a56d10ed8950623aeeefdf8b..c4ecb2aaa978369351670706018fe9b3c5152953 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 -@@ -404,6 +404,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +index a41e088b95a2900daa15513f399dbd276ca084f9..7448905d9ee4fb47415d6267fc89d0a02367e0dc 100644 +--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java ++++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +@@ -406,6 +406,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC if (mCurrentLocationBarColor == color) return; mCurrentLocationBarColor = color; mLocationBarBackground.setColorFilter(color, PorterDuff.Mode.SRC_IN); @@ -10,7 +10,7 @@ index 11a5c4d25d8f9c73a56d10ed8950623aeeefdf8b..c4ecb2aaa978369351670706018fe9b3 } /** -@@ -521,6 +522,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -523,6 +524,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED); } } @@ -18,7 +18,7 @@ index 11a5c4d25d8f9c73a56d10ed8950623aeeefdf8b..c4ecb2aaa978369351670706018fe9b3 } @Override -@@ -690,6 +692,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -692,6 +694,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() { @@ -26,7 +26,7 @@ index 11a5c4d25d8f9c73a56d10ed8950623aeeefdf8b..c4ecb2aaa978369351670706018fe9b3 return Math.max(mToolbarSidePadding, mToolbarButtonsContainer.getMeasuredWidth()); } -@@ -2124,6 +2127,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC +@@ -2127,6 +2130,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC } else { populateUrlClearExpansionAnimatorSet(animators); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch similarity index 58% rename from patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch rename to patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch index b6d6d5aa44e2..9db5c78f858d 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch @@ -1,8 +1,8 @@ -diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -index fa1428c1b24a55d2340420ed51f88a11a75df1d9..669d040f17aa198dc772e730b307d454f899727d 100644 ---- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -@@ -60,7 +60,7 @@ import java.util.Collection; +diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +index e14c4ffdd2c20e6b3f673066b22512b18e65bb0c..06fa5bcf8ccbf0fe86f9572646693f7d2ff21cb7 100644 +--- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java ++++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +@@ -59,7 +59,7 @@ import java.util.Collection; * The Toolbar object for Tablet screens. */ @SuppressLint("Instantiatable") @@ -11,7 +11,7 @@ index fa1428c1b24a55d2340420ed51f88a11a75df1d9..669d040f17aa198dc772e730b307d454 implements OnClickListener, View.OnLongClickListener, TabCountObserver { /** Downloads page for offline access. */ public interface OfflineDownloader { -@@ -327,10 +327,12 @@ public class ToolbarTablet extends ToolbarLayout +@@ -326,10 +326,12 @@ public class ToolbarTablet extends ToolbarLayout mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab()); RecordUserAction.record("MobileToolbarDownloadPage"); } @@ -24,7 +24,7 @@ index fa1428c1b24a55d2340420ed51f88a11a75df1d9..669d040f17aa198dc772e730b307d454 String description = null; Context context = getContext(); Resources resources = context.getResources(); -@@ -396,6 +398,7 @@ public class ToolbarTablet extends ToolbarLayout +@@ -395,6 +397,7 @@ public class ToolbarTablet extends ToolbarLayout textBoxColor, PorterDuff.Mode.SRC_IN); mLocationBar.updateVisualsForState(); From c70f0848902483dd9201b661cb17d9faa12f15d5 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 13:14:25 +0200 Subject: [PATCH 106/205] Remove Brave-specific adjustment to check removed from test case. Chromium change: https://source.chromium.org/chromium/chromium/src/+/a56ecb8f054f9485c7340702a316647845d49346 commit a56ecb8f054f9485c7340702a316647845d49346 Author: Rushan Suleymanov Date: Fri Jul 2 13:26:52 2021 +0000 [Sync] Reupload local device info on incoming tombstone The reupload takes place at most once per session when the data type is started. This is needed to prevent uncontrolled reuploads which base on incoming updates. Fixed: 1225961 --- ...e_info-device_info_sync_bridge_unittest.cc.patch | 13 ------------- 1 file changed, 13 deletions(-) delete mode 100644 patches/components-sync_device_info-device_info_sync_bridge_unittest.cc.patch 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 deleted file mode 100644 index 1363f0a745b8..000000000000 --- a/patches/components-sync_device_info-device_info_sync_bridge_unittest.cc.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 95915dfbd3f3c1ffa354d8220f7075f4658bd177..5265d4cd04ec8f60b4cc69598ba1ed0e2f03e78a 100644 ---- a/components/sync_device_info/device_info_sync_bridge_unittest.cc -+++ b/components/sync_device_info/device_info_sync_bridge_unittest.cc -@@ -911,7 +911,7 @@ TEST_F(DeviceInfoSyncBridgeTest, ApplySyncChangesWithLocalGuid) { - auto error_on_delete = bridge()->ApplySyncChanges( - bridge()->CreateMetadataChangeList(), std::move(entity_change_list)); - EXPECT_FALSE(error_on_delete); -- EXPECT_EQ(1, change_count()); -+ EXPECT_EQ(2, change_count()); // Brave can delete other device in chain, delete record should be also processed - } - - TEST_F(DeviceInfoSyncBridgeTest, ApplyDeleteNonexistent) { From 0d95d59e37d43890c5f785b9e839a2002fd3495b Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 13:14:59 +0200 Subject: [PATCH 107/205] Remove includes and patches related to Blink's modules_idl_files.gni This file has been removed from upstream now along with the old WebIDL compiler GN rules, which haven't been used for a while in Brave anyway due to the switch to V8's new IDL interface implementation. Besides the .idl files referenced from the .gni files listed in the brave_idl_imports variable are still referenced from the other variable brave_static_idl_files_in_modules, so we can remove the patch for third_party/blink/renderer/modules/modules_idl_files.gni now, along with the definition of brave_idl_imports and the .gni files listed from there. Chromium change: https://source.chromium.org/chromium/chromium/src/+/cc09d02098c2a513e9e53861fe5bf82990dad29b commit cc09d02098c2a513e9e53861fe5bf82990dad29b Author: Yuki Shiino Date: Wed Jul 7 20:22:37 2021 +0000 Reland "bind-gen: Remove the old Web IDL compiler GN rules" This is a reland of 5a88d6a79aee536a09da0139631886318b7dec73 The original patch should have landed after https://crrev.com/c/3004452 , but actually landed before it by my misunderstanding. The change itself is correct, so there is no change since the original patch. Original change's description: > bind-gen: Remove the old Web IDL compiler GN rules > > Removes no longer used old Web IDL compiler GN rules. > > Bug: 839389 > Change-Id: I15955ab341c548592df10f385dbf5107b7f5e646 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3004463 > Commit-Queue: Yuki Shiino > Reviewed-by: Kentaro Hara > Cr-Commit-Position: refs/heads/master@{#898536} Bug: 839389 --- ...link-renderer-modules-modules_idl_files.gni.patch | 12 ------------ third_party/blink/renderer/includes.gni | 7 ------- third_party/blink/renderer/modules/brave/idls.gni | 8 -------- .../renderer/modules/global_privacy_control/idls.gni | 6 ------ 4 files changed, 33 deletions(-) delete mode 100644 patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch delete mode 100644 third_party/blink/renderer/modules/brave/idls.gni delete mode 100644 third_party/blink/renderer/modules/global_privacy_control/idls.gni 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 deleted file mode 100644 index d638958e1466..000000000000 --- a/patches/third_party-blink-renderer-modules-modules_idl_files.gni.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/third_party/blink/renderer/modules/modules_idl_files.gni b/third_party/blink/renderer/modules/modules_idl_files.gni -index 9061022c207c4f5f8fd1fb1e61a006072288f565..973920c5ed8e3f783b4d8ae140dec2dbb2b11fb1 100644 ---- a/third_party/blink/renderer/modules/modules_idl_files.gni -+++ b/third_party/blink/renderer/modules/modules_idl_files.gni -@@ -156,6 +156,7 @@ if (!is_android) { - "//third_party/blink/renderer/modules/serial/idls.gni", - ] - } -+_idl_imports += brave_idl_imports - - # Do not add IDL files directly to these lists. See _idl_imports above instead - # on how to add IDL files for a module. diff --git a/third_party/blink/renderer/includes.gni b/third_party/blink/renderer/includes.gni index 7533a1a4f066..dc7e0aacf097 100644 --- a/third_party/blink/renderer/includes.gni +++ b/third_party/blink/renderer/includes.gni @@ -15,13 +15,6 @@ brave_blink_sub_modules = [ "//brave/third_party/blink/renderer/modules/global_privacy_control", ] -# common includes which can help minimize patches for -# src/third_party/blink/renderer/modules/modules_idl_files.gni -brave_idl_imports = [ - "//brave/third_party/blink/renderer/modules/brave/idls.gni", - "//brave/third_party/blink/renderer/modules/global_privacy_control/idls.gni", -] - # common includes which can help minimize patches for # third_party/blink/renderer/bindings/idl_in_modules.gni brave_static_idl_files_in_modules = [ diff --git a/third_party/blink/renderer/modules/brave/idls.gni b/third_party/blink/renderer/modules/brave/idls.gni deleted file mode 100644 index ac09dd0dbb9e..000000000000 --- a/third_party/blink/renderer/modules/brave/idls.gni +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2020 The Brave Authors. All rights reserved. -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. - -modules_idl_files = [ "brave.idl" ] - -modules_dependency_idl_files = [ "navigator_brave.idl" ] diff --git a/third_party/blink/renderer/modules/global_privacy_control/idls.gni b/third_party/blink/renderer/modules/global_privacy_control/idls.gni deleted file mode 100644 index 259c13d0bda2..000000000000 --- a/third_party/blink/renderer/modules/global_privacy_control/idls.gni +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 2020 The Brave Authors. All rights reserved. -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this file, -# You can obtain one at http://mozilla.org/MPL/2.0/. - -modules_dependency_idl_files = [ "navigator_global_privacy_control.idl" ] From ae3a9f91bf37e3c44048fd9fdbcca0c72ab44e49 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 13:16:33 +0200 Subject: [PATCH 108/205] Updated strings for Chromium 93.0.4573.0. --- app/app_management_strings.grdp | 6 + app/brave_strings.grd | 2 +- app/generated_resources.grd | 178 +++++++++++------- app/generated_resources_override.grd | 9 +- app/global_media_controls_strings.grdp | 4 +- app/os_settings_search_tag_strings.grdp | 72 +++++++ app/os_settings_strings.grdp | 90 ++++++--- app/settings_strings.grdp | 36 +++- .../strings/android_chrome_strings.grd | 46 ++--- components/arc_strings.grdp | 14 +- components/components_strings_override.grd | 1 + components/new_or_sad_tab_strings.grdp | 45 ----- components/omnibox_strings.grdp | 157 ++++++++++++++- components/omnibox_strings_override.grdp | 13 ++ components/page_info_strings.grdp | 67 ++++++- components/page_info_strings_override.grdp | 56 ++++++ components/payments_strings.grdp | 18 +- components/payments_strings_override.grdp | 2 +- components/permissions_strings.grdp | 11 ++ .../security_interstitials_strings.grdp | 17 ++ 20 files changed, 642 insertions(+), 202 deletions(-) create mode 100644 components/page_info_strings_override.grdp diff --git a/app/app_management_strings.grdp b/app/app_management_strings.grdp index 2e9cebf8d48c..5cb7cab91822 100644 --- a/app/app_management_strings.grdp +++ b/app/app_management_strings.grdp @@ -58,4 +58,10 @@ Open in Brave browser + + $1Gmail is set to open in a new browser tab, supported links will also open in the browser. + + + Learn more. + diff --git a/app/brave_strings.grd b/app/brave_strings.grd index c2c2063cc061..d90d86980793 100644 --- a/app/brave_strings.grd +++ b/app/brave_strings.grd @@ -536,7 +536,7 @@ Brave is unable to recover your settings. - Brave recommends that you don't download or open this file. + Brave recommends that you don't download or open this file diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 45f8d83ae7b8..9d4798e51bd8 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -747,6 +747,9 @@ are declared in tools/grit/grit_rule.gni. Search image with Brave Lens + + Search part of the page with Brave Lens + &Go to $1http://www.google.com/ @@ -988,6 +991,9 @@ are declared in tools/grit/grit_rule.gni. Search Image with Brave Lens + + Search Part of the Page with Brave Lens + &Go to $1http://www.google.com/ @@ -1247,12 +1253,18 @@ are declared in tools/grit/grit_rule.gni. R&eopen closed tab - + R&eopen closed window - + Reopen closed group + + &Restore window + + + &Restore group + Name &window... @@ -1288,12 +1300,18 @@ are declared in tools/grit/grit_rule.gni. R&eopen Closed Tab - + R&eopen Closed Window - + Reopen Closed Group + + &Restore Window + + + &Restore Group + Name &Window... @@ -1583,6 +1601,9 @@ are declared in tools/grit/grit_rule.gni. Unknown server error. Please try again, or contact the server administrator. + + $1Storage limit reached. ($2Request ID 12345) + Shutdown @@ -1684,6 +1705,15 @@ are declared in tools/grit/grit_rule.gni. Removed + + Sending to $1Google Drive + + + Saved to $1Google Drive + + + Failed to save to $1Google Drive - $2Disk full + Failed - $1Disk full @@ -3270,6 +3300,16 @@ are declared in tools/grit/grit_rule.gni. Stop + + Switch to tab ($1meet.google.com) + + + Switch to capturing tab + + + Switch to captured tab + + @@ -3472,6 +3512,12 @@ are declared in tools/grit/grit_rule.gni. Background Page: $1http://www.google.com + + Back/Forward Cached Page: $1http://www.google.com + + + Private Back/Forward Cached Page: $1http://www.google.com + Plugin: $1Unknown Plugin @@ -3520,6 +3566,12 @@ are declared in tools/grit/grit_rule.gni. Private Subframe: $1https://youtube.com/ + + Back/Forward Cached Subframe: $1http://www.google.com + + + Private Back/Forward Cached Subframe: $1http://www.google.com + Portal: $1https://youtube.com/ @@ -4740,10 +4792,10 @@ Keep your key file in a safe place. You will need it to create new versions of y Customize and control $1GMail - Enable window controls overlay + Hide title bar - Disable window controls overlay + Show title bar @@ -4838,9 +4890,6 @@ Keep your key file in a safe place. You will need it to create new versions of y Password saved - - Password saved on this device - Use suggested password @@ -5565,6 +5614,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Your carts + + In your shopping cart + carts @@ -5750,6 +5802,17 @@ Keep your key file in a safe place. You will need it to create new versions of y Add current tab + + + Mark as unread + + + Mark as read + + + Delete + + Click to go back, hold to see history @@ -6861,6 +6924,9 @@ Keep your key file in a safe place. You will need it to create new versions of y + + To search your tabs, click here + Search Tabs @@ -7462,6 +7528,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Share this page + + Screenshot + Copy link @@ -8715,6 +8784,9 @@ Please help our engineers fix this problem. Tell us what happened right before y =1 {Show} other {Show all}} + + Snooze + @@ -8727,6 +8799,9 @@ Please help our engineers fix this problem. Tell us what happened right before y =1 {Show} other {Show All}} + + Snooze + @@ -9790,43 +9865,6 @@ Please help our engineers fix this problem. Tell us what happened right before y - - - Share this tab - - - $1https://google.com is asking for permission to capture the contents of this tab. - - - Share audio - - - Share - - - - - - {NUM_PRINTER, plural, - =1 {New printer on your network} - other {New printers on your network}} - - - {NUM_PRINTER, plural, - =1 {Add the printer to Google Cloud Print so you can print from anywhere.} - other {Add # printers to Google Cloud Print so you can print from anywhere.}} - - - Google Cloud Print - - - Add to Cloud Print - - - Don't show this again - - - Documents are <a is="action-link" href="https://support.google.com/cloudprint/answer/2541843" target="_blank" rel="noopener noreferrer">sent to Brave</a> to prepare them for printing. View, edit and manage your printers and printer history on the <a is="action-link" href="https://www.google.com/cloudprint#jobs" target="_blank" rel="noopener noreferrer">Google Cloud Print dashboard</a>. @@ -10184,9 +10222,6 @@ Please help our engineers fix this problem. Tell us what happened right before y "$1Brave Extension Name" wants to connect - - $1device name ($2device id) - Compatible devices @@ -10199,14 +10234,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Unknown device [$1123:$2123] - - - $1www.google.com wants to scan for nearby Bluetooth devices. The following devices have been found: - - - Unknown or unsupported device ($1A1:B2:C3:D4:E5:F6) - - Unknown product $1123 from $2Brave @@ -11001,6 +11028,9 @@ Please help our engineers fix this problem. Tell us what happened right before y Learn more + + Discard file + @@ -11051,6 +11081,33 @@ Please help our engineers fix this problem. Tell us what happened right before y Open now + + + Box + + + Google Drive + + + + + Sign into $1Google Drive to complete download + + + Your organization requires eligible downloads to be saved to $1Google Drive. Upon signing in, an unique authentication token will be stored and used for all future eligible downloads. + + + Cancel download + + + Sign in + + + + + Link $1Google Drive account for Downloads + + Uninstall "$1Gmail Checker"? @@ -11187,13 +11244,6 @@ Please help our engineers fix this problem. Tell us what happened right before y Enables a browser-level side panel for a useful and persistent way to access your Reading List and Bookmarks. - - - Reading List - - - Right click on a tab or click the Bookmark icon to add tabs to a reading list. Access from the Bookmarks bar. - Tab Scrolling diff --git a/app/generated_resources_override.grd b/app/generated_resources_override.grd index a9b9b7ded4ee..d74b03843e45 100644 --- a/app/generated_resources_override.grd +++ b/app/generated_resources_override.grd @@ -385,9 +385,15 @@ are declared in tools/grit/grit_rule.gni. Private Tab: $1Brave + + Private Back/Forward Cached Page: $1http://www.google.com + Private Subframe: $1https://youtube.com/ + + Private Back/Forward Cached Subframe: $1http://www.google.com + Private Portal: $1https://youtube.com/ @@ -851,9 +857,6 @@ are declared in tools/grit/grit_rule.gni. - - - diff --git a/app/global_media_controls_strings.grdp b/app/global_media_controls_strings.grdp index 42bfb431488c..890291739cf3 100644 --- a/app/global_media_controls_strings.grdp +++ b/app/global_media_controls_strings.grdp @@ -11,8 +11,8 @@ Dismiss - - Devices + + Select a device Stop casting diff --git a/app/os_settings_search_tag_strings.grdp b/app/os_settings_search_tag_strings.grdp index 998e6641cf44..7d5d72cd3d4b 100644 --- a/app/os_settings_search_tag_strings.grdp +++ b/app/os_settings_search_tag_strings.grdp @@ -712,6 +712,78 @@ Art gallery album + + Dark theme + + + Dark mode + + + Light theme + + + Light mode + + + Turn dark theme on + + + Enable dark theme + + + Turn dark mode on + + + Enable dark mode + + + Turn light theme off + + + Disable light theme + + + Turn dark theme off + + + Disable dark theme + + + Turn dark mode off + + + Disable dark mode + + + Turn light theme on + + + Enable light theme + + + Accent color + + + Color mode + + + Color theme + + + Dark theme schedule + + + Dark mode schedule + + + Automatic dark mode + + + Automatic light mode + + + Automatic dark theme + diff --git a/app/os_settings_strings.grdp b/app/os_settings_strings.grdp index 36cec614bd49..c7a43ddb6e4e 100644 --- a/app/os_settings_strings.grdp +++ b/app/os_settings_strings.grdp @@ -780,6 +780,24 @@ Neutral + + Dark mode will turn on automatically at sunset + + + Dark mode will turn off automatically at sunrise + + + Custom + + + Schedule + + + Never + + + Sunset to sunrise + @@ -1119,7 +1137,7 @@ and Ctrl+Alt+Brightness down to zoom out. Switch Access settings - Open setup guide + Rerun setup guide Switch action assignment @@ -1178,24 +1196,37 @@ and Ctrl+Alt+Brightness down to zoom out. Assign switch: $1Select - - Press a switch to assign “$1Select”. You can assign multiple switches to this action. + + Press a switch to assign “$1Select” +You can assign multiple switches to this action - - Press a new switch to start assignment. -Press an assigned switch to remove assignment. + + Press a switch or key to assign "$1Select" - - Press “$1backspace” again to confirm assignment and exit. + + Press a new switch to start assignment +Press an assigned switch to remove assignment - - Press “$1backspace” again to remove assignment and exit. + + Press “$1backspace” again to confirm assignment and $2exit - - Keys do not match. Press any key to exit. + + exit - - Can’t remove the only switch assigned to Select. Press any key to exit. + + continue + + + try again + + + Press “$1backspace” again to remove assignment and $2exit + + + Keys do not match. Press any key to $1exit. + + + Can’t remove the only switch assigned to Select. Press any key to $1exit. $1backspace ($2USB) @@ -1218,18 +1249,27 @@ Press an assigned switch to remove assignment. $1backspace, $2enter, $3escape, and $42 more switches - - '$1enter' is already assigned to the '$2Select' action. Press any key to exit. + + '$1enter' is already assigned to the '$2Select' action. Press any key to $3exit. - - Unrecognized key. Press any key to exit. + + Unrecognized key. Press any key to $1exit. No switch has been assigned yet + + No switch or key has been assigned yet + Exit + + Clear all switch assignments + + + Re-running the setup guide will clear your assigned switches. Do you want to continue? + Switch Access setup guide @@ -1311,16 +1351,16 @@ Press an assigned switch to remove assignment. Done - + Assigned - + Add assignment - + Remove assignment - + Error @@ -3390,12 +3430,6 @@ Press an assigned switch to remove assignment. Sunset to sunrise - - Start time - - - End time - Make it easier to look at your screen or read in dim light diff --git a/app/settings_strings.grdp b/app/settings_strings.grdp index 735d9e08a608..213cd53c2662 100644 --- a/app/settings_strings.grdp +++ b/app/settings_strings.grdp @@ -229,8 +229,11 @@ Edit + + End time + - Not valid + Not valid Not a valid web address @@ -239,11 +242,14 @@ Origin must be secure - Retry + Retry Slider: $1Slowest to $2Fastest + + Start time + @@ -959,10 +965,10 @@ Signs you out of most sites. You'll stay signed in to your Brave sync chain so your synced data can be cleared. - Clears history in the search box + Clears history, including in the search box - Clears history and autocompletions in the search box. Your Brave sync chain may have other forms of browsing history at <a target='_blank' href='$1'>myactivity.google.com</a></a>. + Clears history in the search box. Your Brave sync chain may have other forms of browsing history at <a target='_blank' href='$1'>myactivity.google.com</a></a>. Clears history from all synced devices @@ -970,8 +976,17 @@ Clears history from all signed-in devices. Your Brave sync chain may have other forms of browsing history at <a target='_blank' href='$1'>myactivity.google.com</a></a>. - - To clear <a target="_blank" rel="noopener noreferrer" href="$1">search</a> or other forms of history, visit <a target="_blank" rel="noopener noreferrer" href="$2">My Brave sync chain</a> + + <a target="_blank" rel="noopener noreferrer" href="$1">Search history</a> and <a target="_blank" rel="noopener noreferrer" href="$2">other forms of activity</a> may be saved in your Brave sync chain when you're signed in. You can delete them at any time. + + + <a target="_blank" rel="noopener noreferrer" href="$1">Other forms of activity</a> may be saved in your Brave sync chain when you're signed in. You can delete them at any time. + + + Your search engine is $1Bing. See their instructions for deleting your search history, if applicable. + + + See your search engine's instructions for deleting your search history, if applicable Download history @@ -1593,6 +1608,12 @@ Safeguards the personal Brave sync chains of anyone at risk of targeted attacks + + Always use secure connections + + + Upgrade all navigations to HTTPS and warn you before loading sites that don't support it + Manage certificates @@ -1849,6 +1870,9 @@ Sites listed below follow a custom setting instead of the default + + Sites listed below follow a custom setting + Sites usually show ads so they can provide content or services for free. But, some sites are known to show intrusive or misleading ads. diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 343de760e234..2c349106d777 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -250,6 +250,12 @@ CHAR_LIMIT guidelines: Announcements + + Web apps + + + Web apps (quiet) + Permission requests @@ -900,7 +906,7 @@ Your Brave account may have other forms of browsing history like searches and ac Signs you out of most sites. You won't be signed out of your Brave sync chain. - Clears history and autocompletions in the address bar. + Clears history, including in the search box. Clears history from all synced devices. @@ -912,13 +918,13 @@ Your Brave account may have other forms of browsing history like searches and ac Clears history from all synced devices. Your Brave sync chain may have other forms of browsing history at <link>myactivity.google.com</link>. - To clear <link1>search</link1> or other forms of history, visit <link2>My Brave Activity</link2> + <link1>Search history</link1> and <link2>other forms of activity</link2> may be saved in your Brave sync chain when you’re signed in. You can delete them at any time. - To clear other forms of history, visit <link1>My Brave Activity</link1> + <link1>Other forms of activity</link1> may be saved in your Brave sync chain when you’re signed in. You can delete them at any time. - Your search engine is %1$sBing. If applicable, see their instructions to delete your search history. + Your search engine is %1$sBing. See their instructions for deleting your search history, if applicable. See your search engine’s instructions for deleting your search history, if applicable @@ -3308,6 +3314,12 @@ To change this setting, <resetlink>reset sync

Show simplified view + + View simplified page? + + + View + Bookmarks and web history @@ -3738,12 +3750,6 @@ To change this setting, <resetlink>reset sync

Got it - - Web apps - - - Web apps (quiet) - %1$sYouTube also has data in Brave @@ -4166,15 +4172,9 @@ To change this setting, <resetlink>reset sync

%1$spayment.com verify it's you for %2$sshopping.com - + Submit %1$s123 to %2$sexample.com? - - Submit %1$s123 to %2$spayment.com? - - - %1$sshopping.com %2$sZoe's Macbook - @@ -4451,10 +4451,9 @@ To change this setting, <resetlink>reset sync

- - Stylize highlight + + Create card - Copied @@ -4566,6 +4565,11 @@ To change this setting, <resetlink>reset sync

+ + + Surveys + + Paint Preview captured successfully. @@ -4713,7 +4717,7 @@ To change this setting, <resetlink>reset sync

%1$sairbnb.com account… - Sign up + Continue as %1$sAlbus (or Albus Dumbledore) List of accounts to be selected. diff --git a/components/arc_strings.grdp b/components/arc_strings.grdp index 5c5d4991bb94..ccc99ca70a32 100644 --- a/components/arc_strings.grdp +++ b/components/arc_strings.grdp @@ -3,19 +3,19 @@ - This app only supports "Phone" size. + This app supports only this size. - Enable Resizing? + Allow resizing? - This app is designed for mobile devices. It is running in a compatibility mode. Allow resizing might encounter issues including app restarting. + This app is designed for mobile and may not resize well. The app may experience issues or restart. - Enable + Allow - Don't ask me again for this app + Don’t ask again for this app Phone @@ -36,7 +36,7 @@ This app is designed for mobile - $1Gmail app may not resize well. Use preset window sizes to prevent the app from misbehaving. + $1Gmail app may not resize well. Use preset window sizes to prevent the app from experiencing issues. This app can't be resized. @@ -48,7 +48,7 @@ Settings - You can now drag and resize this app + You can now resize the app diff --git a/components/components_strings_override.grd b/components/components_strings_override.grd index 2f456c5147c2..8910da69d98a 100644 --- a/components/components_strings_override.grd +++ b/components/components_strings_override.grd @@ -88,6 +88,7 @@ + diff --git a/components/new_or_sad_tab_strings.grdp b/components/new_or_sad_tab_strings.grdp index 451e5c5eeca3..224b119c09e7 100644 --- a/components/new_or_sad_tab_strings.grdp +++ b/components/new_or_sad_tab_strings.grdp @@ -176,49 +176,4 @@ When on, sites can't use cookies that track you across the web. Features on some sites may break. - - - - - You’re browsing as a Guest - - - Hi %sMariam, - <br> - You’re browsing as a Guest - - - You won't see any Brave profile's info in Guest mode. You can <a id="change-sign-in-status">sign in</a> to access your Brave account info like passwords and payment methods. - - - Close all Guest windows so your browsing activity is deleted from this device. - - - <b> - Activity that won't stay on this device: - </b> - <ul> - <li>Pages you view in this window - <li>Cookies and site data - </ul> - - - <b> - Activity that won't stay on this device: - </b> - <ul> - <li>Pages you view in this window - <li>Cookies and site data - <li>Account information (<a id="change-sign-in-status">sign out</a>) - </ul> - - - <b> - Your activity that stays on this device: - </b> - <ul> - <li>Any files you download in this window - </ul> - - diff --git a/components/omnibox_strings.grdp b/components/omnibox_strings.grdp index c94867829d11..079a6e6bb5f2 100644 --- a/components/omnibox_strings.grdp +++ b/components/omnibox_strings.grdp @@ -251,17 +251,160 @@ Manage site settings button, press Enter to manage permissions and data stored across sites in Brave settings - - Create Brave Doc + + Create doc - + Create a new Brave Doc quickly - - $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to Create Brave Doc + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to create a new Brave Doc quickly - - Create Brave Doc button, press Enter to Create a new Brave Doc quickly + + Create doc button, press Enter to create a new Brave Doc quickly + + + + Create sheet + + + Create a new Brave Sheet quickly + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to create a new Brave Sheet quickly + + + Create sheet button, press Enter to create a new Brave Sheet quickly + + + + Create presentation + + + Create a new Brave presentation in Slides quickly + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to create a new Brave presentation in Slides quickly + + + Create presentation button, press Enter to create a new Brave presentation in Slides quickly + + + + Create event + + + Create a new event in Brave Calendar quickly + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to create a new event in Brave Calendar quickly + + + Create event button, press Enter to create a new event in Brave Calendar quickly + + + + Create site + + + Create a new site in Brave Sites quickly + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to create a new site in Brave Sites quickly + + + Create site button, press Enter to create a new site in Brave Sites quickly + + + + Create note + + + Create a new note in Brave Keep quickly + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to create a new note in Brave Keep quickly + + + Create note button, press Enter to create a new note in Brave Keep quickly + + + + Create form + + + Create a new form in Brave Forms quickly + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to create a new form in Brave Forms quickly + + + Create form button, press Enter to create a new form in Brave Forms quickly + + + + See Brave tips + + + Learn about Brave features + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to learn about Brave features + + + See Brave tips button, press Enter to learn about Brave features + + + + Manage Brave sync chain + + + Manage your info, privacy, and security in your Brave sync chain + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to manage your info, privacy, and security in your Brave sync chain + + + Manage Brave sync chain, press Enter to manage your info, privacy, and security in your Brave sync chain + + + + Change Brave password + + + Change your Brave sync chain password + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to change your Brave sync chain password + + + Change Brave password button, press Enter to change your Brave sync chain password + + + + Close private windows + + + Close all private windows for the current private profile + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to close all private windows for the current private profile + + + Close private windows button, press Enter to close all private windows for the current private profile + + + + Play Brave Dino + + + Play the Brave Dino game + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to play the Brave Dino game + + + Play Brave Dino game button, press Enter to play the Brave Dino game diff --git a/components/omnibox_strings_override.grdp b/components/omnibox_strings_override.grdp index c656d3f64657..342550097c2f 100644 --- a/components/omnibox_strings_override.grdp +++ b/components/omnibox_strings_override.grdp @@ -26,4 +26,17 @@ Open Private Window button, press Enter to open a new Private window to browse privately + + Close private windows + + + Close all private windows for the current private profile + + + $1The Brave Projects http://www.chromium.org bookmark, press Tab then Enter to close all private windows for the current private profile + + + Close private windows button, press Enter to close all private windows for the current private profile + + diff --git a/components/page_info_strings.grdp b/components/page_info_strings.grdp index 83b86bd0b03b..2152cf60ca32 100644 --- a/components/page_info_strings.grdp +++ b/components/page_info_strings.grdp @@ -405,9 +405,11 @@ Block + Mute + Ask @@ -418,18 +420,20 @@ Allow (default) - - Automatic (default) - Block (default) - - Mute (default) - Ask (default) + + + Automatic (default) + + + Mute (default) + + Detect (default) @@ -463,6 +467,35 @@ Block on this site + + Allowed + + + Allowed until you close this tab + + + Allowed until you close tabs for this site + + + Not allowed + + + Not allowed in Private + + + Not allowed for non-secure sites + + + Muted + + + + Allowed (default) + + + Not allowed (default) + + Select permission for $1Location @@ -504,7 +537,7 @@ Site settings - Open site settings + Go to site settings @@ -532,6 +565,12 @@ Site shows intrusive or misleading ads + + Managed by your organisation + + + Managed by an extension + @@ -686,15 +725,27 @@ - + + Show connection details + + Security + + Show permission details + Manage + + Go to permission settings + Remember this setting + + {NUM_PERMISSIONS, plural, =1 {Reset permission} other {Reset permissions}} + diff --git a/components/page_info_strings_override.grdp b/components/page_info_strings_override.grdp new file mode 100644 index 000000000000..88c9cda831a2 --- /dev/null +++ b/components/page_info_strings_override.grdp @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Not allowed in Private + + + + + + + + + + + + + + + + diff --git a/components/payments_strings.grdp b/components/payments_strings.grdp index aa1eaf2f3f92..6d8e60bf08cc 100644 --- a/components/payments_strings.grdp +++ b/components/payments_strings.grdp @@ -629,7 +629,7 @@ Verify your purchase - + You can use your device to quickly verify it's you the next time you make a purchase with this payment method. @@ -666,10 +666,10 @@ Verify - + Check out faster next time - + Sign-in data will be stored on this device after you exit Private mode. @@ -677,22 +677,22 @@ - + Secure payment credential enrollment sheet - + Secure payment credential enrollment sheet is opened - + Secure payment credential enrollment sheet is closed - + Secure payment credential authentication sheet - + Secure payment credential authentication sheet is opened - + Secure payment credential authentication sheet is closed diff --git a/components/payments_strings_override.grdp b/components/payments_strings_override.grdp index 52bf0375f655..a8c1c6739300 100644 --- a/components/payments_strings_override.grdp +++ b/components/payments_strings_override.grdp @@ -36,7 +36,7 @@ - + Sign-in data will be stored on this device after you exit Private mode. diff --git a/components/permissions_strings.grdp b/components/permissions_strings.grdp index a51cd6c060f5..a6f746f74a33 100644 --- a/components/permissions_strings.grdp +++ b/components/permissions_strings.grdp @@ -159,8 +159,19 @@ This will otherwise be blocked by your privacy settings. This will allow the con Scanning for Bluetooth devices... + + $1device name ($2device id) + + + + $1www.google.com wants to scan for nearby Bluetooth devices. The following devices have been found: + + + Unknown or unsupported device ($1A1:B2:C3:D4:E5:F6) + + No nearby devices found. diff --git a/components/security_interstitials_strings.grdp b/components/security_interstitials_strings.grdp index ed492f47f1f9..7710e73a8aa0 100644 --- a/components/security_interstitials_strings.grdp +++ b/components/security_interstitials_strings.grdp @@ -528,4 +528,21 @@ Send anyway + + + Site is not secure + + + The connection to $1example.com is not secure + + + You are seeing this warning because this site does not support HTTPS. + + + Go back + + + Continue to site + + From a41edb9b2fecb6ad79cca314968753c433ca32ec Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 13:42:36 +0200 Subject: [PATCH 109/205] Adapt GN dependency on //components/safe_browsing/core:features This target has been removed upstream and merged into the pre-existing one at //components/safe_browsing/core/common, so we'd need to adapt and depend now on this other target. Chromium change: https://source.chromium.org/chromium/chromium/src/+/6292006aa24ad076f9e796e34627abc02ba56349 commit 6292006aa24ad076f9e796e34627abc02ba56349 Author: Colin Blundell Date: Wed Jun 30 09:22:58 2021 +0000 [//components/safe_browsing] Move features* into core/common This code is cross-process code used on all platforms, and so it belongs in //components/safe_browsing/core/common. As part of this change, //components/safe_browsing/core/common:unit_tests is changed to run on iOS (this required no source code changes). Bug: 1216341 --- app/DEPS | 2 +- chromium_src/chrome/browser/DEPS | 2 +- .../download_protection/check_client_download_request_base.cc | 2 +- .../check_client_download_request_base_browsertest.cc | 2 +- test/BUILD.gn | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/DEPS b/app/DEPS index b0fd4d2e75bb..44f89d42b90e 100644 --- a/app/DEPS +++ b/app/DEPS @@ -20,7 +20,7 @@ include_rules = [ "+components/offline_pages/core/offline_page_feature.h", "+components/omnibox/common", "+components/password_manager/core/common", - "+components/safe_browsing/core/features.h", + "+components/safe_browsing/core/common/features.h", "+components/security_state/core/features.h", "+components/signin/public/base", "+components/sync/base/sync_base_switches.h", diff --git a/chromium_src/chrome/browser/DEPS b/chromium_src/chrome/browser/DEPS index 3349b5c37cc1..00280eaac751 100644 --- a/chromium_src/chrome/browser/DEPS +++ b/chromium_src/chrome/browser/DEPS @@ -113,7 +113,7 @@ include_rules = [ "+components/policy/core/browser", "+components/policy/core/common", "+components/prefs", - "+components/safe_browsing/core/proto/csd.pb.h", + "+components/safe_browsing/core/common/proto/csd.pb.h", "+components/search", "+components/signin/public/identity_manager", "+components/spellcheck/browser", diff --git a/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc b/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc index aebe9822ee54..269ffa9e1e58 100644 --- a/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc +++ b/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "components/safe_browsing/core/proto/csd.pb.h" +#include "components/safe_browsing/core/common/proto/csd.pb.h" #define BRAVE_ON_REQUEST_BUILT_FILTER \ BraveFilterRequest(client_download_request_.get()); diff --git a/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base_browsertest.cc b/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base_browsertest.cc index 022dddbae2bf..3b9ad61cab5a 100644 --- a/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base_browsertest.cc +++ b/chromium_src/chrome/browser/safe_browsing/download_protection/check_client_download_request_base_browsertest.cc @@ -14,7 +14,7 @@ #include "components/network_session_configurator/common/network_switches.h" #include "components/prefs/pref_service.h" #include "components/safe_browsing/content/browser/web_ui/safe_browsing_ui.h" -#include "components/safe_browsing/core/proto/csd.pb.h" +#include "components/safe_browsing/core/common/proto/csd.pb.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/download_manager.h" #include "content/public/test/browser_test.h" diff --git a/test/BUILD.gn b/test/BUILD.gn index 1a7eca3b778b..c271027c2302 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -905,7 +905,7 @@ if (!is_android) { "//components/prefs", "//components/renderer_context_menu", "//components/safe_browsing/content/browser/web_ui", - "//components/safe_browsing/core:features", + "//components/safe_browsing/core/common", "//components/spellcheck/browser", "//extensions/browser:test_support", "//extensions/common:common_constants", From 11810851eb97870b4c826c9858667c34d00f8439 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 13:50:35 +0200 Subject: [PATCH 110/205] Adapt GN dependencies on modules from //chrome/browser/search The //chrome/browser/search/drive and chrome/browser/search/task_module directories have been moved to //chrome/browser/new_tab_page/modules upstream, so we need to adapt to that. Chromium change: https://source.chromium.org/chromium/chromium/src/+/83b26a03aaacad7853096fb3257d3390f5e0c454 commit 83b26a03aaacad7853096fb3257d3390f5e0c454 Author: Tibor Goldschwendt Date: Fri Jul 9 23:13:18 2021 +0000 [ntp] Move 1P services to //chrome/browser/new_tab_page Before the deprecation of the local NTP, Instant NTPs and the 1P WebUI shared functionality implemented by services in //chrome/browser/search. Since, those NTPs have distinct functionality and sharing of services is no longer necessary. However, the code is still entangled; and NTPs instantiate services they don't need. We regard this as technical debt and are in the process of removing it. To aide this process this CL moves services only required and depended on by the 1P WebUI NTP from //chrome/browser/search to //chrome/browser/new_tab_page. After this CL, some 1P services, such as for backgrounds or promos, will still reside in //chrome/browser/search. These services are not technically used by Instant NTPs anymore but are still entangled with Instant NTP code. We will detangle and move those services in follow-up CLs. Change-Id: Ie66ea17eca89a5556785e1398510e6e0acc6a65c Bug: 1084363 --- browser/ui/sidebar/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/ui/sidebar/BUILD.gn b/browser/ui/sidebar/BUILD.gn index 69a59ec08c32..40fc8cb2ec54 100644 --- a/browser/ui/sidebar/BUILD.gn +++ b/browser/ui/sidebar/BUILD.gn @@ -49,9 +49,9 @@ source_set("sidebar") { # see check_includes comment above deps += [ "//chrome/browser/cart:mojo_bindings", + "//chrome/browser/new_tab_page/modules/drive:mojo_bindings", + "//chrome/browser/new_tab_page/modules/task_module:mojo_bindings", "//chrome/browser/promo_browser_command:mojo_bindings", - "//chrome/browser/search/drive:mojo_bindings", - "//chrome/browser/search/task_module:mojo_bindings", "//chrome/browser/ui/webui/new_tab_page:mojo_bindings", "//chrome/browser/ui/webui/realbox:mojo_bindings", ] From 2fca5a953875afb9a921600b55b71898506393c5 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 15:53:47 +0200 Subject: [PATCH 111/205] IWYU: base/stl_util.h Required for base::OptionalOrNullptr(). --- .../content_settings/core/common/cookie_settings_base.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc index f27d438d1f12..36b2032b7f62 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc @@ -7,6 +7,7 @@ #include "base/feature_list.h" #include "base/no_destructor.h" +#include "base/stl_util.h" #include "components/content_settings/core/common/content_settings.h" #include "components/content_settings/core/common/content_settings_pattern.h" #include "components/content_settings/core/common/features.h" From 3cef500d5416785e67c59ce6e68d38545dfe5b29 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 16:02:18 +0200 Subject: [PATCH 112/205] IWYU: services/network/public/cpp/resource_request.h Required for network::ResourceRequest. --- browser/net/url_context.cc | 1 + components/api_request_helper/api_request_helper.cc | 1 + components/binance/browser/binance_service.cc | 1 + .../brave_federated_learning/brave_operational_patterns.cc | 1 + components/brave_rewards/browser/rewards_service_impl.cc | 1 + components/brave_search/browser/brave_search_fallback_host.cc | 1 + components/crypto_dot_com/browser/crypto_dot_com_service.cc | 1 + components/ftx/browser/ftx_service.cc | 1 + components/gemini/browser/gemini_service.cc | 1 + components/ipfs/ipfs_network_utils.h | 1 + components/p3a/brave_p3a_uploader.cc | 1 + .../webcompat_reporter/browser/webcompat_report_uploader.cc | 1 + 12 files changed, 12 insertions(+) diff --git a/browser/net/url_context.cc b/browser/net/url_context.cc index dadf75def4bc..0767ec2f891c 100644 --- a/browser/net/url_context.cc +++ b/browser/net/url_context.cc @@ -17,6 +17,7 @@ #include "chrome/browser/profiles/profile.h" #include "content/public/browser/browser_thread.h" #include "net/base/isolation_info.h" +#include "services/network/public/cpp/resource_request.h" #if BUILDFLAG(ENABLE_IPFS) #include "brave/components/ipfs/ipfs_constants.h" diff --git a/components/api_request_helper/api_request_helper.cc b/components/api_request_helper/api_request_helper.cc index b850490b3412..2d7a2d8b418f 100644 --- a/components/api_request_helper/api_request_helper.cc +++ b/components/api_request_helper/api_request_helper.cc @@ -8,6 +8,7 @@ #include #include "net/base/load_flags.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" diff --git a/components/binance/browser/binance_service.cc b/components/binance/browser/binance_service.cc index d70a01383a10..55294bdc098c 100644 --- a/components/binance/browser/binance_service.cc +++ b/components/binance/browser/binance_service.cc @@ -33,6 +33,7 @@ #include "content/public/browser/storage_partition.h" #include "net/base/load_flags.h" #include "net/base/url_util.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" #include "services/network/public/mojom/fetch_api.mojom-shared.h" diff --git a/components/brave_federated_learning/brave_operational_patterns.cc b/components/brave_federated_learning/brave_operational_patterns.cc index 471eeb93cbbb..52e81b319d74 100644 --- a/components/brave_federated_learning/brave_operational_patterns.cc +++ b/components/brave_federated_learning/brave_operational_patterns.cc @@ -17,6 +17,7 @@ #include "brave/components/brave_stats/browser/brave_stats_updater_util.h" #include "components/prefs/pref_registry_simple.h" #include "components/prefs/pref_service.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" #include "url/gurl.h" diff --git a/components/brave_rewards/browser/rewards_service_impl.cc b/components/brave_rewards/browser/rewards_service_impl.cc index 05f5281861b8..9f418bfb5c52 100644 --- a/components/brave_rewards/browser/rewards_service_impl.cc +++ b/components/brave_rewards/browser/rewards_service_impl.cc @@ -76,6 +76,7 @@ #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/base/url_util.h" #include "net/http/http_status_code.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" #include "ui/base/resource/resource_bundle.h" diff --git a/components/brave_search/browser/brave_search_fallback_host.cc b/components/brave_search/browser/brave_search_fallback_host.cc index 16dc60a3f9d8..3a85b104e46f 100644 --- a/components/brave_search/browser/brave_search_fallback_host.cc +++ b/components/brave_search/browser/brave_search_fallback_host.cc @@ -9,6 +9,7 @@ #include "net/base/load_flags.h" #include "net/base/url_util.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" diff --git a/components/crypto_dot_com/browser/crypto_dot_com_service.cc b/components/crypto_dot_com/browser/crypto_dot_com_service.cc index 3c593cf32a39..d080193e25a3 100644 --- a/components/crypto_dot_com/browser/crypto_dot_com_service.cc +++ b/components/crypto_dot_com/browser/crypto_dot_com_service.cc @@ -25,6 +25,7 @@ #include "content/public/browser/storage_partition.h" #include "net/base/load_flags.h" #include "net/base/url_util.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" #include "services/network/public/mojom/fetch_api.mojom-shared.h" diff --git a/components/ftx/browser/ftx_service.cc b/components/ftx/browser/ftx_service.cc index f4db20fa3f31..d8e4f3123a1f 100644 --- a/components/ftx/browser/ftx_service.cc +++ b/components/ftx/browser/ftx_service.cc @@ -25,6 +25,7 @@ #include "net/base/escape.h" #include "net/base/load_flags.h" #include "net/base/url_util.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" #include "services/network/public/mojom/fetch_api.mojom-shared.h" diff --git a/components/gemini/browser/gemini_service.cc b/components/gemini/browser/gemini_service.cc index 85934c209e09..0e00dafb0d19 100644 --- a/components/gemini/browser/gemini_service.cc +++ b/components/gemini/browser/gemini_service.cc @@ -32,6 +32,7 @@ #include "content/public/browser/storage_partition.h" #include "net/base/load_flags.h" #include "net/base/url_util.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" #include "services/network/public/mojom/fetch_api.mojom-shared.h" diff --git a/components/ipfs/ipfs_network_utils.h b/components/ipfs/ipfs_network_utils.h index 1c9077381d6c..b74127ee32ba 100644 --- a/components/ipfs/ipfs_network_utils.h +++ b/components/ipfs/ipfs_network_utils.h @@ -13,6 +13,7 @@ #include "base/files/file_enumerator.h" #include "brave/components/ipfs/blob_context_getter_factory.h" #include "brave/components/ipfs/buildflags/buildflags.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/simple_url_loader.h" #include "url/gurl.h" diff --git a/components/p3a/brave_p3a_uploader.cc b/components/p3a/brave_p3a_uploader.cc index 304d6554e202..1a6138f5d6ef 100644 --- a/components/p3a/brave_p3a_uploader.cc +++ b/components/p3a/brave_p3a_uploader.cc @@ -9,6 +9,7 @@ #include "base/base64.h" #include "net/base/load_flags.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" diff --git a/components/webcompat_reporter/browser/webcompat_report_uploader.cc b/components/webcompat_reporter/browser/webcompat_report_uploader.cc index 9f57283a0834..e5335b1582b0 100644 --- a/components/webcompat_reporter/browser/webcompat_report_uploader.cc +++ b/components/webcompat_reporter/browser/webcompat_report_uploader.cc @@ -16,6 +16,7 @@ #include "content/public/browser/browser_task_traits.h" #include "net/base/load_flags.h" #include "net/base/privacy_mode.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" #include "services/network/public/mojom/fetch_api.mojom-shared.h" From f4621dc6034b45b74c6aa1c5ae0195584c4f408f Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 16:08:12 +0200 Subject: [PATCH 113/205] Adapt calls for OpaqueBrowserFrameViewLayout border and edge thickness FrameBorderThickness() and FrameTopThickness() do no longer exist, we need to use FrameBorderInsets() and FrameEdgeInsets() now. Chromium change: https://source.chromium.org/chromium/chromium/src/+/8e48353818f27c27ed55c40f8f9931acce0c120a commit 8e48353818f27c27ed55c40f8f9931acce0c120a Author: Tom Anderson Date: Tue Jun 29 18:21:13 2021 +0000 Use gfx::Insets to describe the frame border size OpaqueBrowserFrameViewLayout previously used an int to describe all 4 sides of the frame border. It also used 2 ints to describe the 3D portion of the frame border (one int for the top and another for the remaining sides). When using client side decorations, the shadow is typically offset such that it's thinner at the top and thicker at the bottom. Rather than adding another int for the bottom border, this CL switches to using gfx::Insets. This will also be required when we eventually allow styling the window frame with GTK, which can in general have a different decoration size of each edge. Also, make the gfx::Insets getters virtual so that OpaqueBrowserFrameViewLayoutLinux can override them. R=sky Change-Id: I37e9aff72ca8bc49123b265c7ef2bab3f56311a7 Bug: 650494, 811515 --- browser/ui/views/frame/brave_opaque_browser_frame_view.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/ui/views/frame/brave_opaque_browser_frame_view.cc b/browser/ui/views/frame/brave_opaque_browser_frame_view.cc index 3c29a3e91a69..c9205bb73d49 100644 --- a/browser/ui/views/frame/brave_opaque_browser_frame_view.cc +++ b/browser/ui/views/frame/brave_opaque_browser_frame_view.cc @@ -31,8 +31,8 @@ void BraveOpaqueBrowserFrameView::OnPaint(gfx::Canvas* canvas) { gfx::ScopedCanvas scoped_canvas(canvas); gfx::Rect bounds_to_frame_graphic(bounds()); if (!IsFrameCondensed()) { - bounds_to_frame_graphic.Inset(layout()->FrameBorderThickness(false), - layout()->FrameTopThickness(false)); + bounds_to_frame_graphic.Inset(layout()->FrameBorderInsets(false).top(), + layout()->FrameEdgeInsets(false).top()); canvas->ClipRect(bounds_to_frame_graphic); } frame_graphic_->Paint(canvas, bounds_to_frame_graphic); From 55223c1eed9782b1721369c0924f535946606b5f Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 16:16:03 +0200 Subject: [PATCH 114/205] Port away from deprecated ListValue::empty() We should use GetList().empty() now. Chromium change: https://source.chromium.org/chromium/chromium/src/+/ffeeed8d45af58f284a8b3624491745e7b10d2b1 commit ffeeed8d45af58f284a8b3624491745e7b10d2b1 Author: Morten Stenshorne Date: Thu Jul 8 22:58:38 2021 +0000 CodeHealth: Remove ListValue::empty() All usage should be replaced with Value::GetList()::empty() by now. Bug: 1187065 --- utility/importer/chrome_importer.cc | 3 ++- .../bat/ledger/internal/credentials/credentials_promotion.cc | 4 ++-- .../src/bat/ledger/internal/credentials/credentials_sku.cc | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/utility/importer/chrome_importer.cc b/utility/importer/chrome_importer.cc index 6ee8d0446f73..6a10a8e7d56d 100644 --- a/utility/importer/chrome_importer.cc +++ b/utility/importer/chrome_importer.cc @@ -409,7 +409,8 @@ void ChromeImporter::RecursiveReadBookmarksFolder( // Folders are added implicitly on adding children, so we only // explicitly add empty folders. const base::ListValue* children; - if (dict->GetList("children", &children) && children->empty()) { + if (dict->GetList("children", &children) && + children->GetList().empty()) { entry.in_toolbar = is_in_toolbar; entry.is_folder = true; entry.url = GURL(); diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/credentials/credentials_promotion.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/credentials/credentials_promotion.cc index d099e7727e0c..00c8c9340d2f 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/credentials/credentials_promotion.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/credentials/credentials_promotion.cc @@ -147,7 +147,7 @@ void CredentialsPromotion::Claim( auto blinded_creds = ParseStringToBaseList(creds->blinded_creds); - if (!blinded_creds || blinded_creds->empty()) { + if (!blinded_creds || blinded_creds->GetList().empty()) { BLOG(0, "Blinded creds are corrupted, we will try to blind again"); auto save_callback = std::bind(&CredentialsPromotion::RetryPreviousStepSaved, @@ -375,7 +375,7 @@ void CredentialsPromotion::VerifyPublicKey( auto promotion_keys = ParseStringToBaseList(promotion->public_keys); - if (!promotion_keys || promotion_keys->empty()) { + if (!promotion_keys || promotion_keys->GetList().empty()) { BLOG(0, "Public key is missing"); callback(type::Result::LEDGER_ERROR); return; diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/credentials/credentials_sku.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/credentials/credentials_sku.cc index eaaa72577652..9deabf4df0a9 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/credentials/credentials_sku.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/credentials/credentials_sku.cc @@ -212,7 +212,7 @@ void CredentialsSKU::Claim( auto blinded_creds = ParseStringToBaseList(creds->blinded_creds); - if (!blinded_creds || blinded_creds->empty()) { + if (!blinded_creds || blinded_creds->GetList().empty()) { BLOG(0, "Blinded creds are corrupted, we will try to blind again"); auto save_callback = std::bind(&CredentialsSKU::RetryPreviousStepSaved, From 4727e0837f4467f37df8a4b2447a3539d58210bf Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 16:23:15 +0200 Subject: [PATCH 115/205] CookieOptions::SamePartyCookieContextType -> SamePartyContext Adapt to this change upstream, and add the new include required. Chromium change: https://source.chromium.org/chromium/chromium/src/+/362c4a00017b8ed537014db3896c98552368a6b0 commit 362c4a00017b8ed537014db3896c98552368a6b0 Author: cfredric Date: Fri Jul 9 22:40:40 2021 +0000 Add UseCounters and UMA to measure incidence of SameSite=None cookies in certain contexts. Specifically, SameSite=None cookies that could be replaced by: * Nothing (have to remain a SameSite=None cookie) * a SameParty cookie, using the top frame and resource URL to determine sameparty-ness * a SameParty cookie, using the whole frame tree to determine sameparty-ness * a SameSite=Lax cookie * a SameSite=Strict cookie These metrics fire for both reads and writes. --- .../net/url_request/url_request_http_job.cc | 2 +- .../net/url_request/url_request_http_job.h | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/chromium_src/net/url_request/url_request_http_job.cc b/chromium_src/net/url_request/url_request_http_job.cc index 453f87bab509..fcc52e7820e2 100644 --- a/chromium_src/net/url_request/url_request_http_job.cc +++ b/chromium_src/net/url_request/url_request_http_job.cc @@ -11,7 +11,7 @@ namespace net { CookieOptions URLRequestHttpJob::CreateCookieOptions( CookieOptions::SameSiteCookieContext same_site_context, - CookieOptions::SamePartyCookieContextType same_party_context, + SamePartyContext same_party_context, const IsolationInfo& isolation_info, bool is_in_nontrivial_first_party_set) const { CookieOptions cookie_options = diff --git a/chromium_src/net/url_request/url_request_http_job.h b/chromium_src/net/url_request/url_request_http_job.h index 1d9d6ab85106..5c53ace67b83 100644 --- a/chromium_src/net/url_request/url_request_http_job.h +++ b/chromium_src/net/url_request/url_request_http_job.h @@ -9,14 +9,15 @@ #include "net/base/isolation_info.h" #include "net/base/request_priority.h" #include "net/cookies/cookie_options.h" +#include "net/cookies/same_party_context.h" -#define NotifyBeforeStartTransactionCallback \ - NotUsed() const {} \ - CookieOptions CreateCookieOptions( \ - CookieOptions::SameSiteCookieContext same_site_context, \ - CookieOptions::SamePartyCookieContextType same_party_context, \ - const IsolationInfo& isolation_info, \ - bool is_in_nontrivial_first_party_set) const; \ +#define NotifyBeforeStartTransactionCallback \ + NotUsed() const {} \ + CookieOptions CreateCookieOptions( \ + CookieOptions::SameSiteCookieContext same_site_context, \ + SamePartyContext same_party_context, \ + const IsolationInfo& isolation_info, \ + bool is_in_nontrivial_first_party_set) const; \ void NotifyBeforeStartTransactionCallback #include "../../../../net/url_request/url_request_http_job.h" From ac45191bd5081f02a37b8551cb13a939d1e825a9 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 17:04:38 +0200 Subject: [PATCH 116/205] Adapt to new return type for net::TransportSocketParams::destination() It used to return a HostPortPair but it does now return an Endpoint, which is an absl::variant instead. Chromium change: https://source.chromium.org/chromium/chromium/src/+/c98a3e6b1d4e3927bbf0785b190773c8460665be commit c98a3e6b1d4e3927bbf0785b190773c8460665be Author: Eric Orth Date: Fri Jul 2 17:46:37 2021 +0000 Maintain destination scheme in ConnectJobs As ConnectJobs are sometimes created when a scheme is unknown or non- standard, use absl::variants to continue allowing creation without scheme when necessary. Leaving proxy ConnectJobs for a subsequent CL. For now, they do not accept scheme for the eventual destination or the proxy endpoint. Bug: 1206799 --- .../net/socket/socks5_client_socket.cc | 25 +++++++++++++++---- .../net/socket/socks5_client_socket.h | 4 ++- 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/chromium_src/net/socket/socks5_client_socket.cc b/chromium_src/net/socket/socks5_client_socket.cc index 2381e2965c79..883cf871bb48 100644 --- a/chromium_src/net/socket/socks5_client_socket.cc +++ b/chromium_src/net/socket/socks5_client_socket.cc @@ -15,6 +15,21 @@ namespace net { +namespace { + +HostPortPair ToLegacyDestinationEndpoint( + const TransportSocketParams::Endpoint& endpoint) { + if (absl::holds_alternative(endpoint)) { + return HostPortPair::FromSchemeHostPort( + absl::get(endpoint)); + } + + DCHECK(absl::holds_alternative(endpoint)); + return absl::get(endpoint); +} + +} // namespace + int SOCKS5ClientSocket::DoAuth(int rv) { rv = Authenticate(rv, net_log_, io_callback_); next_state_ = (rv == OK ? STATE_HANDSHAKE_WRITE : STATE_AUTH); @@ -36,12 +51,12 @@ SOCKS5ClientSocketAuth::SOCKS5ClientSocketAuth( std::unique_ptr transport_socket, const HostPortPair& destination, const NetworkTrafficAnnotationTag& traffic_annotation, - const HostPortPair& proxy_host_port) - : SOCKS5ClientSocket(std::move(transport_socket), destination, + const TransportSocketParams::Endpoint& proxy_endpoint) + : SOCKS5ClientSocket(std::move(transport_socket), + destination, traffic_annotation), - proxy_host_port_(proxy_host_port), - next_state_(STATE_INIT_WRITE) { -} + proxy_host_port_(ToLegacyDestinationEndpoint(proxy_endpoint)), + next_state_(STATE_INIT_WRITE) {} SOCKS5ClientSocketAuth::~SOCKS5ClientSocketAuth() = default; diff --git a/chromium_src/net/socket/socks5_client_socket.h b/chromium_src/net/socket/socks5_client_socket.h index 4d721ae90045..d090728fecbb 100644 --- a/chromium_src/net/socket/socks5_client_socket.h +++ b/chromium_src/net/socket/socks5_client_socket.h @@ -11,6 +11,8 @@ #include #include +#include "net/socket/transport_connect_job.h" + namespace net { class NET_EXPORT_PRIVATE SOCKS5ClientSocketAuth : public SOCKS5ClientSocket { @@ -18,7 +20,7 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocketAuth : public SOCKS5ClientSocket { SOCKS5ClientSocketAuth(std::unique_ptr transport_socket, const HostPortPair& destination, const NetworkTrafficAnnotationTag& traffic_annotation, - const HostPortPair& proxy_host_port); + const TransportSocketParams::Endpoint& proxy_endpoint); ~SOCKS5ClientSocketAuth() override; private: From 3d9662a48996b1c367234973c9d3f2bce0407193 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 17:09:14 +0200 Subject: [PATCH 117/205] Reference KeySystems from inside the media namespace This definitions lives under Blink's media namespace now. Chromium change: https://source.chromium.org/chromium/chromium/src/+/d7db8f85c0d7f9df87afea0fa62da78ae188fb5c commit d7db8f85c0d7f9df87afea0fa62da78ae188fb5c Author: Henrique Ferreiro Date: Thu Jul 8 21:18:05 2021 +0000 Migrate t/b/{public,renderer}/platform/media to blink ns [2/6] This CL is a follow-up to https://crrev.com/c/2847359 and https://crrev.com/c/2925475. The code moved from media/blink/ to Blink should use the blink namespace. This CL just adds needed media:: prefixes to code in third_party/blink/renderer/platform/media/. Bug: 1198341 --- ...enderer-platform-media-key_system_config_selector.cc.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch b/patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch index 8fc42ae92464..7b449d9f07f6 100644 --- a/patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch +++ b/patches/third_party-blink-renderer-platform-media-key_system_config_selector.cc.patch @@ -1,12 +1,12 @@ diff --git a/third_party/blink/renderer/platform/media/key_system_config_selector.cc b/third_party/blink/renderer/platform/media/key_system_config_selector.cc -index 48b6b1fa58efb862a5565c71f2acf58a2a0f3879..6b7971fafec5c3b6bee1896c518c3e44d6173910 100644 +index 48b6b1fa58efb862a5565c71f2acf58a2a0f3879..f8d24ed7e16407fb86fb017c431ce752ef0cfebe 100644 --- a/third_party/blink/renderer/platform/media/key_system_config_selector.cc +++ b/third_party/blink/renderer/platform/media/key_system_config_selector.cc @@ -997,6 +997,7 @@ void KeySystemConfigSelector::SelectConfig( key_systems_->UpdateIfNeeded(); -+ KeySystems::GetInstance(); ++ media::KeySystems::GetInstance(); std::string key_system_ascii = key_system.Ascii(); if (!key_systems_->IsSupportedKeySystem(key_system_ascii)) { std::move(cb).Run(Status::kUnsupportedKeySystem, nullptr, nullptr); From 413fe2414cda23746012fa447f1547968a1033ab Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 17:26:21 +0200 Subject: [PATCH 118/205] Fix build error due to unnecessary use of base::NoDestructor FocusRingTheme is a class with a trivial destructor. Chromium change: https://source.chromium.org/chromium/chromium/src/+/ded7717f5252a0c9d9de56bc22483b195d1801e0 commit ded7717f5252a0c9d9de56bc22483b195d1801e0 Author: Avi Drissman Date: Fri Jul 2 18:23:00 2021 +0000 Prevent use of base::NoDestructor for trivially-destructible types base::NoDestructor prevents calling a destructor of the templated type. It's not needed if there is no destructor call to prevent. This relands b961c7632f268f853a88869ad6bc5f33c3a4d549 with a small fix to code that was behind an official build flag that failed to compile. Bug: 1223520 --- chromium_src/ui/views/controls/focus_ring.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/chromium_src/ui/views/controls/focus_ring.cc b/chromium_src/ui/views/controls/focus_ring.cc index 5dd39872f6ac..76d6d5e479b6 100644 --- a/chromium_src/ui/views/controls/focus_ring.cc +++ b/chromium_src/ui/views/controls/focus_ring.cc @@ -40,16 +40,16 @@ class FocusRingTheme { } }; -FocusRingTheme* GetFocusRingTheme() { - static base::NoDestructor instance; - return instance.get(); +FocusRingTheme& GetFocusRingTheme() { + static FocusRingTheme instance; + return instance; } } // namespace #define setStyle \ setColor(color_.value_or( \ - GetFocusRingTheme()->GetSystemColor(ColorIdForValidity(!invalid_)))); \ + GetFocusRingTheme().GetSystemColor(ColorIdForValidity(!invalid_)))); \ paint.setStyle #include "../../../../../ui/views/controls/focus_ring.cc" From 09c8952d2995636b44b3f737ab8c17f177bce2f4 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 17:39:17 +0200 Subject: [PATCH 119/205] Use COMPONENT_EXPORT(PERMISSIONS_COMMON) with kPermissionLifetime A recent change converted //components/permissions:permissions_common from being a source set to a componnent, so we need to annotate this declaration now for the symbol to get properly exported. Chromium change: https://source.chromium.org/chromium/chromium/src/+/7709f0ce1f555922ab538a6861205f3ee5a485fc commit 7709f0ce1f555922ab538a6861205f3ee5a485fc Author: Illia Klimov Date: Mon Jul 5 09:42:39 2021 +0000 Reland "Use GetLastCommittedOrigin for permissions." This reverts commit 2fb676a482e822fdd2bd9449e0dcd637c88f28e7. Reason for revert: The crash happens due to double base::Feature initialization. This CL fixes that. Original change's description: > Revert "Use GetLastCommittedOrigin for permissions." > > This reverts commit 57faf740e23368163ecbed24f76da11f9fe8875d. > > Reason for revert: speculative revert as this seems a prime candidate for the breakage in content_browsertests on Linux CrOS (https://ci.chromium.org/ui/p/chromium/builders/ci/linux-chromeos-dbg/24420/test-results) > > Original change's description: > > Use GetLastCommittedOrigin for permissions. > > > > Refactor call sites that work with origins for the purpose of permission > > state management to go through a central utility function that handles > > all edge cases. > > > > Bug: 698985,1210669,1220660 > > Change-Id: If76fd05c831dd3d3ac6d1274a6f4d1404ee17957 > > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2944834 > > Commit-Queue: Illia Klimov > > Reviewed-by: Avi Drissman > > Reviewed-by: danakj > > Reviewed-by: Mike Wasserman > > Reviewed-by: Balazs Engedy > > Reviewed-by: Guido Urdaneta > > Reviewed-by: Lei Zhang > > Reviewed-by: Wez > > Cr-Commit-Position: refs/heads/master@{#896916} > > Bug: 698985,1210669,1220660 > Change-Id: I3222c21d13f29f5365d283f0e1d3b730f3774409 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2995064 > Auto-Submit: W. James MacLean > Reviewed-by: Roman Arora > Reviewed-by: W. James MacLean > Owners-Override: Roman Arora > Owners-Override: W. James MacLean > Commit-Queue: W. James MacLean > Cr-Commit-Position: refs/heads/master@{#897033} Bug: 698985,1210669,1220660 --- chromium_src/components/permissions/features.h | 1 + 1 file changed, 1 insertion(+) diff --git a/chromium_src/components/permissions/features.h b/chromium_src/components/permissions/features.h index 135c82d3408e..9fb90295e14d 100644 --- a/chromium_src/components/permissions/features.h +++ b/chromium_src/components/permissions/features.h @@ -11,6 +11,7 @@ namespace permissions { namespace features { +COMPONENT_EXPORT(PERMISSIONS_COMMON) extern const base::Feature kPermissionLifetime; } // namespace features From b84c7a040e1c6669f60928137a06b1cab951a6a3 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 18:15:09 +0200 Subject: [PATCH 120/205] Adapt Brave-specific customization for folder icons in bookmarks bar Tested on Linux and it preserves the original behaviour from PR #9424. [1] https://github.com/brave/brave-core/pull/9424 Chromium change: https://source.chromium.org/chromium/chromium/src/+/2a4b9bfb525d77dfeec91be45068f9c95b00a8e9 commit 2a4b9bfb525d77dfeec91be45068f9c95b00a8e9 Author: Peter Kasting Date: Sat Jul 10 01:41:59 2021 +0000 Avoid accessing NativeTheme too early from bookmarks-related functions. This must only be accessed when the caller is in a Widget. Fixing this required significantly reworking how bookmark folder images are handled. This also modifies the color of bookmark folders on non-Win, non-Mac platforms: they are grey 700 by default (in light mode), like other icons, instead of being something closer to grey 600; and when a custom theme modifies the bookmark bar text color, folder icons in the overflow menu do not change similarly (but keep their standard menu colors). The menu does not necessarily have the same background color as the bookmark bar, so matching the bar's foreground color doesn't make sense, doubly so when done just for the folder icons and nothing else. Bug: 1211091 --- .../browser/ui/bookmarks/bookmark_utils.cc | 39 ++++++++++++++----- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/chromium_src/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chromium_src/chrome/browser/ui/bookmarks/bookmark_utils.cc index 94f8929754c5..a5f3858418da 100644 --- a/chromium_src/chrome/browser/ui/bookmarks/bookmark_utils.cc +++ b/chromium_src/chrome/browser/ui/bookmarks/bookmark_utils.cc @@ -35,15 +35,36 @@ bool ShouldShowAppsShortcutInBookmarkBar(Profile* profile) { } #if defined(TOOLKIT_VIEWS) -ui::ImageModel GetBookmarkFolderIcon(SkColor text_color) { - int resource_id = color_utils::IsDark(text_color) - ? IDR_BRAVE_BOOKMARK_FOLDER_CLOSED - : IDR_BRAVE_BOOKMARK_FOLDER_CLOSED_WHITE; - gfx::ImageSkia folder = *ui::ResourceBundle::GetSharedInstance() - .GetNativeImageNamed(resource_id) - .ToImageSkia(); - return ui::ImageModel::FromImageSkia( - gfx::ImageSkia(std::make_unique(folder), folder.size())); +ui::ImageModel GetBookmarkFolderIcon(BookmarkFolderIconType icon_type, + absl::variant color) { + int default_id = IDR_BRAVE_BOOKMARK_FOLDER_CLOSED; + const auto generator = [](int default_id, BookmarkFolderIconType icon_type, + absl::variant color, + const ui::NativeTheme* native_theme) { + gfx::ImageSkia folder; + SkColor sk_color; + if (absl::holds_alternative(color)) { + sk_color = absl::get(color); + } else { + DCHECK(native_theme); + sk_color = native_theme->GetSystemColor( + static_cast(absl::get(color))); + } + + const int resource_id = color_utils::IsDark(sk_color) + ? IDR_BRAVE_BOOKMARK_FOLDER_CLOSED + : IDR_BRAVE_BOOKMARK_FOLDER_CLOSED_WHITE; + folder = *ui::ResourceBundle::GetSharedInstance() + .GetNativeImageNamed(resource_id) + .ToImageSkia(); + return gfx::ImageSkia(std::make_unique(folder), + folder.size()); + }; + const gfx::Size size = + ui::ResourceBundle::GetSharedInstance().GetImageNamed(default_id).Size(); + return ui::ImageModel::FromImageGenerator( + base::BindRepeating(generator, default_id, icon_type, std::move(color)), + size); } #endif From b43ec9f547d56033be0d9ca1dc9a520a40c9b234 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 18:28:05 +0200 Subject: [PATCH 121/205] Avoid redefinition of the cr-toolbar name for history page Upstream re-introduced a cr_toolbar.js import in history_toolbar.ts, which collides with our br_toolbar.m.js, which also defines cr-toolbar, causing a Javascript error when opening the history page like this: Uncaught NotSupportedError: Failed to execute 'define' on 'CustomElementRegistry': the name "cr-toolbar" has already been used with this registry", source: chrome://history/ (0) Remove that import to get the history page working again. Chromium change: https://source.chromium.org/chromium/chromium/src/+/f3907c07a8a0c13b1b513f507719fe3e316d8c80 commit f3907c07a8a0c13b1b513f507719fe3e316d8c80 Author: dpapad Date: Wed May 26 17:41:25 2021 +0000 History: Migrate to TypeScript. - Remove js_library(), js_type_check() targets. - Add new ts_library() target, and hook it up to the build. - Migrate all files to TypeScript, and fix all errors. - Override default tsconfig with a few options that seem necessary for Polymer code. - Introduce EventTracker usage in app.ts as part of the migration (easier than adding type info for boundOnKeyDown_) - Rename 'open-menu' event to 'synced-device-card-open-menu' in synced_device_card.ts, to be able to differentiate with the 'open-menu' event in history_card.ts, when declaring the Event type in the global HTMLElementEventMap. Bug: 1189595 --- ...owser-resources-history-history_toolbar.ts.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/patches/chrome-browser-resources-history-history_toolbar.ts.patch b/patches/chrome-browser-resources-history-history_toolbar.ts.patch index 8054aeb546f2..2dd759c04bb9 100644 --- a/patches/chrome-browser-resources-history-history_toolbar.ts.patch +++ b/patches/chrome-browser-resources-history-history_toolbar.ts.patch @@ -1,12 +1,13 @@ diff --git a/chrome/browser/resources/history/history_toolbar.ts b/chrome/browser/resources/history/history_toolbar.ts -index 223a15ac3e3fe41a2dd65d2fdce94710faf78355..c95262fccacdd35e5524b7f8ea459bcb733f6796 100644 +index 223a15ac3e3fe41a2dd65d2fdce94710faf78355..73ec11298511de6008d81061d9cc616a42422042 100644 --- a/chrome/browser/resources/history/history_toolbar.ts +++ b/chrome/browser/resources/history/history_toolbar.ts -@@ -7,6 +7,7 @@ import './strings.m.js'; - import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; - import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; +@@ -4,7 +4,7 @@ + import './shared_style.js'; + import './strings.m.js'; +-import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; +import 'chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js' + import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; + import {CrToolbarElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; - import {CrToolbarSearchFieldElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; - import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; From d010b069601cd894283bacb42ca6359e00503116 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 18:30:46 +0200 Subject: [PATCH 122/205] Avoid redefinition of the cr-toolbar name for bookmarks page Upstream re-introduced a cr_toolbar.js import in bookmarks/toolbar.ts, which collides with our br_toolbar.m.js, which also defines cr-toolbar, causing a Javascript error when opening the bookmarks page like this: Uncaught NotSupportedError: Failed to execute 'define' on 'CustomElementRegistry': the name "cr-toolbar" has already been used with this registry", source: chrome://bookmarks/ (0) Remove that import to get the bookmarks page working again. Chromium change: https://source.chromium.org/chromium/chromium/src/+/ --- ...ome-browser-resources-bookmarks-toolbar.ts.patch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/patches/chrome-browser-resources-bookmarks-toolbar.ts.patch b/patches/chrome-browser-resources-bookmarks-toolbar.ts.patch index c3ee39e8e51e..bee1fd5e40bb 100644 --- a/patches/chrome-browser-resources-bookmarks-toolbar.ts.patch +++ b/patches/chrome-browser-resources-bookmarks-toolbar.ts.patch @@ -1,12 +1,13 @@ diff --git a/chrome/browser/resources/bookmarks/toolbar.ts b/chrome/browser/resources/bookmarks/toolbar.ts -index 86e6f729a495721a931b1fc12c4ff5d3e2efad5f..945b6d653c17d073b4fe755c7bdb8d9a34f5f9f1 100644 +index 86e6f729a495721a931b1fc12c4ff5d3e2efad5f..20529e6e0f52080eb99f46af2a2edae41960d140 100644 --- a/chrome/browser/resources/bookmarks/toolbar.ts +++ b/chrome/browser/resources/bookmarks/toolbar.ts -@@ -10,6 +10,7 @@ import './strings.m.js'; - import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; +@@ -7,7 +7,7 @@ import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_selection_overlay.j + import 'chrome://resources/cr_elements/icons.m.js'; + import './shared_style.js'; + import './strings.m.js'; +-import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; ++import 'chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js'; import 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; -+import 'chrome://brave-resources/br_elements/br_toolbar/br_toolbar.m.js'; import {CrToolbarElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar.js'; - import {CrToolbarSearchFieldElement} from 'chrome://resources/cr_elements/cr_toolbar/cr_toolbar_search_field.js'; - import {assert} from 'chrome://resources/js/assert.m.js'; From bc70a6b4f7b55b3dadf440b0571476a0a90b16f0 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 18:38:32 +0200 Subject: [PATCH 123/205] Include base/cxx17_backports.h anywhere where base::size() is used Chromium change: https://source.chromium.org/chromium/chromium/src/+/d4a2f8e1ed461d8fc05ed88d1ae2dc94c9773825 commit d4a2f8e1ed461d8fc05ed88d1ae2dc94c9773825 Author: Lei Zhang Date: Thu Jul 8 03:43:28 2021 +0000 Swap base/stl_util.h to base/cxx17_backports.h in many files. Files that use base::size() and base::data() should use cxx17_backports.h directly, instead of getting it transitively through stl_util.h. Bug: 1210983 --- browser/brave_resources_util_unittest.cc | 2 +- browser/download/brave_download_item_model_unittest.cc | 2 +- .../brave_site_hacks_network_delegate_helper_browsertest.cc | 1 + browser/ui/omnibox/brave_omnibox_client_impl.cc | 2 +- .../ui/webui/new_tab_page/brave_new_tab_message_handler.cc | 1 + .../extensions/component_extensions_allowlist/allowlist.cc | 2 +- .../policy/configuration_policy_handler_list_factory.cc | 5 +++-- .../chrome/install_static/brave_install_util_unittest.cc | 1 + components/brave_ads/browser/ads_p2a.cc | 1 + components/brave_prochlo/brave_prochlo_message.cc | 2 +- .../ntp_background_images/browser/view_counter_service.cc | 1 + components/p3a/histograms_braveizer.cc | 1 + ios/browser/api/bookmarks/importer/bookmark_html_reader.cc | 4 ++-- .../api/bookmarks/importer/brave_bookmarks_importer.mm | 1 + net/dns/dns_transaction_unittest.cc | 2 +- .../src/bat/ads/internal/security/crypto_util.cc | 2 +- .../internal/contribution/contribution_unblinded_unittest.cc | 1 + 17 files changed, 20 insertions(+), 11 deletions(-) diff --git a/browser/brave_resources_util_unittest.cc b/browser/brave_resources_util_unittest.cc index 6eec7a149d92..85fae80da2e1 100644 --- a/browser/brave_resources_util_unittest.cc +++ b/browser/brave_resources_util_unittest.cc @@ -5,8 +5,8 @@ #include +#include "base/cxx17_backports.h" #include "base/macros.h" -#include "base/stl_util.h" #include "brave/grit/brave_theme_resources.h" #include "build/build_config.h" #include "chrome/browser/resources_util.h" diff --git a/browser/download/brave_download_item_model_unittest.cc b/browser/download/brave_download_item_model_unittest.cc index c7932e1c370f..d7f1f9505162 100644 --- a/browser/download/brave_download_item_model_unittest.cc +++ b/browser/download/brave_download_item_model_unittest.cc @@ -10,10 +10,10 @@ #include +#include "base/cxx17_backports.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/macros.h" -#include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" diff --git a/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc b/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc index 21ead2938ab4..f5776371ea70 100644 --- a/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc +++ b/browser/net/brave_site_hacks_network_delegate_helper_browsertest.cc @@ -4,6 +4,7 @@ * You can obtain one at https://mozilla.org/MPL/2.0/. */ #include "base/base64url.h" +#include "base/cxx17_backports.h" #include "base/path_service.h" #include "base/strings/stringprintf.h" #include "brave/common/brave_paths.h" diff --git a/browser/ui/omnibox/brave_omnibox_client_impl.cc b/browser/ui/omnibox/brave_omnibox_client_impl.cc index 293089086d0b..b52372badebb 100644 --- a/browser/ui/omnibox/brave_omnibox_client_impl.cc +++ b/browser/ui/omnibox/brave_omnibox_client_impl.cc @@ -7,8 +7,8 @@ #include +#include "base/cxx17_backports.h" #include "base/metrics/histogram_macros.h" -#include "base/stl_util.h" #include "base/values.h" #include "brave/browser/autocomplete/brave_autocomplete_scheme_classifier.h" #include "brave/common/pref_names.h" diff --git a/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc b/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc index 7fba8779772b..768c69e4a8d3 100644 --- a/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc +++ b/browser/ui/webui/new_tab_page/brave_new_tab_message_handler.cc @@ -8,6 +8,7 @@ #include #include +#include "base/cxx17_backports.h" #include "base/guid.h" #include "base/json/json_writer.h" #include "base/memory/weak_ptr.h" diff --git a/chromium_src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc b/chromium_src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc index 700744dc8fb5..5488fff383d0 100644 --- a/chromium_src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc +++ b/chromium_src/chrome/browser/extensions/component_extensions_allowlist/allowlist.cc @@ -7,7 +7,7 @@ #include "../../../../../../chrome/browser/extensions/component_extensions_allowlist/allowlist.cc" // NOLINT #undef IsComponentExtensionAllowlisted -#include "base/stl_util.h" +#include "base/cxx17_backports.h" #include "brave/browser/ethereum_remote_client/buildflags/buildflags.h" #include "brave/components/brave_extension/grit/brave_extension.h" #include "brave/components/brave_rewards/resources/extension/grit/brave_rewards_extension_resources.h" diff --git a/chromium_src/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chromium_src/chrome/browser/policy/configuration_policy_handler_list_factory.cc index 21bf1697dffe..d621f63709a9 100644 --- a/chromium_src/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chromium_src/chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -3,13 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "base/stl_util.h" +#include "chrome/browser/policy/configuration_policy_handler_list_factory.h" + +#include "base/cxx17_backports.h" #include "brave/common/pref_names.h" #include "brave/components/ipfs/buildflags/buildflags.h" #include "brave/components/ipfs/pref_names.h" #include "brave/components/tor/buildflags/buildflags.h" #include "brave/components/tor/pref_names.h" -#include "chrome/browser/policy/configuration_policy_handler_list_factory.h" #include "components/policy/core/browser/configuration_policy_handler.h" #include "components/policy/policy_constants.h" diff --git a/chromium_src/chrome/install_static/brave_install_util_unittest.cc b/chromium_src/chrome/install_static/brave_install_util_unittest.cc index 17d62ea2752f..d8e6d778248a 100644 --- a/chromium_src/chrome/install_static/brave_install_util_unittest.cc +++ b/chromium_src/chrome/install_static/brave_install_util_unittest.cc @@ -6,6 +6,7 @@ #include +#include "base/cxx17_backports.h" #include "base/macros.h" #include "base/stl_util.h" #include "base/test/test_reg_util_win.h" diff --git a/components/brave_ads/browser/ads_p2a.cc b/components/brave_ads/browser/ads_p2a.cc index b06f09ea44fb..cc97fcdccd9e 100644 --- a/components/brave_ads/browser/ads_p2a.cc +++ b/components/brave_ads/browser/ads_p2a.cc @@ -9,6 +9,7 @@ #include #include +#include "base/cxx17_backports.h" #include "base/metrics/histogram_functions.h" #include "brave/components/brave_ads/common/pref_names.h" #include "brave/components/weekly_storage/weekly_storage.h" diff --git a/components/brave_prochlo/brave_prochlo_message.cc b/components/brave_prochlo/brave_prochlo_message.cc index d830d056bfc4..e5bef6d5bbea 100644 --- a/components/brave_prochlo/brave_prochlo_message.cc +++ b/components/brave_prochlo/brave_prochlo_message.cc @@ -8,8 +8,8 @@ #include #include "base/containers/flat_set.h" +#include "base/cxx17_backports.h" #include "base/logging.h" -#include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/trace_event/trace_event.h" #include "brave/components/brave_prochlo/brave_prochlo_crypto.h" diff --git a/components/ntp_background_images/browser/view_counter_service.cc b/components/ntp_background_images/browser/view_counter_service.cc index c6da8744cadb..cc818c91c75d 100644 --- a/components/ntp_background_images/browser/view_counter_service.cc +++ b/components/ntp_background_images/browser/view_counter_service.cc @@ -10,6 +10,7 @@ #include #include "base/bind.h" +#include "base/cxx17_backports.h" #include "base/feature_list.h" #include "base/files/file_path.h" #include "base/logging.h" diff --git a/components/p3a/histograms_braveizer.cc b/components/p3a/histograms_braveizer.cc index 46970d1fa1cb..fb48a635f353 100644 --- a/components/p3a/histograms_braveizer.cc +++ b/components/p3a/histograms_braveizer.cc @@ -6,6 +6,7 @@ #include "brave/components/p3a/histograms_braveizer.h" #include "base/bind.h" +#include "base/cxx17_backports.h" #include "base/memory/ref_counted.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/statistics_recorder.h" diff --git a/ios/browser/api/bookmarks/importer/bookmark_html_reader.cc b/ios/browser/api/bookmarks/importer/bookmark_html_reader.cc index 557640c94670..1c7585ccac28 100644 --- a/ios/browser/api/bookmarks/importer/bookmark_html_reader.cc +++ b/ios/browser/api/bookmarks/importer/bookmark_html_reader.cc @@ -9,16 +9,16 @@ #include #include "base/callback.h" +#include "base/cxx17_backports.h" #include "base/files/file_util.h" #include "base/i18n/icu_string_conversions.h" -#include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "brave/ios/browser/api/bookmarks/importer/imported_bookmark_entry.h" #include "brave/ios/browser/api/bookmarks/importer/favicon_reencode.h" +#include "brave/ios/browser/api/bookmarks/importer/imported_bookmark_entry.h" #include "components/search_engines/search_terms_data.h" #include "components/search_engines/template_url.h" #include "net/base/data_url.h" diff --git a/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm b/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm index 12c6338a04f3..747c202363c7 100644 --- a/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm +++ b/ios/browser/api/bookmarks/importer/brave_bookmarks_importer.mm @@ -11,6 +11,7 @@ #include "base/bind.h" #include "base/callback_helpers.h" #include "base/compiler_specific.h" +#include "base/cxx17_backports.h" #include "base/files/file_path.h" #include "base/mac/foundation_util.h" #include "base/path_service.h" diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc index 243a4c1e8b22..e369d35b5ff6 100644 --- a/net/dns/dns_transaction_unittest.cc +++ b/net/dns/dns_transaction_unittest.cc @@ -14,9 +14,9 @@ #include "base/base64url.h" #include "base/bind.h" #include "base/containers/circular_deque.h" +#include "base/cxx17_backports.h" #include "base/rand_util.h" #include "base/run_loop.h" -#include "base/stl_util.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" #include "base/sys_byteorder.h" diff --git a/vendor/bat-native-ads/src/bat/ads/internal/security/crypto_util.cc b/vendor/bat-native-ads/src/bat/ads/internal/security/crypto_util.cc index c1202c9c43da..73ef386a4492 100644 --- a/vendor/bat-native-ads/src/bat/ads/internal/security/crypto_util.cc +++ b/vendor/bat-native-ads/src/bat/ads/internal/security/crypto_util.cc @@ -12,9 +12,9 @@ #include #include "base/base64.h" +#include "base/cxx17_backports.h" #include "base/json/json_reader.h" #include "base/rand_util.h" -#include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/values.h" #include "bat/ads/internal/logging.h" diff --git a/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded_unittest.cc b/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded_unittest.cc index 499cf7c2e90f..cab2f9bb8517 100644 --- a/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded_unittest.cc +++ b/vendor/bat-native-ledger/src/bat/ledger/internal/contribution/contribution_unblinded_unittest.cc @@ -6,6 +6,7 @@ #include #include +#include "base/cxx17_backports.h" #include "base/test/task_environment.h" #include "bat/ledger/internal/contribution/contribution_unblinded.h" #include "bat/ledger/internal/database/database_contribution_info.h" From 4d13897bd62f3edca59613777fbdc6bc245c810a Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 18:41:53 +0200 Subject: [PATCH 124/205] Add constness to FakeAutocompleteProviderClient::GetPrefs() override Constness for this method has been recently added upstream, so we need to do this on our override, plus some small adaptation since we can't now return a reference to the internal TestingPrefServiceSimple member. Chromium change: https://source.chromium.org/chromium/chromium/src/+/91476e0ceeda870b0a7e2883330093114eb82272 commit 91476e0ceeda870b0a7e2883330093114eb82272 Author: Orin Jaworski Date: Fri Jul 2 22:24:32 2021 +0000 [omnibox] Add and implement PLAY_CHROME_DINO_GAME Pedal This CL creates the second Pedal for batch 3, which can be triggered with minimal input "chrome dino". Bug: 893183 --- .../omnibox/browser/fake_autocomplete_provider_client.cc | 9 ++++++--- .../omnibox/browser/fake_autocomplete_provider_client.h | 7 +++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/components/omnibox/browser/fake_autocomplete_provider_client.cc b/components/omnibox/browser/fake_autocomplete_provider_client.cc index 890fb9676387..be0f539b2549 100644 --- a/components/omnibox/browser/fake_autocomplete_provider_client.cc +++ b/components/omnibox/browser/fake_autocomplete_provider_client.cc @@ -9,11 +9,14 @@ #include "components/prefs/pref_registry_simple.h" FakeAutocompleteProviderClient::FakeAutocompleteProviderClient() { - auto* registry = pref_service_.registry(); + pref_service_ = std::make_unique(); + auto* registry = pref_service_->registry(); registry->RegisterBooleanPref(kTopSiteSuggestionsEnabled, true); registry->RegisterBooleanPref(kBraveSuggestedSiteSuggestionsEnabled, true); } -PrefService* FakeAutocompleteProviderClient::GetPrefs() { - return &pref_service_; +FakeAutocompleteProviderClient::~FakeAutocompleteProviderClient() = default; + +PrefService* FakeAutocompleteProviderClient::GetPrefs() const { + return pref_service_.get(); } diff --git a/components/omnibox/browser/fake_autocomplete_provider_client.h b/components/omnibox/browser/fake_autocomplete_provider_client.h index 8325b3055956..7817c5dce451 100644 --- a/components/omnibox/browser/fake_autocomplete_provider_client.h +++ b/components/omnibox/browser/fake_autocomplete_provider_client.h @@ -6,16 +6,19 @@ #ifndef BRAVE_COMPONENTS_OMNIBOX_BROWSER_FAKE_AUTOCOMPLETE_PROVIDER_CLIENT_H_ #define BRAVE_COMPONENTS_OMNIBOX_BROWSER_FAKE_AUTOCOMPLETE_PROVIDER_CLIENT_H_ +#include + #include "components/omnibox/browser/mock_autocomplete_provider_client.h" #include "components/prefs/testing_pref_service.h" class FakeAutocompleteProviderClient : public MockAutocompleteProviderClient { public: + ~FakeAutocompleteProviderClient() override; FakeAutocompleteProviderClient(); - PrefService* GetPrefs() override; + PrefService* GetPrefs() const override; private: - TestingPrefServiceSimple pref_service_; + std::unique_ptr pref_service_; DISALLOW_COPY_AND_ASSIGN(FakeAutocompleteProviderClient); }; From a99d0b53baacabb7f7f819ed728cb1d4d9f84743 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Thu, 15 Jul 2021 18:55:05 +0200 Subject: [PATCH 125/205] IWYU: services/network/public/cpp/shared_url_loader_factory.h --- browser/net/brave_system_request_handler_browsertest.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/net/brave_system_request_handler_browsertest.cc b/browser/net/brave_system_request_handler_browsertest.cc index 831d8cabbb75..b2c52d41ed47 100644 --- a/browser/net/brave_system_request_handler_browsertest.cc +++ b/browser/net/brave_system_request_handler_browsertest.cc @@ -16,6 +16,7 @@ #include "net/test/embedded_test_server/http_request.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" +#include "services/network/public/cpp/shared_url_loader_factory.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_ANDROID) From f221d82c640b50592735878ec0a309dc9f61d393 Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 16 Jul 2021 11:33:27 +0200 Subject: [PATCH 126/205] Migrate leftovers of base::nullopt in master to absl::nullopt --- .../brave_rewards/browser/test/rewards_state_browsertest.cc | 3 ++- .../brave_wallet/browser/eth_tx_state_manager_unittest.cc | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/components/brave_rewards/browser/test/rewards_state_browsertest.cc b/components/brave_rewards/browser/test/rewards_state_browsertest.cc index c50b3756e8f7..83327a0b7d1d 100644 --- a/components/brave_rewards/browser/test/rewards_state_browsertest.cc +++ b/components/brave_rewards/browser/test/rewards_state_browsertest.cc @@ -24,6 +24,7 @@ #include "chrome/test/base/testing_profile.h" #include "content/public/test/browser_test.h" #include "net/dns/mock_host_resolver.h" +#include "third_party/abseil-cpp/absl/types/optional.h" // npm run test -- brave_browser_tests --filter=RewardsStateBrowserTest.* @@ -313,7 +314,7 @@ class UpholdStateMachine : public RewardsStateBrowserTest, static std::string from_json(const std::string& json) { std::string suffix = ""; - base::Optional value = base::JSONReader::Read(json); + absl::optional value = base::JSONReader::Read(json); if (value && value->is_dict()) { base::DictionaryValue* dictionary = nullptr; if (value->GetAsDictionary(&dictionary)) { diff --git a/components/brave_wallet/browser/eth_tx_state_manager_unittest.cc b/components/brave_wallet/browser/eth_tx_state_manager_unittest.cc index 0f7ad3cd77f5..9158412aa1fd 100644 --- a/components/brave_wallet/browser/eth_tx_state_manager_unittest.cc +++ b/components/brave_wallet/browser/eth_tx_state_manager_unittest.cc @@ -258,19 +258,19 @@ TEST_F(EthTxStateManagerUnitTest, GetTransactionsByStatus) { EXPECT_EQ( tx_state_manager .GetTransactionsByStatus( - EthTxStateManager::TransactionStatus::APPROVED, base::nullopt) + EthTxStateManager::TransactionStatus::APPROVED, absl::nullopt) .size(), 0u); EXPECT_EQ( tx_state_manager .GetTransactionsByStatus( - EthTxStateManager::TransactionStatus::CONFIRMED, base::nullopt) + EthTxStateManager::TransactionStatus::CONFIRMED, absl::nullopt) .size(), 10u); EXPECT_EQ( tx_state_manager .GetTransactionsByStatus( - EthTxStateManager::TransactionStatus::SUBMITTED, base::nullopt) + EthTxStateManager::TransactionStatus::SUBMITTED, absl::nullopt) .size(), 10u); From d7bdc1c8fac4f1fab8a5abf8139ab13dadf05f3a Mon Sep 17 00:00:00 2001 From: Mario Sanchez Prada Date: Fri, 16 Jul 2021 13:48:58 +0200 Subject: [PATCH 127/205] Adapt test expectation to new format of the Javascript error message The format changed from "Cannot set property '%' of %" to "Cannot read properties of % (reading '%')") recently in V8. This fixes the following browser test: * SerialAPIBrowserTest.SerialAPIDisabled V8 change: https://chromium.googlesource.com/v8/v8/+/c0fd89c3c089e888c4f4e8582e56db7066fa779b commit c0fd89c3c089e888c4f4e8582e56db7066fa779b Author: Patrick Thier Date: Thu Jun 17 11:15:41 2021 +0000 Reland "Reland "Reland "Improve error messages for property access on null/undefined""" This is a reland of 819c3ae2f87fc7ad634fe4356de6653bb3cb3b87 Original change's description: > Reland "Reland "Improve error messages for property access on null/undefined"" > > This is a reland of 8b18c5e6a534d7c459a16aebdd4fe05133db6dea > > Original change's description: > > Reland "Improve error messages for property access on null/undefined" > > > > This is a reland of 24c626c1f7809ce725e56152ab2928696a2f8e9e > > > > Original change's description: > > > Improve error messages for property access on null/undefined > > > > > > Only print the property name when accessing null/undefined if we can > > > convert it to a string without causing side effects. > > > If we can't, omit the property name in the error message. > > > This should avoid confusion when the key is an object with toString(). > > > E.g. undefined[{toString:()=>'a'}] doesn't print 'read property [object > > > Object]' anymore, which was misleading since the property accessed would > > > be 'a', but we can't evaluate the key without side effects. > > > > > > Bug: v8:11365 > > > Change-Id: If82d1adb42561d4851e2bd2ca297a1c71738aee8 > > > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2960211 > > > Reviewed-by: Toon Verwaest > > > Commit-Queue: Patrick Thier > > > Cr-Commit-Position: refs/heads/master@{#75250} > > > > Bug: v8:11365 > > Change-Id: Ie2312337f4f1915faa31528a728d90833d80dbd1 > > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2979599 > > Reviewed-by: Toon Verwaest > > Commit-Queue: Patrick Thier > > Cr-Commit-Position: refs/heads/master@{#75571} > > Bug: v8:11365 > Change-Id: I90360641ecd870bd93247aa6d91dfb0ad049cfb8 > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3008219 > Auto-Submit: Patrick Thier > Commit-Queue: Toon Verwaest > Reviewed-by: Toon Verwaest > Cr-Commit-Position: refs/heads/master@{#75604} Bug: v8:11365 Change-Id: I002b537144f328ccbbdcd655e26e5dc87c49c6f5 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3013935 Reviewed-by: Toon Verwaest Commit-Queue: Patrick Thier Cr-Commit-Position: refs/heads/master@{#75645} --- renderer/test/serial_api_browsertest.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/renderer/test/serial_api_browsertest.cc b/renderer/test/serial_api_browsertest.cc index e4c0c554d78b..2bc094dd4e12 100644 --- a/renderer/test/serial_api_browsertest.cc +++ b/renderer/test/serial_api_browsertest.cc @@ -60,8 +60,8 @@ IN_PROC_BROWSER_TEST_F(SerialAPIBrowserTest, SerialAPIDisabled) { return ports.length; })())"); - EXPECT_TRUE( - result.error.find("Cannot read property 'getPorts' of undefined") != - std::string::npos) + EXPECT_TRUE(result.error.find( + "Cannot read properties of undefined (reading 'getPorts')") != + std::string::npos) << result.error; } From 39a6b9422193b210aa64fedf502a65005f9b517d Mon Sep 17 00:00:00 2001 From: mkarolin Date: Fri, 16 Jul 2021 17:00:10 -0400 Subject: [PATCH 128/205] ExtensionServiceTestBase needs a new dependency. Now uses signin::BuildTestSigninClient, so need to include test_signin_client_builder.h/cc directly into the unit tests build target like it's done upstream. Chromium change: https://chromium.googlesource.com/chromium/src.git/+/579a983 commit 579a9833c2c5ae8d633fe4e775e86a455037494d Author: David Roger Date: Wed Jul 7 11:46:17 2021 +0000 [sync] Add missing call to UpdateAccountsInCookieJarInfoIfNotStale This CL adds the missing call in components/sync/trusted_vault/standalone_trusted_vault_client.cc and updates the unit tests on ChromeOS. Bug: 1148328 --- test/BUILD.gn | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/BUILD.gn b/test/BUILD.gn index c271027c2302..556a315358da 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -136,6 +136,8 @@ test("brave_unit_tests") { "//brave/vendor/brave_base/random_unittest.cc", "//chrome/browser/custom_handlers/test_protocol_handler_registry_delegate.cc", "//chrome/browser/custom_handlers/test_protocol_handler_registry_delegate.h", + "//chrome/browser/signin/test_signin_client_builder.cc", + "//chrome/browser/signin/test_signin_client_builder.h", "//components/bookmarks/browser/bookmark_model_unittest.cc", "//components/sync/base/model_type_unittest.cc", "//components/sync/driver/sync_auth_manager_unittest.cc", From 0021d75620e684bd972c81826e6d79abf453f028 Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 19 Jul 2021 18:40:21 -0400 Subject: [PATCH 129/205] [Android] Changes for modularized toolbar Additionaly fixed: - c-tor signatures for various classes - explicitly added header for network::ResourceRequest Chromuim change: https://chromium.googlesource.com/chromium/src/+/2c6cbee37831bffa83494c98eca09a8ca9def489 Modularize toolbar/ Moves the files in chrome/browser/toolbar (except some glue code) and related resources to chrome/browser/ui/android/toolbar. Bug: 1127732 --- android/brave_java_sources.gni | 7 ++- .../feed/BraveFeedSurfaceCoordinator.java | 6 +-- android/java/apk_for_test.flags | 2 +- .../chrome/browser/app/BraveActivity.java | 12 ++--- .../chrome/browser/ntp/BraveNewTabPage.java | 7 ++- .../browser/toolbar/BraveToolbarManager.java | 5 +- .../BraveMenuButtonCoordinator.java | 5 +- ...ayout.java => BraveToolbarLayoutImpl.java} | 48 +++++++++++-------- .../top/BraveTopToolbarCoordinator.java | 11 ++--- .../chromium/chrome/browser/BytecodeTest.java | 14 +++--- .../toolbar/top/BraveToolbarLayout.java | 28 +++++++++++ .../BraveToolbarLayoutClassAdapter.java | 5 +- .../brave_ads/browser/ads_service_impl.cc | 1 + ...rowser-toolbar-top-ToolbarPhone.java.patch | 6 +-- ...owser-toolbar-top-ToolbarTablet.java.patch | 15 ++---- 15 files changed, 104 insertions(+), 68 deletions(-) rename android/java/org/chromium/chrome/browser/toolbar/top/{BraveToolbarLayout.java => BraveToolbarLayoutImpl.java} (98%) create mode 100644 browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 8ee9c69ca98f..c869bcc20018 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -205,7 +205,7 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinatorPhone.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTPhone.java", - "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/ui/brave_tricks/checkbox_to_switch/CheckBoxPreference.java", "../../brave/android/java/org/chromium/chrome/browser/ui/messages/infobar/BraveSimpleConfirmInfoBarBuilder.java", @@ -288,7 +288,10 @@ brave_components_browser_ui_site_settings_android_java = [ brave_browser_ui_android_appmenu_internal_sources = [ "//brave/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/BraveAppMenu.java" ] -brave_browser_ui_android_toolbar_sources = [ "//brave/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java" ] +brave_browser_ui_android_toolbar_sources = [ + "//brave/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator.java", + "//brave/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java", +] brave_java_base_sources = [ "//brave/android/java/org/chromium/base/BraveCommandLineInitUtil.java", diff --git a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java index 46d2b05ca92f..f07479ae3f11 100644 --- a/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java +++ b/android/feed/core/java/src/org/chromium/chrome/browser/feed/BraveFeedSurfaceCoordinator.java @@ -45,14 +45,14 @@ public BraveFeedSurfaceCoordinator(Activity activity, SnackbarManager snackbarMa boolean isPlaceholderShownInitially, BottomSheetController bottomSheetController, Supplier shareDelegateSupplier, @Nullable ScrollableContainerDelegate externalScrollableContainerDelegate, - TabModelSelector tabModelSelector, @NewTabPageLaunchOrigin int launchOrigin, + @NewTabPageLaunchOrigin int launchOrigin, PrivacyPreferencesManagerImpl privacyPreferencesManager, FeedLaunchReliabilityLoggingState launchReliabilityLoggingState) { super(activity, snackbarManager, windowAndroid, snapScrollHelper, ntpHeader, sectionHeaderView, showDarkBackground, delegate, pageNavigationDelegate, profile, isPlaceholderShownInitially, bottomSheetController, shareDelegateSupplier, - externalScrollableContainerDelegate, tabModelSelector, launchOrigin, - privacyPreferencesManager, launchReliabilityLoggingState); + externalScrollableContainerDelegate, launchOrigin, privacyPreferencesManager, + launchReliabilityLoggingState); } @Override diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index 2dd0d5875d72..d9be0453767d 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -291,7 +291,7 @@ -keep class org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbar --keep class org.chromium.chrome.browser.toolbar.top.BraveToolbarLayout +-keep class org.chromium.chrome.browser.toolbar.top.BraveToolbarLayoutImpl -keep class org.chromium.chrome.browser.toolbar.top.ToolbarPhone diff --git a/android/java/org/chromium/chrome/browser/app/BraveActivity.java b/android/java/org/chromium/chrome/browser/app/BraveActivity.java index 2f9720089af1..ed5ac21a8778 100644 --- a/android/java/org/chromium/chrome/browser/app/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/app/BraveActivity.java @@ -99,7 +99,7 @@ import org.chromium.chrome.browser.tab.TabSelectionType; import org.chromium.chrome.browser.tabmodel.TabModel; import org.chromium.chrome.browser.tabmodel.TabModelUtils; -import org.chromium.chrome.browser.toolbar.top.BraveToolbarLayout; +import org.chromium.chrome.browser.toolbar.top.BraveToolbarLayoutImpl; import org.chromium.chrome.browser.util.BraveDbUtil; import org.chromium.chrome.browser.util.BraveReferrer; import org.chromium.chrome.browser.util.PackageUtils; @@ -555,7 +555,7 @@ public void showOnboardingV2(boolean fromStats) { } public void hideRewardsOnboardingIcon() { - BraveToolbarLayout layout = (BraveToolbarLayout)findViewById(R.id.toolbar); + BraveToolbarLayoutImpl layout = (BraveToolbarLayoutImpl) findViewById(R.id.toolbar); assert layout != null; if (layout != null) { layout.hideRewardsOnboardingIcon(); @@ -655,7 +655,7 @@ public void handleBraveSetDefaultBrowserDialog() { } public void OnRewardsPanelDismiss() { - BraveToolbarLayout layout = (BraveToolbarLayout)findViewById(R.id.toolbar); + BraveToolbarLayoutImpl layout = (BraveToolbarLayoutImpl) findViewById(R.id.toolbar); assert layout != null; if (layout != null) { layout.onRewardsPanelDismiss(); @@ -663,7 +663,7 @@ public void OnRewardsPanelDismiss() { } public void dismissRewardsPanel() { - BraveToolbarLayout layout = (BraveToolbarLayout)findViewById(R.id.toolbar); + BraveToolbarLayoutImpl layout = (BraveToolbarLayoutImpl) findViewById(R.id.toolbar); assert layout != null; if (layout != null) { layout.dismissRewardsPanel(); @@ -671,7 +671,7 @@ public void dismissRewardsPanel() { } public void dismissShieldsTooltip() { - BraveToolbarLayout layout = (BraveToolbarLayout)findViewById(R.id.toolbar); + BraveToolbarLayoutImpl layout = (BraveToolbarLayoutImpl) findViewById(R.id.toolbar); assert layout != null; if (layout != null) { layout.dismissShieldsTooltip(); @@ -679,7 +679,7 @@ public void dismissShieldsTooltip() { } public void openRewardsPanel() { - BraveToolbarLayout layout = (BraveToolbarLayout)findViewById(R.id.toolbar); + BraveToolbarLayoutImpl layout = (BraveToolbarLayoutImpl) findViewById(R.id.toolbar); assert layout != null; if (layout != null) { layout.openRewardsPanel(); diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java index 99f1ba013bd9..c54b45c07caf 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java @@ -55,10 +55,9 @@ public BraveNewTabPage(Activity activity, protected void initializeMainView(Activity activity, WindowAndroid windowAndroid, SnackbarManager snackbarManager, NewTabPageUma uma, boolean isInNightMode, BottomSheetController bottomSheetController, - Supplier shareDelegateSupplier, TabModelSelector tabModelSelector, - String url) { + Supplier shareDelegateSupplier, String url) { super.initializeMainView(activity, windowAndroid, snackbarManager, uma, isInNightMode, - bottomSheetController, shareDelegateSupplier, tabModelSelector, url); + bottomSheetController, shareDelegateSupplier, url); // Override surface provider Profile profile = Profile.fromWebContents(mTab.getWebContents()); @@ -69,7 +68,7 @@ windowAndroid, new SnapScrollHelper(mNewTabPageManager, mNewTabPageLayout), mNewTabPageManager.getNavigationDelegate(), profile, /* isPlaceholderShownInitially= */ false, bottomSheetController, shareDelegateSupplier, /* externalScrollableContainerDelegate= */ null, - tabModelSelector, NewTabPageUtils.decodeOriginFromNtpUrl(url), + NewTabPageUtils.decodeOriginFromNtpUrl(url), PrivacyPreferencesManagerImpl.getInstance(), /* FeedLaunchReliabilityLoggingState */ null); } diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 0dd421a85c63..7650186b43c1 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -18,6 +18,7 @@ import org.chromium.base.ApiCompatibilityUtils; import org.chromium.base.Callback; import org.chromium.base.CallbackController; +import org.chromium.base.jank_tracker.JankTracker; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.base.supplier.OneshotSupplier; @@ -152,7 +153,7 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont @NonNull TabContentManager tabContentManager, @NonNull TabCreatorManager tabCreatorManager, @NonNull OneshotSupplier overviewModeBehaviorSupplier, - @NonNull SnackbarManager snackbarManager) { + @NonNull SnackbarManager snackbarManager, JankTracker jankTracker) { super(activity, controlsSizer, fullscreenManager, controlContainer, compositorViewHolder, urlFocusChangedCallback, topUiThemeColorProvider, tabObscuringHandler, shareDelegateSupplier, identityDiscController, buttonDataProviders, tabProvider, @@ -164,7 +165,7 @@ public BraveToolbarManager(AppCompatActivity activity, BrowserControlsSizer cont isInOverviewModeSupplier, modalDialogManagerSupplier, statusBarColorController, appMenuDelegate, activityLifecycleDispatcher, startSurfaceParentTabSupplier, bottomSheetController, isWarmOnResumeSupplier, tabContentManager, tabCreatorManager, - overviewModeBehaviorSupplier, snackbarManager); + overviewModeBehaviorSupplier, snackbarManager, jankTracker); mOmniboxFocusStateSupplier = omniboxFocusStateSupplier; mLayoutStateProviderSupplier = layoutStateProviderSupplier; mActivity = activity; diff --git a/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java index 5067e64f8139..2ac3e583ea2a 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java @@ -18,7 +18,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.browser_controls.BrowserStateBrowserControlsVisibilityDelegate; import org.chromium.chrome.browser.theme.ThemeColorProvider; -import org.chromium.chrome.browser.toolbar.top.BraveToolbarLayout; +import org.chromium.chrome.browser.toolbar.top.BraveToolbarLayoutImpl; import org.chromium.chrome.browser.ui.appmenu.AppMenuCoordinator; import org.chromium.ui.base.WindowAndroid; import org.chromium.ui.modelutil.PropertyModel; @@ -64,7 +64,8 @@ public void setVisibility(boolean visible) { } private void updateMenuButtonState() { - BraveToolbarLayout layout = (BraveToolbarLayout) mActivity.findViewById(R.id.toolbar); + BraveToolbarLayoutImpl layout = + (BraveToolbarLayoutImpl) mActivity.findViewById(R.id.toolbar); assert layout != null; if (layout != null) { layout.updateMenuButtonState(); diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java similarity index 98% rename from android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java rename to android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java index e57a5757e257..d9266782ab00 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl.java @@ -62,7 +62,6 @@ import org.chromium.chrome.browser.BraveRewardsNativeWorker; import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.BraveRewardsPanelPopup; -import org.chromium.chrome.browser.NavigationPopup.HistoryDelegate; import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.brave_stats.BraveStatsUtil; import org.chromium.chrome.browser.custom_layout.popup_window_tooltip.PopupWindowTooltip; @@ -105,6 +104,7 @@ import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarVariationManager; import org.chromium.chrome.browser.toolbar.menu_button.BraveMenuButtonCoordinator; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; +import org.chromium.chrome.browser.toolbar.top.NavigationPopup.HistoryDelegate; import org.chromium.chrome.browser.toolbar.top.ToolbarLayout; import org.chromium.chrome.browser.toolbar.top.ToolbarTablet.OfflineDownloader; import org.chromium.chrome.browser.util.PackageUtils; @@ -126,9 +126,9 @@ import java.util.List; import java.util.Locale; -public abstract class BraveToolbarLayout extends ToolbarLayout - implements OnClickListener, View.OnLongClickListener, BraveRewardsObserver, - BraveRewardsNativeWorker.PublisherObserver { +public abstract class BraveToolbarLayoutImpl extends ToolbarLayout + implements BraveToolbarLayout, OnClickListener, View.OnLongClickListener, + BraveRewardsObserver, BraveRewardsNativeWorker.PublisherObserver { public static final String PREF_HIDE_BRAVE_REWARDS_ICON = "hide_brave_rewards_icon"; private static final String JAPAN_COUNTRY_CODE = "JP"; private static final long MB_10 = 10000000; @@ -162,7 +162,7 @@ public abstract class BraveToolbarLayout extends ToolbarLayout private boolean mIsBottomToolbarVisible; - public BraveToolbarLayout(Context context, AttributeSet attrs) { + public BraveToolbarLayoutImpl(Context context, AttributeSet attrs) { super(context, attrs); } @@ -183,7 +183,7 @@ void destroy() { protected void onFinishInflate() { super.onFinishInflate(); - if (this instanceof ToolbarTablet) { + if (BraveReflectionUtil.EqualTypes(this.getClass(), ToolbarTablet.class)) { ImageButton forwardButton = findViewById(R.id.forward_button); if (forwardButton != null) { final Drawable forwardButtonDrawable = UiUtils.getTintedDrawable(getContext(), @@ -841,10 +841,6 @@ public void hideRewardsOnboardingIcon() { } @Override - public void onClick(View v) { - onClickImpl(v); - } - public void onClickImpl(View v) { if (mBraveShieldsHandler == null) { assert false; @@ -883,6 +879,11 @@ public void onClickImpl(View v) { } } + @Override + public void onClick(View v) { + onClickImpl(v); + } + private boolean checkForRewardsOnboarding() { return PackageUtils.isFirstInstall(getContext()) && !BraveAdsNativeHelper.nativeIsBraveAdsEnabled( @@ -911,7 +912,7 @@ private void showShieldsMenu(View mBraveShieldsButton) { } @Override - public boolean onLongClick(View v) { + public boolean onLongClickImpl(View v) { // Use null as the default description since Toast.showAnchoredToast // will return false if it is null. String description = null; @@ -929,6 +930,11 @@ public boolean onLongClick(View v) { return Toast.showAnchoredToast(context, v, description); } + @Override + public boolean onLongClick(View v) { + return onLongClickImpl(v); + } + @Override public void onUrlFocusChange(boolean hasFocus) { Context context = getContext(); @@ -944,7 +950,8 @@ public void onUrlFocusChange(boolean hasFocus) { super.onUrlFocusChange(hasFocus); } - public void populateUrlAnimatorSet(boolean showExpandedState, + @Override + public void populateUrlAnimatorSetImpl(boolean showExpandedState, int urlFocusToolbarButtonsDuration, int urlClearFocusTabStackDelayMs, List animators) { if (mBraveShieldsButton != null) { @@ -981,10 +988,7 @@ public void populateUrlAnimatorSet(boolean showExpandedState, } } - private void updateModernLocationBarColor(int color) { - updateModernLocationBarColorImpl(color); - } - + @Override public void updateModernLocationBarColorImpl(int color) { if (mShieldsLayout != null && mShieldsLayoutIsColorBackground) { mShieldsLayout.setBackgroundColor( @@ -999,7 +1003,8 @@ public void updateModernLocationBarColorImpl(int color) { } } - public int getBoundsAfterAccountingForRightButtons(ViewGroup toolbarButtonsContainer) { + @Override + public int getBoundsAfterAccountingForRightButtonsImpl(ViewGroup toolbarButtonsContainer) { if (toolbarButtonsContainer == null || mShieldsLayout == null) { assert false; return 0; @@ -1186,7 +1191,7 @@ private void updateNotificationBadgeForNewInstall() { public void onThemeColorChanged(int color, boolean shouldAnimate) { final int textBoxColor = ThemeUtils.getTextBoxColorForToolbarBackgroundInNonNativePage( getContext().getResources(), color, isIncognito()); - updateModernLocationBarColor(textBoxColor); + updateModernLocationBarColorImpl(textBoxColor); } /** @@ -1232,7 +1237,10 @@ && getMenuButtonCoordinator() != null) { } private void updateShieldsLayoutBackground(boolean rounded) { - if (!(this instanceof ToolbarTablet) || (mShieldsLayout == null)) return; + if (!BraveReflectionUtil.EqualTypes(this.getClass(), ToolbarTablet.class) + || (mShieldsLayout == null)) { + return; + } if (rounded) { mShieldsLayout.setBackgroundDrawable( @@ -1244,7 +1252,7 @@ private void updateShieldsLayoutBackground(boolean rounded) { ChromeColors.getDefaultThemeColor(getContext().getResources(), isIncognito())); mShieldsLayoutIsColorBackground = true; } - updateModernLocationBarColor(mCurrentToolbarColor); + updateModernLocationBarColorImpl(mCurrentToolbarColor); } private boolean isTabSwitcherOnBottom() { diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java index 3e467af87af6..774ca0975644 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -13,7 +13,6 @@ import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; -import org.chromium.chrome.browser.NavigationPopup.HistoryDelegate; import org.chromium.chrome.browser.identity_disc.IdentityDiscController; import org.chromium.chrome.browser.layouts.LayoutStateProvider; import org.chromium.chrome.browser.tabmodel.TabModelSelector; @@ -23,6 +22,7 @@ import org.chromium.chrome.browser.toolbar.ToolbarDataProvider; import org.chromium.chrome.browser.toolbar.ToolbarTabController; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; +import org.chromium.chrome.browser.toolbar.top.NavigationPopup.HistoryDelegate; import org.chromium.chrome.browser.toolbar.top.ToolbarTablet.OfflineDownloader; import org.chromium.chrome.browser.ui.appmenu.AppMenuButtonHelper; import org.chromium.chrome.browser.user_education.UserEducationHelper; @@ -53,7 +53,6 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, ObservableSupplier homepageManagedByPolicySupplier, ObservableSupplier identityDiscStateSupplier, Callback invalidatorCallback, Supplier identityDiscButtonSupplier, - OneshotSupplier startSurfaceSupplier, Supplier resourceManagerSupplier, BooleanSupplier isInVrSupplier, BooleanSupplier isIncognitoModeEnabledSupplier, boolean isGridTabSwitcherEnabled, boolean isTabToGtsAnimationEnabled, boolean isStartSurfaceEnabled, @@ -66,9 +65,8 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, appMenuButtonHelperSupplier, tabModelSelectorSupplier, homepageEnabledSupplier, startSurfaceAsHomepageSupplier, homepageManagedByPolicySupplier, identityDiscStateSupplier, invalidatorCallback, identityDiscButtonSupplier, - startSurfaceSupplier, resourceManagerSupplier, isInVrSupplier, - isIncognitoModeEnabledSupplier, isGridTabSwitcherEnabled, - isTabToGtsAnimationEnabled, isStartSurfaceEnabled, + resourceManagerSupplier, isInVrSupplier, isIncognitoModeEnabledSupplier, + isGridTabSwitcherEnabled, isTabToGtsAnimationEnabled, isStartSurfaceEnabled, isTabGroupsAndroidContinuationEnabled, historyDelegate, partnerHomepageEnabledSupplier, offlineDownloader); @@ -87,7 +85,8 @@ public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, public void onBottomToolbarVisibilityChanged(boolean isVisible) { if (mBraveToolbarLayout instanceof BraveToolbarLayout) { - ((BraveToolbarLayout) mBraveToolbarLayout).onBottomToolbarVisibilityChanged(isVisible); + ((BraveToolbarLayoutImpl) mBraveToolbarLayout) + .onBottomToolbarVisibilityChanged(isVisible); } if (mTabSwitcherModeCoordinatorPhone instanceof BraveTabSwitcherModeTTCoordinatorPhone) { ((BraveTabSwitcherModeTTCoordinatorPhone) mTabSwitcherModeCoordinatorPhone) diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index ad6e87852e08..e3d9b5bda33d 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -25,7 +25,6 @@ import org.chromium.base.supplier.ObservableSupplierImpl; import org.chromium.base.supplier.OneshotSupplier; import org.chromium.base.supplier.Supplier; -import org.chromium.chrome.browser.NavigationPopup.HistoryDelegate; import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; @@ -58,6 +57,7 @@ import org.chromium.chrome.browser.toolbar.ToolbarManager; import org.chromium.chrome.browser.toolbar.ToolbarTabController; import org.chromium.chrome.browser.toolbar.menu_button.MenuButtonCoordinator; +import org.chromium.chrome.browser.toolbar.top.NavigationPopup.HistoryDelegate; import org.chromium.chrome.browser.toolbar.top.ToolbarActionModeCallback; import org.chromium.chrome.browser.toolbar.top.ToolbarControlContainer; import org.chromium.chrome.browser.toolbar.top.ToolbarLayout; @@ -334,7 +334,7 @@ public void testConstructorsExistAndMatch() throws Exception { StatusBarColorController.class, AppMenuDelegate.class, ActivityLifecycleDispatcher.class, Supplier.class, BottomSheetController.class, Supplier.class, TabContentManager.class, TabCreatorManager.class, - OneshotSupplier.class, SnackbarManager.class)); + OneshotSupplier.class, SnackbarManager.class, JankTracker.class)); Assert.assertTrue(constructorsMatch( "org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator", "org/chromium/chrome/browser/toolbar/bottom/BraveBottomControlsMediator", @@ -394,8 +394,8 @@ public void testConstructorsExistAndMatch() throws Exception { MenuButtonCoordinator.class, MenuButtonCoordinator.class, ObservableSupplier.class, ObservableSupplier.class, ObservableSupplier.class, ObservableSupplier.class, ObservableSupplier.class, ObservableSupplier.class, Callback.class, Supplier.class, - OneshotSupplier.class, Supplier.class, BooleanSupplier.class, BooleanSupplier.class, - boolean.class, boolean.class, boolean.class, boolean.class, HistoryDelegate.class, + Supplier.class, BooleanSupplier.class, BooleanSupplier.class, boolean.class, + boolean.class, boolean.class, boolean.class, HistoryDelegate.class, BooleanSupplier.class, OfflineDownloader.class)); Assert.assertTrue(constructorsMatch( "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator", @@ -574,9 +574,11 @@ public void testSuperNames() throws Exception { "org/chromium/chrome/browser/suggestions/tile/BraveTileView")); Assert.assertTrue(checkSuperName( "org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar", - "org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout")); + "org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl")); Assert.assertTrue(checkSuperName("org/chromium/chrome/browser/toolbar/top/ToolbarPhone", - "org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout")); + "org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl")); + Assert.assertTrue(checkSuperName("org/chromium/chrome/browser/toolbar/top/ToolbarTablet", + "org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl")); Assert.assertTrue(checkSuperName( "org/chromium/chrome/browser/compositor/layouts/LayoutManagerChromePhone", "org/chromium/chrome/browser/compositor/layouts/BraveLayoutManagerChrome")); diff --git a/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java new file mode 100644 index 000000000000..9aada170522a --- /dev/null +++ b/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -0,0 +1,28 @@ +/* Copyright (c) 2021 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.toolbar.top; + +import android.animation.Animator; +import android.content.Context; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewGroup; + +import java.util.List; + +public interface BraveToolbarLayout { + public void onClickImpl(View v); + + public boolean onLongClickImpl(View v); + + public void updateModernLocationBarColorImpl(int color); + + public int getBoundsAfterAccountingForRightButtonsImpl(ViewGroup toolbarButtonsContainer); + + public void populateUrlAnimatorSetImpl(boolean showExpandedState, + int urlFocusToolbarButtonsDuration, int urlClearFocusTabStackDelayMs, + List animators); +} diff --git a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarLayoutClassAdapter.java b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarLayoutClassAdapter.java index 3d7560413871..5b0f1fd194e9 100644 --- a/build/android/bytecode/java/org/brave/bytecode/BraveToolbarLayoutClassAdapter.java +++ b/build/android/bytecode/java/org/brave/bytecode/BraveToolbarLayoutClassAdapter.java @@ -11,13 +11,16 @@ public class BraveToolbarLayoutClassAdapter extends BraveClassVisitor { static String sCustomTabToolbarClassName = "org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbar"; static String sToolbarPhoneClassName = "org/chromium/chrome/browser/toolbar/top/ToolbarPhone"; + static String sToolbarTabletClassName = "org/chromium/chrome/browser/toolbar/top/ToolbarTablet"; static String sBraveToolbarLayoutClassName = - "org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout"; + "org/chromium/chrome/browser/toolbar/top/BraveToolbarLayoutImpl"; public BraveToolbarLayoutClassAdapter(ClassVisitor visitor) { super(visitor); changeSuperName(sCustomTabToolbarClassName, sBraveToolbarLayoutClassName); changeSuperName(sToolbarPhoneClassName, sBraveToolbarLayoutClassName); + + changeSuperName(sToolbarTabletClassName, sBraveToolbarLayoutClassName); } } diff --git a/components/brave_ads/browser/ads_service_impl.cc b/components/brave_ads/browser/ads_service_impl.cc index 888135c5c45e..4f1b543747e6 100644 --- a/components/brave_ads/browser/ads_service_impl.cc +++ b/components/brave_ads/browser/ads_service_impl.cc @@ -86,6 +86,7 @@ #include "content/public/browser/service_process_host.h" #include "content/public/browser/storage_partition.h" #include "net/base/network_change_notifier.h" +#include "services/network/public/cpp/resource_request.h" #include "services/network/public/cpp/shared_url_loader_factory.h" #include "services/network/public/cpp/simple_url_loader.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index 2a1b66c93feb..07e2e498b312 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index a41e088b95a2900daa15513f399dbd276ca084f9..7448905d9ee4fb47415d6267fc89d0a02367e0dc 100644 +index a41e088b95a2900daa15513f399dbd276ca084f9..a170d8d74392fd20c295057af4173c50ac3d1a86 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java @@ -406,6 +406,7 @@ public class ToolbarPhone extends ToolbarLayout implements OnClickListener, TabC @@ -22,7 +22,7 @@ index a41e088b95a2900daa15513f399dbd276ca084f9..7448905d9ee4fb47415d6267fc89d0a0 * @return The right bounds of the location bar after accounting for any visible left buttons. */ private int getBoundsAfterAccountingForRightButtons() { -+ if (true) return Math.max(mToolbarSidePadding, BraveToolbarLayout.class.cast(this).getBoundsAfterAccountingForRightButtons(mToolbarButtonsContainer)); ++ if (true) return Math.max(mToolbarSidePadding, BraveToolbarLayout.class.cast(this).getBoundsAfterAccountingForRightButtonsImpl(mToolbarButtonsContainer)); return Math.max(mToolbarSidePadding, mToolbarButtonsContainer.getMeasuredWidth()); } @@ -30,7 +30,7 @@ index a41e088b95a2900daa15513f399dbd276ca084f9..7448905d9ee4fb47415d6267fc89d0a0 } else { populateUrlClearExpansionAnimatorSet(animators); } -+ BraveToolbarLayout.class.cast(this).populateUrlAnimatorSet(showExpandedState, URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS, URL_CLEAR_FOCUS_TABSTACK_DELAY_MS, animators); ++ BraveToolbarLayout.class.cast(this).populateUrlAnimatorSetImpl(showExpandedState, URL_FOCUS_TOOLBAR_BUTTONS_DURATION_MS, URL_CLEAR_FOCUS_TABSTACK_DELAY_MS, animators); mUrlFocusLayoutAnimator = new AnimatorSet(); mUrlFocusLayoutAnimator.playTogether(animators); diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch index 9db5c78f858d..c7bb8e0c8a04 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch @@ -1,26 +1,17 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -index e14c4ffdd2c20e6b3f673066b22512b18e65bb0c..06fa5bcf8ccbf0fe86f9572646693f7d2ff21cb7 100644 +index e14c4ffdd2c20e6b3f673066b22512b18e65bb0c..bc63c6c68a60e46010906c545aa622640ad02b38 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -@@ -59,7 +59,7 @@ import java.util.Collection; - * The Toolbar object for Tablet screens. - */ - @SuppressLint("Instantiatable") --public class ToolbarTablet extends ToolbarLayout -+public class ToolbarTablet extends BraveToolbarLayout - implements OnClickListener, View.OnLongClickListener, TabCountObserver { - /** Downloads page for offline access. */ - public interface OfflineDownloader { @@ -326,10 +326,12 @@ public class ToolbarTablet extends ToolbarLayout mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab()); RecordUserAction.record("MobileToolbarDownloadPage"); } -+ super.onClick(v); ++ BraveToolbarLayout.class.cast(this).onClickImpl(v); } @Override public boolean onLongClick(View v) { -+ if (super.onLongClick(v)) return true; ++ if (BraveToolbarLayout.class.cast(this).onLongClickImpl(v)) return true; String description = null; Context context = getContext(); Resources resources = context.getResources(); From 8a49a29d19b36db39773a2fff6db8ee4d81fcb4f Mon Sep 17 00:00:00 2001 From: samartnik Date: Tue, 20 Jul 2021 13:39:00 -0400 Subject: [PATCH 130/205] [Android] Changed base app color Chromium change: https://chromium.googlesource.com/chromium/src/+/296e58b25a68baf8bf044234555c7bd157d5d761 [GMNext][TabSwitcher] Change selection style to material next Disabled: Selected tab will have a hairline drawable foreground; Enabled: Selected tab will be tinted into primary color. Color in incognito mode will be using the ones for dark mode, and will not support dynamic colors. (The update for thumbnail is not included in this CL) Spec see original bug attached. Bug: 1217141 --- android/java/res/values/brave_colors.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/android/java/res/values/brave_colors.xml b/android/java/res/values/brave_colors.xml index 155cdb4b8d68..67587005d387 100644 --- a/android/java/res/values/brave_colors.xml +++ b/android/java/res/values/brave_colors.xml @@ -9,11 +9,16 @@ + #F9C3B6 + @color/modern_blue_300 + @color/modern_blue_300 + @color/modern_blue_600 + @color/modern_blue_700 + #4D000000 + #80000000 #FF7654 #EA3A0D #C22700 - #4D000000 - #80000000 #fb542b From 9158e4ea79afe3b286cee2bf93660b31e961b24d Mon Sep 17 00:00:00 2001 From: Pete Miller Date: Wed, 21 Jul 2021 00:30:39 -0700 Subject: [PATCH 131/205] Polymer overriding supports direct PolymerElement subclassing --- ui/webui/resources/polymer_overriding.js | 89 +++++++++++++++--------- 1 file changed, 56 insertions(+), 33 deletions(-) diff --git a/ui/webui/resources/polymer_overriding.js b/ui/webui/resources/polymer_overriding.js index 0b598aea1d32..9a76e016f531 100644 --- a/ui/webui/resources/polymer_overriding.js +++ b/ui/webui/resources/polymer_overriding.js @@ -3,7 +3,7 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at http://mozilla.org/MPL/2.0/. -import {Polymer, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +import {mixinBehaviors, Polymer, PolymerElement} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; // Global overrides import CrButtonStyleTemplate from './overrides/cr_button.js' @@ -21,7 +21,7 @@ const allBehaviorsMap = {} const allPropertiesMap = {} const componentPropertyModifications = {} -function addBraveBehaviors(moduleName, component) { +function addBraveBehaviorsLegacy(moduleName, component) { if (allBehaviorsMap[moduleName]) { component.behaviors = component.behaviors || [] component.behaviors.push(...allBehaviorsMap[moduleName]) @@ -60,9 +60,7 @@ function addBraveTemplateModifications(moduleName, component, modifyFn) { const styleOverridePrefix = 'brave-override-style-' -function addBraveStyleOverride(moduleName, component) { - // does have template style element? - const template = component.template || component._template +function addBraveStyleOverride(moduleName, component, template = component.template || component._template) { if (!template) { console.error(`No template found for component (${moduleName}) with found style overrides`, component) return @@ -198,32 +196,9 @@ export function OverrideIronIcons(iconSetName, overridingIconSetName, iconOverri srcIconSet.getIconNames() } -function PerformBraveModifications(name, component) { - if (debug) { - console.debug(`Polymer component registering: ${name}`, component) - } - addBraveBehaviors(name, component) - addBraveProperties(name, component) - const templateModifyFn = allBraveTemplateModificationsMap[name] - if (templateModifyFn) { - addBraveTemplateModifications(name, component, templateModifyFn) - delete allBraveTemplateModificationsMap[name] - } - if (moduleNamesWithStyleOverrides.includes(name)) { - addBraveStyleOverride(name, component) - } -} - -// TODO(petemill): Overriding Polymer.Class only works because -// chromium components at the moment are passing objects rather -// than classes. If this changes, or for something more robust, -// we can instead hook in to `window.customElements.define`. This -// will require changing how we inject behaviors to instead return a -// subclass of the original component, with the lifecycle methods added. -// That's because behaviors are a legacy polymer feature, -// now migrated to subclassing. -// That should work for any type of Polymer component (class or -// object-to-generated-class). +// Overriding Polymer.Class only works for some +// chromium components which call Polymer() and pass objects rather +// than classes. const oldClass = Polymer.Class Polymer.Class = function (info, mixin) { if (!info) { @@ -237,12 +212,60 @@ Polymer.Class = function (info, mixin) { return oldClass(info, mixin) } if (debug) { - console.log('defined', name) + console.debug(`Polymer component legacy registering: ${name}`, info) } - PerformBraveModifications(name, info) + addBraveBehaviorsLegacy(name, info) return oldClass(info, mixin) } +// Also override for components which do not call Polymer() but instead +// inherit from PolymerElement. +const oldPrepareTemplate = PolymerElement._prepareTemplate; +PolymerElement._prepareTemplate = function BravePolymer_PrepareTemplate() { + oldPrepareTemplate.call(this) + const name = this.is + if (!name) { + if (debug) { + console.warn('PolymerElement defined with no name', this, this.prototype) + } + return + } + if (debug) { + console.log('PolymerElement defined: ', name, this, this.prototype) + } + // Perform modifications that we want to change the original class / prototype + // features, such as editing template or properties. + // Other modifications, such as injecting overriden classes (aka behaviors), + // will happen at component definition time. + addBraveProperties(name, this.prototype) + const templateModifyFn = allBraveTemplateModificationsMap[name] + if (templateModifyFn) { + addBraveTemplateModifications(name, this.prototype, templateModifyFn) + delete allBraveTemplateModificationsMap[name] + } + if (moduleNamesWithStyleOverrides.includes(name)) { + addBraveStyleOverride(name, this.prototype) + } +} + +const oldDefine = window.customElements.define +window.customElements.define = function BraveDefineCustomElements (name, component, options) { + if (component.polymerElementVersion) { + if (debug) { + console.log('BraveDefineCustomElements PolymerElement defined', name, component, options) + } + // Inject behaviors + if (allBehaviorsMap[name]) { + if (debug) { + console.log('BraveDefineCustomElements added behavior', allBehaviorsMap[name]) + } + component = mixinBehaviors(allBehaviorsMap[name], component) + delete allBehaviorsMap[name] + } + } + oldDefine.call(this, name, component, options) +} + // Overrides for all pages RegisterStyleOverride('cr-toggle', CrToggleStyleTemplate) RegisterStyleOverride('cr-button', CrButtonStyleTemplate) From ec0eed48292ecfb645b28d89d5e59afb3f680097 Mon Sep 17 00:00:00 2001 From: Pete Miller Date: Wed, 21 Jul 2021 01:38:27 -0700 Subject: [PATCH 132/205] Polymer overriding - replace cr-toolbar with br-toolbar always, without patching --- .../resources/page/brave_rewards_page.html | 2 +- ...owser-resources-bookmarks-toolbar.ts.patch | 13 - ...owser-resources-downloads-toolbar.ts.patch | 12 - ...wser-resources-extensions-manager.ts.patch | 12 - ...wser-resources-extensions-toolbar.ts.patch | 13 - ...resources-history-history_toolbar.ts.patch | 13 - ...-settings-settings_ui-settings_ui.js.patch | 13 - ui/webui/resources/BUILD.gn | 2 + ui/webui/resources/br_elements/BUILD.gn | 3 +- .../resources/br_elements/br_toolbar/BUILD.gn | 19 +- .../br_elements/br_toolbar/br_toolbar.html | 364 +++++++++--------- .../br_elements/br_toolbar/br_toolbar.js | 7 + .../br_toolbar/br_toolbar_search_field.html | 293 +++++++------- .../br_toolbar/br_toolbar_search_field.js | 5 +- ui/webui/resources/br_elements_resources.grdp | 17 - ui/webui/resources/polymer_overriding.js | 11 +- 16 files changed, 350 insertions(+), 449 deletions(-) delete mode 100644 patches/chrome-browser-resources-bookmarks-toolbar.ts.patch delete mode 100644 patches/chrome-browser-resources-downloads-toolbar.ts.patch delete mode 100644 patches/chrome-browser-resources-extensions-manager.ts.patch delete mode 100644 patches/chrome-browser-resources-extensions-toolbar.ts.patch delete mode 100644 patches/chrome-browser-resources-history-history_toolbar.ts.patch delete mode 100644 patches/chrome-browser-resources-settings-settings_ui-settings_ui.js.patch diff --git a/components/brave_rewards/resources/page/brave_rewards_page.html b/components/brave_rewards/resources/page/brave_rewards_page.html index ce147f179e77..e4dde8d78fc6 100644 --- a/components/brave_rewards/resources/page/brave_rewards_page.html +++ b/components/brave_rewards/resources/page/brave_rewards_page.html @@ -8,7 +8,7 @@ - + -

- - - \ No newline at end of file + + diff --git a/ui/webui/resources/br_elements/br_toolbar/br_toolbar.js b/ui/webui/resources/br_elements/br_toolbar/br_toolbar.js index 8da4d19e1b3b..80a9bbd1984b 100644 --- a/ui/webui/resources/br_elements/br_toolbar/br_toolbar.js +++ b/ui/webui/resources/br_elements/br_toolbar/br_toolbar.js @@ -2,6 +2,11 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at http://mozilla.org/MPL/2.0/. +import {Polymer, html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; +import 'chrome://resources/polymer/v3_0/iron-media-query/iron-media-query.js'; +import 'chrome://brave-resources/br_elements/shared_vars_css.m.js'; +import './br_toolbar_search_field.m.js'; + const customCurrentWebUINameMap = { extensions: 'settings', sync: 'settings', @@ -10,6 +15,8 @@ const customCurrentWebUINameMap = { Polymer({ is: 'cr-toolbar', + _template: html`{__html_template__}`, + properties: { // Name to display in the toolbar, in titlecase. pageName: String, diff --git a/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.html b/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.html index 701e180f4885..06531b5ff51f 100644 --- a/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.html +++ b/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.html @@ -1,163 +1,154 @@ + - .page-search_text:focus, .page-search_text:active { - outline: none; - border: none; - } - - .page-search_close-button { - margin: var(--search-padding); - cursor: pointer; - display: flex; - align-items: center; - } - .page-search_close-button svg { - height: var(--search-icon-size); - width: var(--search-icon-size); - padding: var(--search-icon-padding); - } - - - +
+ +
+ + -
- -
- - -
-
- - - - +
+
diff --git a/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.js b/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.js index 5c6af950d3ff..8695099e504b 100644 --- a/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.js +++ b/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.js @@ -3,11 +3,14 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this file, // you can obtain one at http://mozilla.org/MPL/2.0/. +import {Polymer, html} from 'chrome://resources/polymer/v3_0/polymer/polymer_bundled.min.js'; import {CrSearchFieldBehavior} from 'chrome://resources/cr_elements/cr_search_field/cr_search_field_behavior.js'; Polymer({ is: 'br-toolbar-search-field', + _template: html`{__html_template__}`, + behaviors: [CrSearchFieldBehavior], properties: { @@ -166,4 +169,4 @@ Polymer({ this.setValue('') this.getSearchInput().blur() }, -}) +}); diff --git a/ui/webui/resources/br_elements_resources.grdp b/ui/webui/resources/br_elements_resources.grdp index 9a215780e498..8282a0647e89 100644 --- a/ui/webui/resources/br_elements_resources.grdp +++ b/ui/webui/resources/br_elements_resources.grdp @@ -8,23 +8,6 @@ file="br_elements/shared_vars_css.html" type="chrome_html" compress="gzip" /> - - - - Date: Wed, 21 Jul 2021 12:32:44 +0200 Subject: [PATCH 133/205] Update remaining references to br_toolbar.m.js to br_toolbar.js instead This was breaking the following 37 tests because of not being able to find br_toolbar.m.js in the Brave resources map used for testing: * BraveContentBrowserClientTest.CanLoadCustomBravePages * RewardsBrowserTest.BackupRestoreModalHasNoNotice * RewardsBrowserTest.ResetRewards * RewardsBrowserTest.ShowACPercentInThePanel * RewardsContributionBrowserTest.AutoContributeWhenACOff * RewardsContributionBrowserTest.AutoContribution * RewardsContributionBrowserTest.AutoContributionMultiplePublishers * RewardsContributionBrowserTest.AutoContributionMultiplePublishersUphold * RewardsContributionBrowserTest.CheckIfReconcileWasReset * RewardsContributionBrowserTest.CheckIfReconcileWasResetACOff * RewardsContributionBrowserTest.MultipleRecurringOverBudgetAndPartialAutoContribution * RewardsContributionBrowserTest.PanelMonthlyTipActions * RewardsContributionBrowserTest.PanelMonthlyTipAmount * RewardsContributionBrowserTest.PendingContributionTip * RewardsContributionBrowserTest.ProcessPendingContributions * RewardsContributionBrowserTest.RecurringAndPartialAutoContribution * RewardsContributionBrowserTest.SplitProcessOneTimeTip * RewardsContributionBrowserTest.SplitProcessorAutoContribution * RewardsContributionBrowserTest.TipConnectedPublisherAnon * RewardsContributionBrowserTest.TipConnectedPublisherAnonAndConnected * RewardsContributionBrowserTest.TipConnectedPublisherConnected * RewardsContributionBrowserTest.TipNonIntegralAmount * RewardsContributionBrowserTest.TipVerifiedPublisher * RewardsContributionBrowserTest.TipWithVerifiedWallet * RewardsContributionBrowserTest.RecurringTipNonIntegralAmount * RewardsNotificationBrowserTest.InsufficientNotificationForACNotEnoughFunds * RewardsNotificationBrowserTest.InsufficientNotificationForInsufficientAmount * RewardsNotificationBrowserTest.InsufficientNotificationForVerifiedInsufficientAmount * RewardsP3ABrowserTest.WalletBalanceLessThan10BAT * RewardsP3ABrowserTest.WalletBalanceLessThan50BAT * RewardsP3ABrowserTest.WalletBalanceMoreThan50BAT * RewardsP3ABrowserTest.WalletStateWalletCreatedGrantsClaimedFundsAdded * RewardsP3ABrowserTest.WalletStateWalletCreatedGrantsClaimedNoFundsAdded * RewardsP3ABrowserTest.WalletStateWalletCreatedNoGrantsClaimedFundsAdded * RewardsPublisherBrowserTest.VisitRegisteredPublisher * RewardsPublisherBrowserTest.VisitUnverifiedPublisher * RewardsPublisherBrowserTest.VisitVerifiedPublisher --- .../ethereum_remote_client/ethereum_remote_client_page.html | 2 +- components/brave_wallet_ui/page/wallet_page.html | 2 +- ui/webui/resources/br_elements_resources_v3.grdp | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/ui/webui/ethereum_remote_client/ethereum_remote_client_page.html b/browser/ui/webui/ethereum_remote_client/ethereum_remote_client_page.html index ec212517abfa..e8b232d1a078 100644 --- a/browser/ui/webui/ethereum_remote_client/ethereum_remote_client_page.html +++ b/browser/ui/webui/ethereum_remote_client/ethereum_remote_client_page.html @@ -9,7 +9,7 @@ - +