From 2b3c64c65eaa7adbc731448f45172bebc258a448 Mon Sep 17 00:00:00 2001 From: mkarolin Date: Wed, 18 Sep 2019 22:57:56 -0400 Subject: [PATCH 01/69] Upgrade patches from Chromium 77.0.3865.75 to Chromium 78.0.3904.44 --- ...iew-browser-aw_permission_manager.cc.patch | 2 +- ...roxying_restricted_cookie_manager.cc.patch | 91 ---------- ...proxying_restricted_cookie_manager.h.patch | 39 ---- patches/build-config-BUILDCONFIG.gn.patch | 2 +- patches/build-config-android-BUILD.gn.patch | 2 +- patches/build-config-android-config.gni.patch | 2 +- patches/chrome-BUILD.gn.patch | 36 ++-- patches/chrome-VERSION.patch | 8 +- patches/chrome-android-BUILD.gn.patch | 12 +- ...e-android-java-res-values-dimens.xml.patch | 4 +- ...e-android-java-res-values-styles.xml.patch | 10 ++ ...droid-java-res-values-v17-styles.xml.patch | 10 -- ...me-browser-ChromeTabbedActivity.java.patch | 16 +- ...erences-ChromePreferenceManager.java.patch | 2 +- ...ser-preferences-MainPreferences.java.patch | 2 +- ...website-SiteSettingsPreferences.java.patch | 4 +- ...-browser-toolbar-ToolbarManager.java.patch | 8 +- ...ottom-BottomControlsCoordinator.java.patch | 4 +- ...rowser-toolbar-top-ToolbarPhone.java.patch | 8 +- ...e-browser-util-FeatureUtilities.java.patch | 6 +- patches/chrome-app-BUILD.gn.patch | 8 +- ...-app-chrome_crash_reporter_client.cc.patch | 4 +- patches/chrome-app-chrome_dll.rc.patch | 2 +- patches/chrome-browser-BUILD.gn.patch | 4 +- patches/chrome-browser-about_flags.cc.patch | 4 +- ...hrome-browser-browser_process_impl.h.patch | 4 +- ...wser-chrome_content_browser_client.h.patch | 2 +- ...ngs-tab_specific_content_settings.cc.patch | 6 +- ...rivate-webrtc_logging_private_api.cc.patch | 2 +- ...rowser-extensions-component_loader.h.patch | 6 +- ...r-extensions-extension_management.cc.patch | 4 +- ...owser-extensions-extension_service.h.patch | 4 +- ...rotocol-external_protocol_handler.cc.patch | 4 +- ...rowser-first_run-upgrade_util_win.cc.patch | 14 +- ...-external_process_importer_client.cc.patch | 4 +- ...r-external_process_importer_client.h.patch | 4 +- ...me-browser-importer-importer_list.cc.patch | 2 +- ...porter-in_process_importer_bridge.cc.patch | 2 +- ...-webrtc-webrtc_event_log_uploader.cc.patch | 2 +- ...-media-webrtc-webrtc_log_uploader.cc.patch | 6 +- ...e_metrics_services_manager_client.cc.patch | 4 +- ...et-system_network_context_manager.cc.patch | 4 +- ...otification_platform_bridge_linux.cc.patch | 4 +- ...-notification_platform_bridge_mac.mm.patch | 2 +- ...er-permissions-permission_manager.cc.patch | 18 +- ...ser-permissions-permission_manager.h.patch | 6 +- ...ser-permissions-permission_request.h.patch | 2 +- ...ermissions-permission_request_impl.h.patch | 6 +- ...gins-chrome_plugin_service_filter.cc.patch | 4 +- ...hrome-browser-prefs-browser_prefs.cc.patch | 6 +- ...resetter-brandcode_config_fetcher.cc.patch | 2 +- ...le_resetter-reset_report_uploader.cc.patch | 2 +- .../chrome-browser-profiles-profile.cc.patch | 2 +- ...profiles-profile_avatar_icon_util.cc.patch | 8 +- ...ome-browser-profiles-profile_impl.cc.patch | 12 +- ...rome-browser-profiles-profile_impl.h.patch | 8 +- ...-browser-profiles-profile_io_data.cc.patch | 4 +- ...e-browser-profiles-profile_manager.h.patch | 8 +- ...me-browser-profiles-profile_window.h.patch | 2 +- ...aging-push_messaging_service_impl.cc.patch | 2 +- ...text_menu-render_view_context_menu.h.patch | 4 +- ..._host-chrome_render_message_filter.h.patch | 4 +- ...sources-bookmarks-command_manager.js.patch | 4 +- ...rowser-resources-extensions-BUILD.gn.patch | 2 +- ...er-resources-extensions-manager.html.patch | 6 +- ...er-resources-extensions-toolbar.html.patch | 4 +- ...s-local_discovery-local_discovery.js.patch | 6 +- ...-browser-resources-settings-BUILD.gn.patch | 2 +- ...-settings-about_page-about_page.html.patch | 4 +- ...es-settings-about_page-about_page.js.patch | 4 +- ...appearance_page-appearance_page.html.patch | 12 +- ...autofill_page-passwords_section.html.patch | 7 +- ...ettings-people_page-people_page.html.patch | 10 +- ...tings-privacy_page-privacy_page.html.patch | 4 +- ...-browser-resources-settings-route.js.patch | 12 +- ...ettings-settings_ui-settings_ui.html.patch | 2 +- ...settings-category_default_setting.js.patch | 2 +- ...-settings-site_settings-constants.js.patch | 4 +- ...ings-site_settings-site_details.html.patch | 4 +- ...ettings_page-site_settings_page.html.patch | 8 +- ..._settings_page-site_settings_page.js.patch | 2 +- ...browsing-client_side_model_loader.cc.patch | 2 +- ...ines-template_url_service_factory.cc.patch | 4 +- ...e-browser-shell_integration_linux.cc.patch | 8 +- ...-account_consistency_mode_manager.cc.patch | 4 +- ...er-spellcheck_hunspell_dictionary.cc.patch | 2 +- ...sync-profile_sync_service_factory.cc.patch | 4 +- ...er-tracing-crash_service_uploader.cc.patch | 2 +- patches/chrome-browser-ui-BUILD.gn.patch | 6 +- patches/chrome-browser-ui-browser.h.patch | 4 +- ...rome-browser-ui-browser_navigator.cc.patch | 6 +- ...owser-ui-cocoa-accelerators_cocoa.mm.patch | 2 +- ...rowser-ui-cocoa-main_menu_builder.mm.patch | 4 +- ...ings-content_setting_bubble_model.cc.patch | 4 +- ...tings-content_setting_image_model.cc.patch | 8 +- ...-extension_action_view_controller.cc.patch | 2 +- ...rome-browser-ui-libgtkui-gtk_util.cc.patch | 4 +- ...-browser-ui-omnibox-omnibox_theme.cc.patch | 2 +- ...e-browser-ui-omnibox-omnibox_theme.h.patch | 2 +- ...me-browser-ui-page_info-page_info.cc.patch | 17 +- ...browser-ui-page_info-page_info_ui.cc.patch | 6 +- ...rtup-startup_browser_creator_impl.cc.patch | 12 +- ...r-ui-startup-startup_tab_provider.cc.patch | 4 +- .../chrome-browser-ui-tab_helpers.cc.patch | 4 +- ...r-ui-toolbar-toolbar_actions_model.h.patch | 4 +- ...rowser-ui-views-accelerator_table.cc.patch | 2 +- ...ws-bookmarks-bookmark_bubble_view.cc.patch | 2 +- ...-views-download-download_item_view.h.patch | 8 +- ...-views-extensions-extension_popup.cc.patch | 2 +- ...ws-location_bar-location_bar_view.cc.patch | 6 +- ...iews-outdated_upgrade_bubble_view.cc.patch | 4 +- ...ion_bubble-permission_prompt_impl.cc.patch | 4 +- ...ws-profiles-avatar_toolbar_button.cc.patch | 4 +- ...ews-profiles-avatar_toolbar_button.h.patch | 8 +- ...iews-profiles-incognito_menu_view.cc.patch | 14 +- ...views-profiles-incognito_menu_view.h.patch | 15 +- ...ews-profiles-profile_chooser_view.cc.patch | 12 -- ...iews-profiles-profile_chooser_view.h.patch | 29 --- ...-views-profiles-profile_menu_view.cc.patch | 12 ++ ...i-views-profiles-profile_menu_view.h.patch | 29 +++ ...owser-ui-views-tabs-new_tab_button.h.patch | 6 +- ...me-browser-ui-views-tabs-tab_icon.cc.patch | 4 +- ...ser-ui-views-tabs-tab_style_views.cc.patch | 16 +- ...-toolbar-browser_actions_container.h.patch | 2 +- ...s-toolbar-browser_app_menu_button.cc.patch | 4 +- ...ser-ui-views-toolbar-toolbar_view.cc.patch | 4 +- ...wser-ui-views-toolbar-toolbar_view.h.patch | 12 +- ...s-translate-translate_bubble_view.cc.patch | 2 +- ...ws-translate-translate_bubble_view.h.patch | 2 +- ...r-ui-webui-bookmarks-bookmarks_ui.cc.patch | 2 +- ...-chrome_web_ui_controller_factory.cc.patch | 6 +- ...rome-browser-ui-webui-devtools_ui.cc.patch | 12 -- ...-ui-webui-devtools_ui_data_source.cc.patch | 12 ++ ...r-ui-webui-downloads-downloads_ui.cc.patch | 10 +- ...ui-webui-extensions-extensions_ui.cc.patch | 4 +- ...hrome-browser-ui-webui-history_ui.cc.patch | 2 +- ...ings-settings_import_data_handler.cc.patch | 2 +- ...ttings_localized_strings_provider.cc.patch | 6 +- ...ome-browser-ui-webui-theme_source.cc.patch | 2 +- ...de_detector-upgrade_detector_impl.cc.patch | 6 +- ...s-components-web_app_shortcut_mac.mm.patch | 4 +- patches/chrome-common-BUILD.gn.patch | 8 +- ...tensions-chrome_extensions_client.cc.patch | 2 +- ...common-importer-profile_import.mojom.patch | 8 +- ...e-common-media-cdm_host_file_path.cc.patch | 4 +- ...r_support-chrome_launcher_support.cc.patch | 16 +- ...aller-linux-common-installer.include.patch | 6 +- .../chrome-installer-mac-sign_chrome.py.patch | 4 +- ...me-installer-mac-signing-pipeline.py.patch | 4 +- ...ome-installer-mac-signing-signing.py.patch | 2 +- ...me-installer-mini_installer-BUILD.gn.patch | 4 +- ...ller-mini_installer-configuration.cc.patch | 16 +- ...ler-mini_installer-mini_installer.cc.patch | 26 +-- ...e-installer-mini_installer-regkey.cc.patch | 14 +- ...e-installer-setup-installer_state.cc.patch | 8 +- patches/chrome-installer-util-BUILD.gn.patch | 4 +- ...aller-util-google_update_settings.cc.patch | 12 +- patches/chrome-renderer-BUILD.gn.patch | 4 +- ...er-chrome_content_renderer_client.cc.patch | 2 +- ...rer-chrome_content_renderer_client.h.patch | 4 +- patches/chrome-test-BUILD.gn.patch | 4 +- .../chrome-test-base-testing_profile.cc.patch | 2 +- patches/chrome-utility-BUILD.gn.patch | 4 +- ...utility-importer-firefox_importer.cc.patch | 4 +- ...-utility-importer-firefox_importer.h.patch | 6 +- ...lity-importer-profile_import_impl.cc.patch | 6 +- ...-assist_ranker-ranker_url_fetcher.cc.patch | 2 +- ...ntent_settings-core-browser-BUILD.gn.patch | 2 +- ...browser-content_settings_registry.cc.patch | 4 +- ...ings-core-browser-cookie_settings.cc.patch | 46 ----- ...tings-core-browser-cookie_settings.h.patch | 31 ---- ...ontent_settings-core-common-BUILD.gn.patch | 42 ----- ...on-content_settings_mojom_traits.cc.patch} | 8 +- ...mon-content_settings_mojom_traits.h.patch} | 8 +- ...-core-common-cookie_settings_base.cc.patch | 76 +------- ...s-core-common-cookie_settings_base.h.patch | 114 ------------ ...tent_settings-core-common-features.h.patch | 21 --- ...-crash-content-app-breakpad_linux.cc.patch | 4 +- ...ts-crash-content-app-crashpad_mac.mm.patch | 4 +- ...nternal-common-download_item_impl.cc.patch | 6 +- ...lidation-impl-fcm_network_handler.cc.patch | 4 +- ...network_time-network_time_tracker.cc.patch | 2 +- ...ents-os_crypt-key_storage_keyring.cc.patch | 8 +- ...rypt-key_storage_keyring_unittest.cc.patch | 6 +- ...rypt-key_storage_kwallet_unittest.cc.patch | 4 +- ...ts-os_crypt-key_storage_libsecret.cc.patch | 10 +- ...onents-os_crypt-key_storage_linux.cc.patch | 4 +- ...ts-os_crypt-keychain_password_mac.mm.patch | 6 +- ...ore-browser-password_form_filling.cc.patch | 4 +- .../components-rappor-log_uploader.cc.patch | 2 +- ...ser-safe_browsing_network_context.cc.patch | 4 +- ...wsing-db-v4_protocol_manager_util.cc.patch | 4 +- ...ch_engines-prepopulated_engines.json.patch | 6 +- ...c-driver-glue-sync_engine_backend.cc.patch | 4 +- ...-sync-driver-profile_sync_service.cc.patch | 4 +- ...s-sync-driver-profile_sync_service.h.patch | 4 +- ...components-sync-engine-sync_engine.h.patch | 4 +- ...omponents-sync-engine-sync_manager.h.patch | 4 +- ...omponents-sync-engine_impl-commit.cc.patch | 4 +- ...ync-engine_impl-sync_manager_impl.cc.patch | 4 +- .../components-version_info-BUILD.gn.patch | 2 +- .../content-browser-browser_main_loop.h.patch | 4 +- ...hild_process_security_policy_impl.cc.patch | 4 +- ...e_host-navigation_controller_impl.cc.patch | 4 +- ...ser-frame_host-navigation_request.cc.patch | 10 +- ...ndroid-media_resource_getter_impl.cc.patch | 25 --- ...ssions-permission_controller_impl.cc.patch | 4 +- ...rmissions-permission_service_impl.cc.patch | 4 +- ...nt-browser-storage_partition_impl.cc.patch | 8 +- .../content-child-child_thread_impl.cc.patch | 4 +- patches/content-common-BUILD.gn.patch | 2 +- ...-public-browser-browser_main_parts.h.patch | 4 +- ...lic-browser-content_browser_client.h.patch | 4 +- ...ent-public-browser-permission_type.h.patch | 4 +- ...nt-public-browser-url_data_source.cc.patch | 2 +- ...ntent-renderer-render_thread_impl.cc.patch | 4 +- ...st-data-browsing_data-site_data.html.patch | 29 --- patches/extensions-browser-BUILD.gn.patch | 4 +- ...ons-browser-api-socket-tcp_socket.cc.patch | 4 +- ...r-api-web_request-web_request_api.cc.patch | 4 +- ...er-extension_event_histogram_value.h.patch | 6 +- ...nsions-browser-sandboxed_unpacker.cc.patch | 4 +- patches/extensions-common-BUILD.gn.patch | 12 -- .../extensions-renderer-dispatcher.cc.patch | 4 +- ...r-native_extension_bindings_system.h.patch | 4 +- patches/google_apis-google_api_keys.cc.patch | 4 +- ...-chromium_bindings_configuration.gni.patch | 4 +- patches/net-BUILD.gn.patch | 4 +- ...net-base-layered_network_delegate.cc.patch | 26 --- .../net-base-layered_network_delegate.h.patch | 30 ---- patches/net-base-network_delegate.cc.patch | 21 --- patches/net-base-network_delegate.h.patch | 29 --- .../net-base-network_delegate_impl.cc.patch | 14 -- .../net-base-network_delegate_impl.h.patch | 17 -- patches/net-cookies-canonical_cookie.cc.patch | 15 +- ...solution-proxy_resolution_service.cc.patch | 4 +- patches/net-url_request-url_request.cc.patch | 15 -- .../services-network-cookie_settings.cc.patch | 41 ----- .../services-network-cookie_settings.h.patch | 24 --- .../services-network-network_context.cc.patch | 48 ----- ...ices-network-public-cpp-cors-cors.cc.patch | 6 +- ...ojom-restricted_cookie_manager.mojom.patch | 70 -------- ...network-restricted_cookie_manager.cc.patch | 170 ------------------ ...-network-restricted_cookie_manager.h.patch | 48 ----- ...e_manager-sandbox-win-sandbox_win.cc.patch | 4 +- ...c-mojom-permissions-permission.mojom.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 6 +- ...r-core-html-media-autoplay_policy.cc.patch | 6 +- ...k-renderer-core-loader-cookie_jar.cc.patch | 33 ---- ...enderer-core-svg-svg_path_element.cc.patch | 4 +- ...core-svg-svg_text_content_element.cc.patch | 4 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 6 +- ...anvas2d-base_rendering_context_2d.cc.patch | 10 +- ...canvas2d-base_rendering_context_2d.h.patch | 2 +- ...vas2d-canvas_rendering_context_2d.cc.patch | 10 +- ...reen_canvas_rendering_context_2d.idl.patch | 8 +- ...modules-cookie_store-cookie_store.cc.patch | 61 ------- ...-modules-cookie_store-cookie_store.h.patch | 14 -- ...modules-mediastream-media_devices.cc.patch | 9 +- ...eerconnection-rtc_peer_connection.cc.patch | 2 +- ...er-modules-webaudio-analyser_node.cc.patch | 2 +- ...rer-modules-webaudio-audio_buffer.cc.patch | 4 +- ...erer-modules-webaudio-audio_buffer.h.patch | 4 +- ...er-modules-webaudio-audio_buffer.idl.patch | 8 +- ...ebgl-webgl_rendering_context_base.cc.patch | 48 ++--- ...t-chromium-chrome_metadata_source.cc.patch | 2 +- patches/tools-gritsettings-resource_ids.patch | 4 +- ...ls-metrics-histograms-histograms.xml.patch | 4 +- patches/ui-base-BUILD.gn.patch | 4 +- patches/ui-native_theme-native_theme.h.patch | 8 +- .../ui-native_theme-native_theme_mac.mm.patch | 4 +- .../ui-native_theme-native_theme_win.cc.patch | 8 +- .../ui-native_theme-native_theme_win.h.patch | 4 +- ...ces-cr_elements-shared_vars_css.html.patch | 2 +- 274 files changed, 725 insertions(+), 1903 deletions(-) delete mode 100644 patches/android_webview-browser-network_service-aw_proxying_restricted_cookie_manager.cc.patch delete mode 100644 patches/android_webview-browser-network_service-aw_proxying_restricted_cookie_manager.h.patch create mode 100644 patches/chrome-android-java-res-values-styles.xml.patch delete mode 100644 patches/chrome-android-java-res-values-v17-styles.xml.patch delete mode 100644 patches/chrome-browser-ui-views-profiles-profile_chooser_view.cc.patch delete mode 100644 patches/chrome-browser-ui-views-profiles-profile_chooser_view.h.patch create mode 100644 patches/chrome-browser-ui-views-profiles-profile_menu_view.cc.patch create mode 100644 patches/chrome-browser-ui-views-profiles-profile_menu_view.h.patch delete mode 100644 patches/chrome-browser-ui-webui-devtools_ui.cc.patch create mode 100644 patches/chrome-browser-ui-webui-devtools_ui_data_source.cc.patch delete mode 100644 patches/components-content_settings-core-browser-cookie_settings.cc.patch delete mode 100644 patches/components-content_settings-core-browser-cookie_settings.h.patch delete mode 100644 patches/components-content_settings-core-common-BUILD.gn.patch rename patches/{components-content_settings-core-common-content_settings_struct_traits.cc.patch => components-content_settings-core-common-content_settings_mojom_traits.cc.patch} (60%) rename patches/{components-content_settings-core-common-content_settings_struct_traits.h.patch => components-content_settings-core-common-content_settings_mojom_traits.h.patch} (64%) delete mode 100644 patches/components-content_settings-core-common-cookie_settings_base.h.patch delete mode 100644 patches/components-content_settings-core-common-features.h.patch delete mode 100644 patches/content-browser-media-android-media_resource_getter_impl.cc.patch delete mode 100644 patches/content-test-data-browsing_data-site_data.html.patch delete mode 100644 patches/extensions-common-BUILD.gn.patch delete mode 100644 patches/net-base-layered_network_delegate.cc.patch delete mode 100644 patches/net-base-layered_network_delegate.h.patch delete mode 100644 patches/net-base-network_delegate.cc.patch delete mode 100644 patches/net-base-network_delegate.h.patch delete mode 100644 patches/net-base-network_delegate_impl.cc.patch delete mode 100644 patches/net-base-network_delegate_impl.h.patch delete mode 100644 patches/net-url_request-url_request.cc.patch delete mode 100644 patches/services-network-cookie_settings.cc.patch delete mode 100644 patches/services-network-cookie_settings.h.patch delete mode 100644 patches/services-network-network_context.cc.patch delete mode 100644 patches/services-network-public-mojom-restricted_cookie_manager.mojom.patch delete mode 100644 patches/services-network-restricted_cookie_manager.cc.patch delete mode 100644 patches/services-network-restricted_cookie_manager.h.patch delete mode 100644 patches/third_party-blink-renderer-core-loader-cookie_jar.cc.patch delete mode 100644 patches/third_party-blink-renderer-modules-cookie_store-cookie_store.cc.patch delete mode 100644 patches/third_party-blink-renderer-modules-cookie_store-cookie_store.h.patch diff --git a/patches/android_webview-browser-aw_permission_manager.cc.patch b/patches/android_webview-browser-aw_permission_manager.cc.patch index 1cfe2baafe02..f65d31032cf3 100644 --- a/patches/android_webview-browser-aw_permission_manager.cc.patch +++ b/patches/android_webview-browser-aw_permission_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/android_webview/browser/aw_permission_manager.cc b/android_webview/browser/aw_permission_manager.cc -index f1979fdcc078f31d8caad5da6cd68906b138f263..4d0f05ae1f14f7e6533398456bdebac7d04ba5ba 100644 +index c8782192b6e07503501eb3e5f219b5c533cbbff5..964f6f53ce071459a63a4ef2a2a1deb74e92eed3 100644 --- a/android_webview/browser/aw_permission_manager.cc +++ b/android_webview/browser/aw_permission_manager.cc @@ -335,6 +335,7 @@ int AwPermissionManager::RequestPermissions( diff --git a/patches/android_webview-browser-network_service-aw_proxying_restricted_cookie_manager.cc.patch b/patches/android_webview-browser-network_service-aw_proxying_restricted_cookie_manager.cc.patch deleted file mode 100644 index 92e0b57a0262..000000000000 --- a/patches/android_webview-browser-network_service-aw_proxying_restricted_cookie_manager.cc.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff --git a/android_webview/browser/network_service/aw_proxying_restricted_cookie_manager.cc b/android_webview/browser/network_service/aw_proxying_restricted_cookie_manager.cc -index b1d84a8a3f6f16ac53206d0e30632ec2d736838b..611aa02030e3908caa9504f670c9708f6ed14d80 100644 ---- a/android_webview/browser/network_service/aw_proxying_restricted_cookie_manager.cc -+++ b/android_webview/browser/network_service/aw_proxying_restricted_cookie_manager.cc -@@ -66,13 +66,15 @@ AwProxyingRestrictedCookieManager::~AwProxyingRestrictedCookieManager() { - void AwProxyingRestrictedCookieManager::GetAllForUrl( - const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - network::mojom::CookieManagerGetOptionsPtr options, - GetAllForUrlCallback callback) { - DCHECK_CURRENTLY_ON(content::BrowserThread::IO); - - if (AllowCookies(url, site_for_cookies)) { - underlying_restricted_cookie_manager_->GetAllForUrl( -- url, site_for_cookies, std::move(options), std::move(callback)); -+ url, site_for_cookies, top_frame_origin, std::move(options), -+ std::move(callback)); - } else { - std::move(callback).Run(std::vector()); - } -@@ -82,12 +84,13 @@ void AwProxyingRestrictedCookieManager::SetCanonicalCookie( - const net::CanonicalCookie& cookie, - const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - SetCanonicalCookieCallback callback) { - DCHECK_CURRENTLY_ON(content::BrowserThread::IO); - - if (AllowCookies(url, site_for_cookies)) { - underlying_restricted_cookie_manager_->SetCanonicalCookie( -- cookie, url, site_for_cookies, std::move(callback)); -+ cookie, url, site_for_cookies, top_frame_origin, std::move(callback)); - } else { - std::move(callback).Run(false); - } -@@ -96,6 +99,7 @@ void AwProxyingRestrictedCookieManager::SetCanonicalCookie( - void AwProxyingRestrictedCookieManager::AddChangeListener( - const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - network::mojom::CookieChangeListenerPtr listener, - AddChangeListenerCallback callback) { - DCHECK_CURRENTLY_ON(content::BrowserThread::IO); -@@ -110,20 +114,21 @@ void AwProxyingRestrictedCookieManager::AddChangeListener( - mojo::MakeRequest(&proxy_listener_ptr)); - - underlying_restricted_cookie_manager_->AddChangeListener( -- url, site_for_cookies, std::move(proxy_listener_ptr), -+ url, site_for_cookies, top_frame_origin, std::move(proxy_listener_ptr), - std::move(callback)); - } - - void AwProxyingRestrictedCookieManager::SetCookieFromString( - const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - const std::string& cookie, - SetCookieFromStringCallback callback) { - DCHECK_CURRENTLY_ON(content::BrowserThread::IO); - - if (AllowCookies(url, site_for_cookies)) { - underlying_restricted_cookie_manager_->SetCookieFromString( -- url, site_for_cookies, cookie, std::move(callback)); -+ url, site_for_cookies, top_frame_origin, cookie, std::move(callback)); - } else { - std::move(callback).Run(); - } -@@ -132,12 +137,13 @@ void AwProxyingRestrictedCookieManager::SetCookieFromString( - void AwProxyingRestrictedCookieManager::GetCookiesString( - const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - GetCookiesStringCallback callback) { - DCHECK_CURRENTLY_ON(content::BrowserThread::IO); - - if (AllowCookies(url, site_for_cookies)) { - underlying_restricted_cookie_manager_->GetCookiesString( -- url, site_for_cookies, std::move(callback)); -+ url, site_for_cookies, top_frame_origin, std::move(callback)); - } else { - std::move(callback).Run(""); - } -@@ -146,6 +152,7 @@ void AwProxyingRestrictedCookieManager::GetCookiesString( - void AwProxyingRestrictedCookieManager::CookiesEnabledFor( - const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - CookiesEnabledForCallback callback) { - DCHECK_CURRENTLY_ON(content::BrowserThread::IO); - std::move(callback).Run(AllowCookies(url, site_for_cookies)); diff --git a/patches/android_webview-browser-network_service-aw_proxying_restricted_cookie_manager.h.patch b/patches/android_webview-browser-network_service-aw_proxying_restricted_cookie_manager.h.patch deleted file mode 100644 index e4c6ac84b861..000000000000 --- a/patches/android_webview-browser-network_service-aw_proxying_restricted_cookie_manager.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/android_webview/browser/network_service/aw_proxying_restricted_cookie_manager.h b/android_webview/browser/network_service/aw_proxying_restricted_cookie_manager.h -index cd7bcb39d9580c5c26a5b65c2abee3f8cc40ed28..3c0523497853c77ce3391f4636d02935d5504590 100644 ---- a/android_webview/browser/network_service/aw_proxying_restricted_cookie_manager.h -+++ b/android_webview/browser/network_service/aw_proxying_restricted_cookie_manager.h -@@ -35,28 +35,34 @@ class AwProxyingRestrictedCookieManager - // network::mojom::RestrictedCookieManager interface: - void GetAllForUrl(const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - network::mojom::CookieManagerGetOptionsPtr options, - GetAllForUrlCallback callback) override; - void SetCanonicalCookie(const net::CanonicalCookie& cookie, - const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - SetCanonicalCookieCallback callback) override; - void AddChangeListener(const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - network::mojom::CookieChangeListenerPtr listener, - AddChangeListenerCallback callback) override; - - void SetCookieFromString(const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - const std::string& cookie, - SetCookieFromStringCallback callback) override; - - void GetCookiesString(const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - GetCookiesStringCallback callback) override; - - void CookiesEnabledFor(const GURL& url, - const GURL& site_for_cookies, -+ const url::Origin& top_frame_origin, - CookiesEnabledForCallback callback) override; - - // This one is internal. diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index abdda3f35644..8e5d7042a076 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 db7ab0255b482d4e1fd20a31cfec86a24546602a..1cc44592d0d854f17cf3d2f5a5e0c2ed76b2d025 100644 +index 59ab7810e71916e8f0f2d69f06e3c2c3ebc99030..12b12ea83e67e551c64db4942fd6d243c2e76743 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -419,6 +419,7 @@ set_sources_assignment_filter(sources_assignment_filter) diff --git a/patches/build-config-android-BUILD.gn.patch b/patches/build-config-android-BUILD.gn.patch index 56d487aaee4c..41bc4576ee28 100644 --- a/patches/build-config-android-BUILD.gn.patch +++ b/patches/build-config-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn -index 233e8b0e7f1c7bd7aabd0c5c01934cacbe955761..469b23ff65653e8ccf4097d5fd375825ed5a88a5 100644 +index 6d8bec8e71f0d80d6829fbe8a372abc01d691a81..9fcb132b0c37d4be5ce0430faafb815317e9812a 100644 --- a/build/config/android/BUILD.gn +++ b/build/config/android/BUILD.gn @@ -46,6 +46,7 @@ config("compiler") { diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index 5c4bffb9cc29..78f517f4ad7e 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 bed796ebe45e47af39bb3f27383cf23bc028adb3..7c0707454b7e3c435d793c1e300755f3d8bcb9c2 100644 +index c1bfc874669358dc8b1ba668e0120310096c7e18..28ee00bd8ce797c51786bc7df8c885c38d5cc142 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -3,6 +3,7 @@ diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index 06def7ce6259..a091feb3d534 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 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0b7ea6f92 100644 +index dd3a098632d49d82d20a1dba87cc151e626a4966..f33ae5877a39455eda7d0b123f23df8a41b1ae6b 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -190,6 +190,10 @@ if (!is_android && !is_mac) { @@ -13,7 +13,7 @@ index 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0 deps += [ ":chrome_dll", -@@ -297,6 +301,7 @@ if (!is_android && !is_mac) { +@@ -277,6 +281,7 @@ if (!is_android && !is_mac) { "//headless:headless_shell_lib", "//services/service_manager/embedder", ] @@ -21,23 +21,23 @@ index 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0 public_deps = [ ":xdg_mime", # Needs to be public for installer to consume files. -@@ -431,6 +436,7 @@ if (is_win) { +@@ -412,6 +417,7 @@ if (is_win) { "//third_party/wtl", "//ui/views", ] + deps += [ "//components/unified_consent" ] - ldflags = [ - "/DELAYLOAD:advapi32.dll", -@@ -566,6 +572,7 @@ if (is_win) { + configs += [ "//build/config/win:delayloads" ] + if (is_multi_dll_chrome) { +@@ -488,6 +494,7 @@ if (is_win) { "//headless:headless_shell_child_lib", "//services/service_manager/embedder", ] + deps += [ "//components/unified_consent" ] - ldflags = [ - "/DELAYLOAD:comctl32.dll", -@@ -677,6 +684,11 @@ if (is_win) { + configs += [ "//build/config/win:delayloads" ] + +@@ -579,6 +586,11 @@ if (is_win) { ] } @@ -49,7 +49,7 @@ index 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0 mac_app_bundle("chrome_app") { output_name = chrome_product_full_name -@@ -710,6 +722,7 @@ if (is_win) { +@@ -612,6 +624,7 @@ if (is_win) { rebase_path("app/app.exports", root_build_dir) ] } } @@ -57,7 +57,7 @@ index 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0 compiled_action("chrome_app_strings") { tool = "//chrome/tools/build/mac:infoplist_strings_tool" -@@ -739,7 +752,7 @@ if (is_win) { +@@ -641,7 +654,7 @@ if (is_win) { args = [ "-b", @@ -66,7 +66,7 @@ index 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0 "-v", rebase_path(chrome_version_file, root_build_dir), "-g", -@@ -820,7 +833,7 @@ if (is_win) { +@@ -722,7 +735,7 @@ if (is_win) { # framework itself, that would cause a cyclical dependency. Instead, # this dependency directly copies the file into the framework's # resources directory. @@ -75,7 +75,7 @@ index 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0 } } -@@ -1247,6 +1260,7 @@ if (is_win) { +@@ -1149,6 +1162,7 @@ if (is_win) { "//services/service_manager/embedder", "//third_party/cld_3/src/src:cld_3", ] @@ -83,7 +83,7 @@ index 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0 if (is_component_build) { libs = [ "Carbon.framework" ] -@@ -1311,6 +1325,10 @@ if (is_win) { +@@ -1213,6 +1227,10 @@ if (is_win) { if (is_chrome_branded) { deps += [ ":default_apps" ] } @@ -94,7 +94,7 @@ index 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0 ldflags = [ "-Wl,-install_name,@executable_path/../Frameworks/$chrome_framework_name.framework/Versions/$chrome_version_full/$chrome_framework_name" ] -@@ -1475,6 +1493,7 @@ if (is_win) { +@@ -1381,6 +1399,7 @@ if (is_win) { group("browser_dependencies") { public_deps = [ @@ -102,7 +102,7 @@ index 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0 "//chrome/browser", "//chrome/common", "//components/gwp_asan/buildflags", -@@ -1547,13 +1566,14 @@ group("child_dependencies") { +@@ -1453,13 +1472,14 @@ group("child_dependencies") { # this is OK because all of content is linked into one library. "//content/browser", ] @@ -118,7 +118,7 @@ index 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0 ] output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1626,6 +1646,7 @@ group("resources") { +@@ -1522,6 +1542,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", @@ -126,7 +126,7 @@ index 0c52ff3c73580e38b2828fabdeb0e9c340428ca3..c99d78bb59960edf586b9079677dcbf0 ] } -@@ -1882,6 +1903,7 @@ if (is_android) { +@@ -1780,6 +1801,7 @@ if (is_android) { "//content/public/common:service_names", "//services/service_manager/embedder", ] diff --git a/patches/chrome-VERSION.patch b/patches/chrome-VERSION.patch index 99564cf7cb84..8f3edbc52a02 100644 --- a/patches/chrome-VERSION.patch +++ b/patches/chrome-VERSION.patch @@ -1,11 +1,11 @@ diff --git a/chrome/VERSION b/chrome/VERSION -index 5346a11c9cfb9dcc0dcbe1d9a1e016f51459817d..98da432c0a08c8441dc922c2ed4e9568bb9b3a35 100644 +index 02f4b3b1076568fa921ea5dd11ea564c7fb06796..c3900198d264ceda61027aa618e0c46ef8847acc 100644 --- a/chrome/VERSION +++ b/chrome/VERSION @@ -1,4 +1,4 @@ - MAJOR=77 + MAJOR=78 MINOR=0 --BUILD=3865 --PATCH=90 +-BUILD=3904 +-PATCH=44 +BUILD=72 +PATCH=80 diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 3571c9e84d2a..58926ca2f7ce 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 0c5467af2bce341e0b3f0835899c820f60adbc87..ad26d5d307b168283b9d0bab7c9d4f1d6d11ed0f 100644 +index ac52a743f73b7109f57df8f677518ca717812ba7..ff92fd9e070e290566ebfb401afc3b3a27ba353d 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -31,7 +31,7 @@ import("java_sources.gni") +@@ -32,7 +32,7 @@ import("java_sources.gni") import("static_initializers.gni") import("trichrome.gni") @@ -11,15 +11,15 @@ index 0c5467af2bce341e0b3f0835899c820f60adbc87..ad26d5d307b168283b9d0bab7c9d4f1d chrome_public_test_manifest_package = "org.chromium.chrome.tests" chrome_public_jinja_variables = -@@ -100,6 +100,7 @@ android_resources("chrome_app_java_resources") { +@@ -101,6 +101,7 @@ android_resources("chrome_app_java_resources") { deps = [ ":chrome_strings_grd", ":ui_locale_string_resources", + "//brave/build/android:android_brave_strings_grd", "//chrome/android/webapk/libs/common:splash_resources", "//chrome/app:java_strings_grd", - "//components/autofill/android:autofill_java_resources", -@@ -524,6 +525,7 @@ java_group("chrome_all_java") { + "//chrome/browser/ui/android/widget:ui_widget_java_resources", +@@ -543,6 +544,7 @@ java_group("chrome_all_java") { group("jni_headers") { public_deps = [ ":chrome_jni_headers", @@ -27,7 +27,7 @@ index 0c5467af2bce341e0b3f0835899c820f60adbc87..ad26d5d307b168283b9d0bab7c9d4f1d "//chrome/android/features/autofill_assistant:jni_headers", "//chrome/android/features/keyboard_accessory:jni_headers", "//chrome/android/features/media_router:jni_headers", -@@ -1395,6 +1397,7 @@ if (current_toolchain == default_toolchain) { +@@ -1422,6 +1424,7 @@ if (current_toolchain == default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] diff --git a/patches/chrome-android-java-res-values-dimens.xml.patch b/patches/chrome-android-java-res-values-dimens.xml.patch index 81f16f0db9fa..d2d98d18e903 100644 --- a/patches/chrome-android-java-res-values-dimens.xml.patch +++ b/patches/chrome-android-java-res-values-dimens.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/res/values/dimens.xml b/chrome/android/java/res/values/dimens.xml -index e0a078063054229131277ff3878e6ef3ebeee61f..d93f0de960c134608342ba21c80151b9b6f80515 100644 +index 2fa76012e096cbf44c27e86da30ff641c5865710..4b8f88e4a51dd17b9317286f8bcbdf465fa8c952 100644 --- a/chrome/android/java/res/values/dimens.xml +++ b/chrome/android/java/res/values/dimens.xml -@@ -287,7 +287,7 @@ +@@ -309,7 +309,7 @@ 40dp diff --git a/patches/chrome-android-java-res-values-styles.xml.patch b/patches/chrome-android-java-res-values-styles.xml.patch new file mode 100644 index 000000000000..5d580103624a --- /dev/null +++ b/patches/chrome-android-java-res-values-styles.xml.patch @@ -0,0 +1,10 @@ +diff --git a/chrome/android/java/res/values/styles.xml b/chrome/android/java/res/values/styles.xml +index 048e9e516ee3b5f0c3b58cc4e0968ab8d02f834e..684b33845c9f65ff288fbfa03c7a55a21d1e3a60 100644 +--- a/chrome/android/java/res/values/styles.xml ++++ b/chrome/android/java/res/values/styles.xml +@@ -972,4 +972,5 @@ + ++ + diff --git a/patches/chrome-android-java-res-values-v17-styles.xml.patch b/patches/chrome-android-java-res-values-v17-styles.xml.patch deleted file mode 100644 index 95f0f5ee1bcb..000000000000 --- a/patches/chrome-android-java-res-values-v17-styles.xml.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff --git a/chrome/android/java/res/values-v17/styles.xml b/chrome/android/java/res/values-v17/styles.xml -index 5b41c992fb2b17c1b8a8a06ecc09460c4190fa86..b4a36c8d48dcc89a1dd0e9c661f4d3eedc757ed8 100644 ---- a/chrome/android/java/res/values-v17/styles.xml -+++ b/chrome/android/java/res/values-v17/styles.xml -@@ -995,4 +995,5 @@ - viewStart - @style/TextAppearance.BlackTitle1 - -+ - 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 139aae27375c..cfe24d5303ac 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,13 +1,13 @@ 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 a168b085348c218c2951964beb37e0a25d754836..ad5cf672b9548a4f9921c4bc3521a0c8111e998d 100644 +index 9de151eff10dd902d494e9d44419cf9138e365e9..9c10c231c53f707a146b0c0a381b739aa2421dd6 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -174,7 +174,7 @@ import java.util.Locale; +@@ -179,7 +179,7 @@ import java.util.Locale; + * This is the main activity for ChromeMobile when not running in document mode. All the tabs * are accessible via a chrome specific tab switching UI. */ - public class ChromeTabbedActivity -- extends ChromeActivity implements OverviewModeObserver, ScreenshotMonitorDelegate { -+ extends BraveActivity implements OverviewModeObserver, ScreenshotMonitorDelegate { - @IntDef({BackPressedResult.NOTHING_HAPPENED, BackPressedResult.HELP_URL_CLOSED, - BackPressedResult.MINIMIZED_NO_TAB_CLOSED, BackPressedResult.MINIMIZED_TAB_CLOSED, - BackPressedResult.TAB_CLOSED, BackPressedResult.TAB_IS_NULL, +-public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMonitorDelegate { ++public class ChromeTabbedActivity extends BraveActivity implements ScreenshotMonitorDelegate { + /** + * The results of a system back press action. + */ diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-ChromePreferenceManager.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-ChromePreferenceManager.java.patch index 708bcc877652..03539d40044b 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-ChromePreferenceManager.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-ChromePreferenceManager.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java -index e269ba6c0436afc362804823e557dfe38c600c3b..fc3699b450c22a9731ccce0723e69dfcf813cf3c 100644 +index 9b7768fdb9a8dd52a412b1e4900478114a6ff2cd..c47b1911f140ffb953d888e7d501ac7e32f6066c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/ChromePreferenceManager.java @@ -21,7 +21,7 @@ import java.util.Set; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-MainPreferences.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-MainPreferences.java.patch index 0614d8073a92..8fa9e146bb21 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-MainPreferences.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-MainPreferences.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java -index 56f952c159ffb94c0b51a47d6949e8bc3f99871c..ea90e440c35ae95c6579d27d22feeefd421a376f 100644 +index 75983bc60c4d2fdaf9fde585e83672cfca1eda29..1658cbdc2a744ff04562011614c9a2748daeaa60 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/MainPreferences.java @@ -41,7 +41,7 @@ import java.util.Map; diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-website-SiteSettingsPreferences.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-website-SiteSettingsPreferences.java.patch index c137247a5f06..f28546e8aafe 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-website-SiteSettingsPreferences.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-preferences-website-SiteSettingsPreferences.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java -index 3e7407bf3f1a3a2d1184a24e66ebe42d08a1c9aa..944dc35602400dcf18c915594546f78cd327bb0e 100644 +index e0a926bfd9b4cb231f29cfe87bc1ddf9624ac06f..e0890411ee87bb3ae5ad74fc4699c1c12e36905c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/SiteSettingsPreferences.java -@@ -32,7 +32,7 @@ import java.util.List; +@@ -31,7 +31,7 @@ import java.util.List; * Media to its own dedicated PreferenceFragment rather than sharing this one. */ public class SiteSettingsPreferences 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 11a3f4bd00cf..ab7ba3957326 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 795a84107a8665a7795a14cba33687d5e5e9f460..4396a998f1e9999a0e59f5b2a72bf1a2c70aec68 100644 +index ad733b3674f4e7fe1b34c32edf6001f7376910dc..021a6d1d88c7c960cdceb2cba0c4fb48767522d8 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 -@@ -782,6 +782,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF +@@ -785,6 +785,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF }; final OnClickListener shareButtonListener = v -> { @@ -10,7 +10,7 @@ index 795a84107a8665a7795a14cba33687d5e5e9f460..4396a998f1e9999a0e59f5b2a72bf1a2 recordBottomToolbarUseForIPH(); RecordUserAction.record("MobileBottomToolbarShareButton"); boolean isIncognito = false; -@@ -789,6 +790,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF +@@ -792,6 +793,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF isIncognito = mTabModelSelector.getCurrentTab().isIncognito(); } mActivity.onShareMenuItemSelected(false, isIncognito); @@ -18,7 +18,7 @@ index 795a84107a8665a7795a14cba33687d5e5e9f460..4396a998f1e9999a0e59f5b2a72bf1a2 }; mBottomControlsCoordinator = new BottomControlsCoordinator(mActivity.getFullscreenManager(), -@@ -1772,6 +1774,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF +@@ -1793,6 +1795,7 @@ public class ToolbarManager implements ScrimObserver, ToolbarTabController, UrlF boolean editingAllowed = currentTab == null || mBookmarkBridge == null || mBookmarkBridge.isEditBookmarksEnabled(); mToolbar.updateBookmarkButton(isBookmarked, editingAllowed); diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch index e9cdff365791..c41831822634 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-toolbar-bottom-BottomControlsCoordinator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java -index b2f712ede9a71f6652b1a9caa409b9cdac807917..fe71aa3cc1aeb4eead5c5a04f01564957cc9d330 100644 +index 41708bd1d5be49814c86452ce5df54b98b83c75c..21978676c2972240f5655b2e9bff40cb5202f87f 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/bottom/BottomControlsCoordinator.java -@@ -222,4 +222,5 @@ public class BottomControlsCoordinator { +@@ -230,4 +230,5 @@ public class BottomControlsCoordinator { if (mTabGroupUi != null) mTabGroupUi.destroy(); mMediator.destroy(); } 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 42f6915daa32..f4848ad75dd2 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,5 +1,5 @@ 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 6b0082fe76b27d72b5d90c7047e9e23173dd0afc..cc1ab03f9a7c149da521375cfc18b70aaa83fdd2 100644 +index 25e5c818201456c50d351aa8acaf01b9d5ce77be..1cdc1b4807174bdf995a1d4ddf606fa3cf9b971c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java @@ -86,7 +86,7 @@ import java.util.List; @@ -25,7 +25,7 @@ index 6b0082fe76b27d72b5d90c7047e9e23173dd0afc..cc1ab03f9a7c149da521375cfc18b70a } /** -@@ -542,6 +544,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O +@@ -543,6 +545,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O .notifyEvent(EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED); } } @@ -33,7 +33,7 @@ index 6b0082fe76b27d72b5d90c7047e9e23173dd0afc..cc1ab03f9a7c149da521375cfc18b70a } @Override -@@ -715,7 +718,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O +@@ -716,7 +719,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O * @return The right bounds of the location bar after accounting for any visible left buttons. */ private int getBoundsAfterAccountingForRightButtons() { @@ -42,7 +42,7 @@ index 6b0082fe76b27d72b5d90c7047e9e23173dd0afc..cc1ab03f9a7c149da521375cfc18b70a } private void updateToolbarBackground(int color) { -@@ -2130,6 +2133,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O +@@ -2139,6 +2142,7 @@ public class ToolbarPhone extends ToolbarLayout implements Invalidator.Client, O } else { populateUrlClearFocusingAnimatorSet(animators); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-util-FeatureUtilities.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-util-FeatureUtilities.java.patch index 91bd72cf1c19..2c10dd76b7c8 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-util-FeatureUtilities.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-util-FeatureUtilities.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java -index e5270f604ea8b8ee9f27b2e7c89e4945e6e45d60..deb382908cfd0112b7cc0ee02282d8eabf209b5f 100644 +index 3b19402872ef636a37019cc6fb95b61607b8e281..a31e5cac6165386f8bb96b3bf0b43d2ab7da1dce 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java -@@ -457,6 +457,7 @@ public class FeatureUtilities { +@@ -444,6 +444,7 @@ public class FeatureUtilities { * @return Whether or not the bottom toolbar is enabled. */ public static boolean isBottomToolbarEnabled() { @@ -10,7 +10,7 @@ index e5270f604ea8b8ee9f27b2e7c89e4945e6e45d60..deb382908cfd0112b7cc0ee02282d8ea if (sIsBottomToolbarEnabled == null) { ChromePreferenceManager prefManager = ChromePreferenceManager.getInstance(); -@@ -468,6 +469,7 @@ public class FeatureUtilities { +@@ -455,6 +456,7 @@ public class FeatureUtilities { && !DeviceFormFactor.isNonMultiDisplayContextOnTablet( ContextUtils.getApplicationContext()) && !isTabGroupsAndroidEnabled(); diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index a5f626baa26f..1f932984630c 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 6e5ec5df6fb27d3e359304ed1eed873256bdd349..070bb918c76a46a8f2f8003ecf9d616e8982bbec 100644 +index e965144f4f7d559b169b645549bbc8700e7fdc96..fd869c26f6d2cc1571b63115c3c2a788dc4f67a4 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn -@@ -186,6 +186,8 @@ grit("generated_resources") { +@@ -184,6 +184,8 @@ grit("generated_resources") { if (is_android) { outputs += android_generated_java_resources } @@ -11,7 +11,7 @@ index 6e5ec5df6fb27d3e359304ed1eed873256bdd349..070bb918c76a46a8f2f8003ecf9d616e } if (is_android) { -@@ -263,7 +265,7 @@ grit("google_chrome_strings") { +@@ -261,7 +263,7 @@ grit("google_chrome_strings") { } grit("chromium_strings") { @@ -20,7 +20,7 @@ index 6e5ec5df6fb27d3e359304ed1eed873256bdd349..070bb918c76a46a8f2f8003ecf9d616e defines = chrome_grit_defines output_dir = "$root_gen_dir/chrome" outputs = [ -@@ -347,6 +349,7 @@ static_library("test_support") { +@@ -345,6 +347,7 @@ static_library("test_support") { "//components/gwp_asan/buildflags", "//components/nacl/common:buildflags", "//components/startup_metric_utils/browser:lib", diff --git a/patches/chrome-app-chrome_crash_reporter_client.cc.patch b/patches/chrome-app-chrome_crash_reporter_client.cc.patch index 4c9639b90984..64d8efedc8e1 100644 --- a/patches/chrome-app-chrome_crash_reporter_client.cc.patch +++ b/patches/chrome-app-chrome_crash_reporter_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/app/chrome_crash_reporter_client.cc b/chrome/app/chrome_crash_reporter_client.cc -index 72da91f8e30d84a3e0532a5106880633fa2ba307..0d9848cb124ba16c4a4972c465b73b0c40358b86 100644 +index ce1bd30b94839b2a51dc375ade2ce14e6e85130c..6e8924fef1e50931076ab69c816169bfc92c6ad0 100644 --- a/chrome/app/chrome_crash_reporter_client.cc +++ b/chrome/app/chrome_crash_reporter_client.cc -@@ -115,7 +115,7 @@ bool ChromeCrashReporterClient::IsRunningUnattended() { +@@ -132,7 +132,7 @@ bool ChromeCrashReporterClient::IsRunningUnattended() { } bool ChromeCrashReporterClient::GetCollectStatsConsent() { diff --git a/patches/chrome-app-chrome_dll.rc.patch b/patches/chrome-app-chrome_dll.rc.patch index 2581bf123ad5..023f4b76fb8e 100644 --- a/patches/chrome-app-chrome_dll.rc.patch +++ b/patches/chrome-app-chrome_dll.rc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/app/chrome_dll.rc b/chrome/app/chrome_dll.rc -index 80a15b55d54f55ca13d6d79b3fd75d28ae0d647f..a0aa8fa83a4e93f7689a0ece2e6dbf9d10a4c175 100644 +index 5eed8f6f40c6977d4fbe256250c5b243c5069004..a815ead9cd3a09568001500cb1a59f743e27287c 100644 --- a/chrome/app/chrome_dll.rc +++ b/chrome/app/chrome_dll.rc @@ -164,6 +164,16 @@ END diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index a6365d8703d0..4b34e4939ece 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 c00a09a5ec2b58399559255ae2fc476f3135b78c..b0f4af065359ed32e9ce4fb7a74ff902d602158d 100644 +index 38c89002e6bbc2bd07e7260624b148e9e1225c10..c310f381c05285399d672c110a0662b9370aae31 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2180,6 +2180,7 @@ jumbo_split_static_library("browser") { +@@ -2226,6 +2226,7 @@ jumbo_split_static_library("browser") { "//ui/strings", "//ui/surface", "//ui/web_dialogs", diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 9f62001985a6..e8c4e6815cc8 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 2456729567158701ba9023f7741c117f25990c8c..3466bba226d9bcff427a78e3f18b1a4be0c5230f 100644 +index 3ceed0556297ef443366b303efd7f752c76a98ea..a59d7b4d0522a2ba1e9d66356d57cb0f2d5e9465 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -266,14 +266,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { +@@ -280,14 +280,14 @@ const FeatureEntry::Choice kTouchTextSelectionStrategyChoices[] = { const FeatureEntry::Choice kTraceUploadURL[] = { {flags_ui::kGenericExperimentChoiceDisabled, "", ""}, {flag_descriptions::kTraceUploadUrlChoiceOther, switches::kTraceUploadURL, diff --git a/patches/chrome-browser-browser_process_impl.h.patch b/patches/chrome-browser-browser_process_impl.h.patch index 8d2128a57a51..684f1d03785e 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 c02e294f5b2e388cda053ba03974bff53a7ba5da..c7f071ba6a9f726e45c3ad4e5b637a415ea7146d 100644 +index dadcf85553f66db76121dcdb40db285cd139d1f5..2d8c28e91263c1f22c786b60ec165c9c67e340f0 100644 --- a/chrome/browser/browser_process_impl.h +++ b/chrome/browser/browser_process_impl.h -@@ -198,6 +198,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -197,6 +197,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 c6a42eb46e1b..a9f244b94a35 100644 --- a/patches/chrome-browser-chrome_content_browser_client.h.patch +++ b/patches/chrome-browser-chrome_content_browser_client.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h -index 069f597633a2924e0bdacd7cb1d92f5d418e6d87..a40200ffd46ec9deb623906633f4805fb63bf8dd 100644 +index 6bb50192ce1702c06a6826d64bc2eea2807428df..68cd79996694e6c472470d42a2e2e770a89cd2d3 100644 --- a/chrome/browser/chrome_content_browser_client.h +++ b/chrome/browser/chrome_content_browser_client.h @@ -634,6 +634,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient { diff --git a/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch b/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch index b6dee9a46cf3..addde9611b84 100644 --- a/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch +++ b/patches/chrome-browser-content_settings-tab_specific_content_settings.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc -index 34fde937fea30840585b21c0623443f7dcb6c46a..50de09977491c7961ce3fc643f175d1e1e24a7f4 100644 +index 82466bb91a79646bf11d174344380f1da1ad1b86..38a7991e5072efd0ae66ef4dba1491b6cadaca65 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc -@@ -253,6 +253,7 @@ bool TabSpecificContentSettings::IsContentBlocked( +@@ -240,6 +240,7 @@ bool TabSpecificContentSettings::IsContentBlocked( content_type == CONTENT_SETTINGS_TYPE_ADS || content_type == CONTENT_SETTINGS_TYPE_SOUND || content_type == CONTENT_SETTINGS_TYPE_CLIPBOARD_READ || @@ -10,7 +10,7 @@ index 34fde937fea30840585b21c0623443f7dcb6c46a..50de09977491c7961ce3fc643f175d1e content_type == CONTENT_SETTINGS_TYPE_SENSORS) { const auto& it = content_settings_status_.find(content_type); if (it != content_settings_status_.end()) -@@ -276,6 +277,7 @@ bool TabSpecificContentSettings::IsContentAllowed( +@@ -263,6 +264,7 @@ bool TabSpecificContentSettings::IsContentAllowed( content_type != CONTENT_SETTINGS_TYPE_PPAPI_BROKER && content_type != CONTENT_SETTINGS_TYPE_MIDI_SYSEX && content_type != CONTENT_SETTINGS_TYPE_CLIPBOARD_READ && diff --git a/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch b/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch index 4744357d8fc9..5d503dea850e 100644 --- a/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch +++ b/patches/chrome-browser-extensions-api-webrtc_logging_private-webrtc_logging_private_api.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc -index 3896f0b9e8f764fa425e0702c6ff97ba0a4b1bcf..37c067c77588130a78318d22eb695f70e982dc70 100644 +index bb110a5ba9bc6748e21c33df31ec1354f51a2057..3aa38f66ccc938cb119d5cde4a2096ee93422195 100644 --- a/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc +++ b/chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc @@ -87,6 +87,7 @@ std::string HashIdWithOrigin(const std::string& security_origin, diff --git a/patches/chrome-browser-extensions-component_loader.h.patch b/patches/chrome-browser-extensions-component_loader.h.patch index a78db28885c1..e8e35f1d8318 100644 --- a/patches/chrome-browser-extensions-component_loader.h.patch +++ b/patches/chrome-browser-extensions-component_loader.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/component_loader.h b/chrome/browser/extensions/component_loader.h -index 77b0a1e8952ece2cd9bb7ea511d7b90b8f8c9abf..d2585bfa2279b5c6e31110e548a0174a9981e892 100644 +index de5c2d5d19a7d99541ee146babe21661ae60e7f7..3f19721c3c6b0e69d31b51ad3b5d54ea131c01ed 100644 --- a/chrome/browser/extensions/component_loader.h +++ b/chrome/browser/extensions/component_loader.h @@ -81,7 +81,7 @@ class ComponentLoader { @@ -11,7 +11,7 @@ index 77b0a1e8952ece2cd9bb7ea511d7b90b8f8c9abf..d2585bfa2279b5c6e31110e548a0174a // Similar to above but adds the default component extensions for kiosk mode. void AddDefaultComponentExtensionsForKioskMode(bool skip_session_components); -@@ -120,6 +120,7 @@ class ComponentLoader { +@@ -116,6 +116,7 @@ class ComponentLoader { } private: @@ -19,7 +19,7 @@ index 77b0a1e8952ece2cd9bb7ea511d7b90b8f8c9abf..d2585bfa2279b5c6e31110e548a0174a FRIEND_TEST_ALL_PREFIXES(ComponentLoaderTest, ParseManifest); // Information about a registered component extension. -@@ -165,6 +166,7 @@ class ComponentLoader { +@@ -161,6 +162,7 @@ class ComponentLoader { void AddDefaultComponentExtensionsWithBackgroundPagesForKioskMode(); #if BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 05ab72e7987a..4e8aed44b030 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index 0c051349bd1a862372dc975923e7fe5cc2129233..8bc5c167f712986694063d26c0dbd5cb5f7386e6 100644 +index 11a07bc2976b1cb0314b22a5adcbb902ea66584b..0faf5060dadb3a9bc7a3134af0e66505c64b651d 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc @@ -16,6 +16,7 @@ @@ -10,7 +10,7 @@ index 0c051349bd1a862372dc975923e7fe5cc2129233..8bc5c167f712986694063d26c0dbd5cb #include "chrome/browser/extensions/extension_management_constants.h" #include "chrome/browser/extensions/extension_management_internal.h" #include "chrome/browser/extensions/external_policy_loader.h" -@@ -625,7 +626,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( +@@ -638,7 +639,7 @@ KeyedService* ExtensionManagementFactory::BuildServiceInstanceFor( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); diff --git a/patches/chrome-browser-extensions-extension_service.h.patch b/patches/chrome-browser-extensions-extension_service.h.patch index 7de07112ab52..ace4da14e4e2 100644 --- a/patches/chrome-browser-extensions-extension_service.h.patch +++ b/patches/chrome-browser-extensions-extension_service.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h -index 2c88f65d5000e47d7e96225a586979f5126d5326..e12d062623813ad66620bd50456b02366f33f997 100644 +index 4153a22dcfc39ee4ea87fff4e9f43496785e925b..a2e48e0681046cfda78efe2cf6682029119f931f 100644 --- a/chrome/browser/extensions/extension_service.h +++ b/chrome/browser/extensions/extension_service.h -@@ -443,6 +443,7 @@ class ExtensionService : public ExtensionServiceInterface, +@@ -424,6 +424,7 @@ class ExtensionService : public ExtensionServiceInterface, } private: 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 989ebf2d5dca..c0de056554aa 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 f8df0bf3d43cd2a68898d34ecaaf72c986a30868..a119cfba5f34ee8dc9d54b6b4013a74285a87fab 100644 +index a77be07dd3a06b2396bd9d6da53182ea1cd1476d..bb7f1caf4601a2641191f54335f0869decb6fe22 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc -@@ -236,7 +236,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( +@@ -237,7 +237,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-first_run-upgrade_util_win.cc.patch b/patches/chrome-browser-first_run-upgrade_util_win.cc.patch index 2342ab5ea9d9..9061e21c9f77 100644 --- a/patches/chrome-browser-first_run-upgrade_util_win.cc.patch +++ b/patches/chrome-browser-first_run-upgrade_util_win.cc.patch @@ -1,22 +1,22 @@ diff --git a/chrome/browser/first_run/upgrade_util_win.cc b/chrome/browser/first_run/upgrade_util_win.cc -index 8d77b39b0b2e477e1cfc24498b2480525eace027..8512d33c6df3e81f3ca5d8c29f6c89472593aae3 100644 +index 97cd4d1365eda7480c07c3b52c339515ca3acb40..a39aadfa07a3f1063c1fa3fd9a14ad8d159e2260 100644 --- a/chrome/browser/first_run/upgrade_util_win.cc +++ b/chrome/browser/first_run/upgrade_util_win.cc -@@ -38,7 +38,7 @@ +@@ -41,7 +41,7 @@ #include "components/prefs/pref_service.h" #include "ui/base/ui_base_switches.h" --#if defined(GOOGLE_CHROME_BUILD) -+#if defined(GOOGLE_CHROME_BUILD) || (defined(BRAVE_CHROMIUM_BUILD) && defined(OFFICIAL_BUILD)) +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) || (defined(BRAVE_CHROMIUM_BUILD) && defined(OFFICIAL_BUILD)) #include "google_update/google_update_idl.h" #endif -@@ -52,7 +52,7 @@ bool GetNewerChromeFile(base::FilePath* path) { +@@ -55,7 +55,7 @@ bool GetNewerChromeFile(base::FilePath* path) { } bool InvokeGoogleUpdateForRename() { --#if defined(GOOGLE_CHROME_BUILD) -+#if defined(GOOGLE_CHROME_BUILD) || (defined(BRAVE_CHROMIUM_BUILD) && defined(OFFICIAL_BUILD)) +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) ++#if BUILDFLAG(GOOGLE_CHROME_BRANDING) || (defined(BRAVE_CHROMIUM_BUILD) && defined(OFFICIAL_BUILD)) Microsoft::WRL::ComPtr ipl; HRESULT hr = ::CoCreateInstance(__uuidof(ProcessLauncherClass), nullptr, CLSCTX_ALL, IID_PPV_ARGS(&ipl)); diff --git a/patches/chrome-browser-importer-external_process_importer_client.cc.patch b/patches/chrome-browser-importer-external_process_importer_client.cc.patch index 2bedb5eaee0d..f8adf310637d 100644 --- a/patches/chrome-browser-importer-external_process_importer_client.cc.patch +++ b/patches/chrome-browser-importer-external_process_importer_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/importer/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc -index d6f6de319f3662dbd1d0b4bf469c8325aea127a9..dd7e12127a6339e1eff0da8307464eb0c256d615 100644 +index b39cff21dd81f1b4355508e2ecfb4a7700ec54dd..107e04d345dc424b8cf6efcbd018d62d4ef56eee 100644 --- a/chrome/browser/importer/external_process_importer_client.cc +++ b/chrome/browser/importer/external_process_importer_client.cc -@@ -67,6 +67,12 @@ void ExternalProcessImporterClient::Start() { +@@ -68,6 +68,12 @@ void ExternalProcessImporterClient::Start() { localized_strings.try_emplace( IDS_BOOKMARK_BAR_FOLDER_NAME, l10n_util::GetStringUTF8(IDS_BOOKMARK_BAR_FOLDER_NAME)); diff --git a/patches/chrome-browser-importer-external_process_importer_client.h.patch b/patches/chrome-browser-importer-external_process_importer_client.h.patch index c176efa111c6..8963aaf2eb8e 100644 --- a/patches/chrome-browser-importer-external_process_importer_client.h.patch +++ b/patches/chrome-browser-importer-external_process_importer_client.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/importer/external_process_importer_client.h b/chrome/browser/importer/external_process_importer_client.h -index 9451b0917536e73b42c596527112d3119b2c4cc5..1a0df4dc87bbf81ac73745feaeb009a93eb708bb 100644 +index 8e4f47662a42cdde51125a3e58bc870d42f9bdd8..67b2817fd8800036667a1be4d259d84f25af07f4 100644 --- a/chrome/browser/importer/external_process_importer_client.h +++ b/chrome/browser/importer/external_process_importer_client.h -@@ -85,6 +85,14 @@ class ExternalProcessImporterClient +@@ -86,6 +86,14 @@ class ExternalProcessImporterClient void OnAutofillFormDataImportGroup( const std::vector& autofill_form_data_entry_group) override; diff --git a/patches/chrome-browser-importer-importer_list.cc.patch b/patches/chrome-browser-importer-importer_list.cc.patch index 8ccbcc00e61a..6893ecc7378d 100644 --- a/patches/chrome-browser-importer-importer_list.cc.patch +++ b/patches/chrome-browser-importer-importer_list.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc -index 57c0506feeb1318ed0ed77b47ffce4babfe0b8e1..bc7c6e04098780d12c9c55d676f587ea5b7e8937 100644 +index e557e55bdacf3164232e329389da9631cade8e93..d622e086ab259a8989b774f4788cba7bfe348092 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc @@ -29,6 +29,9 @@ diff --git a/patches/chrome-browser-importer-in_process_importer_bridge.cc.patch b/patches/chrome-browser-importer-in_process_importer_bridge.cc.patch index 642776e70d79..418025e1ac21 100644 --- a/patches/chrome-browser-importer-in_process_importer_bridge.cc.patch +++ b/patches/chrome-browser-importer-in_process_importer_bridge.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/importer/in_process_importer_bridge.cc b/chrome/browser/importer/in_process_importer_bridge.cc -index 4604136463c577114d503d8973b2f82edd29666e..13a016d32faed7f1f75e02211b073eeea2dc4209 100644 +index 28f9e9a4d89a241b44e3bf6cee579a8f838a2d33..720c4a2dbad3d5cf9cba111c2e5c9f32dcd39f01 100644 --- a/chrome/browser/importer/in_process_importer_bridge.cc +++ b/chrome/browser/importer/in_process_importer_bridge.cc @@ -54,6 +54,10 @@ history::VisitSource ConvertImporterVisitSourceToHistoryVisitSource( 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 8de3cafcbfb8..ff77fcc607de 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,5 +1,5 @@ diff --git a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc -index 5c2e6bd6b4a1afded26813a3c2f7b6cbdefd3363..9c814712d18b5296e16845bff0a72eac986ccfbf 100644 +index d21dd50046f3eda224e30a3768b7e9e036855ae0..d0d74f27a6178aab7029221408f698dad52c640e 100644 --- a/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_event_log_uploader.cc @@ -268,6 +268,7 @@ bool WebRtcEventLogUploaderImpl::PrepareUploadData(std::string* upload_data) { diff --git a/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch b/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch index 65f19af23d8e..ce15f6df84fd 100644 --- a/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch +++ b/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -index a89794d69357b7bd24853c7a7bb978cec265eb59..65546bb06a1876912fc39f1135c4b6f58c9170bc 100644 +index 118028e5511c8ea5df8b67cdb4ed85e6381d0e6d..89538623f3382d660a439f1a32de05fe3d6f3f68 100644 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -445,6 +445,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) { +@@ -442,6 +442,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) { void WebRtcLogUploader::UploadCompressedLog( - const WebRtcLogUploadDoneData& upload_done_data, + const WebRtcLogUploader::UploadDoneData& upload_done_data, std::unique_ptr post_data) { + return; // feature disabled in Brave DCHECK_CALLED_ON_VALID_SEQUENCE(main_sequence_checker_); diff --git a/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch b/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch index 2c7e2ca920a3..f66dcff24775 100644 --- a/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch +++ b/patches/chrome-browser-metrics-chrome_metrics_services_manager_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc -index 1a7383a041622a493fa93884f3219d9925ac0fbc..bf6dc79addd5e8167434bb2a17e550a3715fcc91 100644 +index c14a0617edde680a9e2c6d9bb8129cab1b826031..7bc8ecedb7eccb6a0634d46d6a88335dac5baa65 100644 --- a/chrome/browser/metrics/chrome_metrics_services_manager_client.cc +++ b/chrome/browser/metrics/chrome_metrics_services_manager_client.cc -@@ -144,7 +144,7 @@ class ChromeMetricsServicesManagerClient::ChromeEnabledStateProvider +@@ -145,7 +145,7 @@ class ChromeMetricsServicesManagerClient::ChromeEnabledStateProvider } bool IsReportingEnabled() const override { 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 f2c4a233a83b..cb37ef18b34c 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index 156b022694d82b7e5b281cc8790b5ad8926a5c9b..a59601dc01c1c94dc6b4e49a62c71e6b056d6e7a 100644 +index 295d51d2c4c5b087c75fdecccbcf494cc7ad18a6..dedc690f35aebfff10545a845d568f61ee427f41 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc -@@ -250,7 +250,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem +@@ -278,7 +278,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem if (!manager_) return; manager_->GetURLLoaderFactory()->CreateLoaderAndStart( diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch b/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch index 1a6c48cf89f1..0f95b9daebdb 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_linux.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_linux.cc b/chrome/browser/notifications/notification_platform_bridge_linux.cc -index 04a4ac46f01173b3a8bdb4ebab1eeea03cfd6c1b..a2a0e8a90a2a564611ffc6e8f8240a63cf597fe6 100644 +index d895f59a259935d5bd0193e8ab0fbd0bd4725d48..81b3610920411e5909fe9d269079ed27c7e8f3b4 100644 --- a/chrome/browser/notifications/notification_platform_bridge_linux.cc +++ b/chrome/browser/notifications/notification_platform_bridge_linux.cc -@@ -648,6 +648,7 @@ class NotificationPlatformBridgeLinuxImpl +@@ -658,6 +658,7 @@ class NotificationPlatformBridgeLinuxImpl actions.push_back("Activate"); // Always add a settings button for web notifications. if (notification_type != NotificationHandler::Type::EXTENSION && diff --git a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch index 77b5eff424be..9a058034a2f3 100644 --- a/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch +++ b/patches/chrome-browser-notifications-notification_platform_bridge_mac.mm.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/notifications/notification_platform_bridge_mac.mm b/chrome/browser/notifications/notification_platform_bridge_mac.mm -index 08078c5f168ebf562fd19c0ebd621f1f7a5a6b5d..8bcd16b11888402fa48926564e13f78657442a05 100644 +index f4e3046614e13837050edf3862d66bccee3cc9e1..e982932589cbb24d486b41fb02e031abaf59f15f 100644 --- a/chrome/browser/notifications/notification_platform_bridge_mac.mm +++ b/chrome/browser/notifications/notification_platform_bridge_mac.mm @@ -226,6 +226,7 @@ void NotificationPlatformBridgeMac::Display( diff --git a/patches/chrome-browser-permissions-permission_manager.cc.patch b/patches/chrome-browser-permissions-permission_manager.cc.patch index 4d4e07cb450f..1932711530c9 100644 --- a/patches/chrome-browser-permissions-permission_manager.cc.patch +++ b/patches/chrome-browser-permissions-permission_manager.cc.patch @@ -1,21 +1,21 @@ diff --git a/chrome/browser/permissions/permission_manager.cc b/chrome/browser/permissions/permission_manager.cc -index 9f535334da7e3ca1939e98a055ec93662a38b552..81f81e6d2b3dc359d262440dbd20cf995ba88c46 100644 +index 6673d1591ab95d937a0c208d3ce4fce935329072..da3727e240f130c92304dee854d3522ff4e202f3 100644 --- a/chrome/browser/permissions/permission_manager.cc +++ b/chrome/browser/permissions/permission_manager.cc -@@ -89,7 +89,7 @@ PermissionStatus ContentSettingToPermissionStatus(ContentSetting setting) { - } - +@@ -106,7 +106,7 @@ ContentSetting PermissionStatusToContentSetting(PermissionStatus status) { // Helper method to convert PermissionType to ContentSettingType. --ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) { -+ContentSettingsType PermissionTypeToContentSetting_ChromiumImpl(PermissionType permission) { + // If PermissionType is not supported or found, returns + // CONTENT_SETTINGS_TYPE_DEFAULT. +-ContentSettingsType PermissionTypeToContentSettingSafe( ++ContentSettingsType PermissionTypeToContentSettingSafe_ChromiumImpl( + PermissionType permission) { switch (permission) { case PermissionType::MIDI: - return CONTENT_SETTINGS_TYPE_MIDI; -@@ -137,6 +137,7 @@ ContentSettingsType PermissionTypeToContentSetting(PermissionType permission) { +@@ -154,6 +154,7 @@ ContentSettingsType PermissionTypeToContentSettingSafe( case PermissionType::WAKE_LOCK_SYSTEM: return CONTENT_SETTINGS_TYPE_WAKE_LOCK_SYSTEM; case PermissionType::NUM: + default: - // This will hit the NOTREACHED below. break; } + diff --git a/patches/chrome-browser-permissions-permission_manager.h.patch b/patches/chrome-browser-permissions-permission_manager.h.patch index e1b328f847f1..dd0bb719c4fd 100644 --- a/patches/chrome-browser-permissions-permission_manager.h.patch +++ b/patches/chrome-browser-permissions-permission_manager.h.patch @@ -1,9 +1,9 @@ diff --git a/chrome/browser/permissions/permission_manager.h b/chrome/browser/permissions/permission_manager.h -index 39ab85753ec587df0f432f1339c80256dc25edf0..20d742069b154bab4b01462ff625fcb11a9555e7 100644 +index a3b90b9be6638a91769d7a5337174f51f437b4cd..ac731656479c40e12a00e883f7954c85c1e78d6a 100644 --- a/chrome/browser/permissions/permission_manager.h +++ b/chrome/browser/permissions/permission_manager.h -@@ -124,6 +124,7 @@ class PermissionManager : public KeyedService, - void ResetPermissionOverridesForDevTools(); +@@ -130,6 +130,7 @@ class PermissionManager : public KeyedService, + void Shutdown() override; private: + friend class BravePermissionManager; diff --git a/patches/chrome-browser-permissions-permission_request.h.patch b/patches/chrome-browser-permissions-permission_request.h.patch index 81c655ef7f00..0f75cb741658 100644 --- a/patches/chrome-browser-permissions-permission_request.h.patch +++ b/patches/chrome-browser-permissions-permission_request.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/permissions/permission_request.h b/chrome/browser/permissions/permission_request.h -index 6daa247ce558241db33a1d1ae0187f14631cc842..1bd4ae483d9803262a61fc7e6196848aa814ec54 100644 +index f996ac141e999b098b61fa41b60f24d00f1d6419..601cb26d025ea1ca93527f68441edd0a1dfea7f2 100644 --- a/chrome/browser/permissions/permission_request.h +++ b/chrome/browser/permissions/permission_request.h @@ -45,6 +45,7 @@ enum class PermissionRequestType { diff --git a/patches/chrome-browser-permissions-permission_request_impl.h.patch b/patches/chrome-browser-permissions-permission_request_impl.h.patch index 93037861a6ee..083bdf0661a8 100644 --- a/patches/chrome-browser-permissions-permission_request_impl.h.patch +++ b/patches/chrome-browser-permissions-permission_request_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/permissions/permission_request_impl.h b/chrome/browser/permissions/permission_request_impl.h -index 3524b3cadbf0e310ac3ba707d35d3ed782b83b34..f49e931202877fe2e33ba1a473b97b78865bbd4d 100644 +index 4639136abb332864391bd69989c82f77c9d54477..53a831dd86304eeb23bcce922134e88fef2dae85 100644 --- a/chrome/browser/permissions/permission_request_impl.h +++ b/chrome/browser/permissions/permission_request_impl.h -@@ -32,11 +32,13 @@ class PermissionRequestImpl : public PermissionRequest { +@@ -32,6 +32,7 @@ class PermissionRequestImpl : public PermissionRequest { private: // PermissionRequest: IconId GetIconId() const override; @@ -10,6 +10,8 @@ index 3524b3cadbf0e310ac3ba707d35d3ed782b83b34..f49e931202877fe2e33ba1a473b97b78 #if defined(OS_ANDROID) base::string16 GetTitleText() const override; base::string16 GetMessageText() const override; +@@ -39,6 +40,7 @@ class PermissionRequestImpl : public PermissionRequest { + base::string16 GetQuietMessageText() const override; #endif base::string16 GetMessageTextFragment() const override; + base::string16 GetMessageTextFragment_ChromiumImpl() const; diff --git a/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch b/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch index 02357bf63c90..6025112f630a 100644 --- a/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch +++ b/patches/chrome-browser-plugins-chrome_plugin_service_filter.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/plugins/chrome_plugin_service_filter.cc b/chrome/browser/plugins/chrome_plugin_service_filter.cc -index 55801ac0fee766a5f46314137d4745ff8a1d7f24..9acdabbe23d440d7468cbc9ef3b1e589f74db12c 100644 +index 8916d9329a6c163bc6db045a252d703d6d14ff56..ebd15af6e52c619da3c5456df1e7bbc0ca05be3e 100644 --- a/chrome/browser/plugins/chrome_plugin_service_filter.cc +++ b/chrome/browser/plugins/chrome_plugin_service_filter.cc -@@ -51,7 +51,7 @@ class ProfileContentSettingObserver : public content_settings::Observer { +@@ -50,7 +50,7 @@ class ProfileContentSettingObserver : public content_settings::Observer { PluginService::GetInstance()->PurgePluginListCache(profile_, false); const GURL primary(primary_pattern.ToString()); diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index 58858f7e63e3..147e29f3b820 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 b806315041d481b485a9329097b5b626ff0921b0..73e949fdb3b751b923e759c35f546c9ec38895ea 100644 +index f592c9760e3ba32f78e5bee6e6d70c2d64c3313f..dc4b6286f5399b8c4f3603fa76c1ab7b7f42c9f3 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -688,6 +688,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -731,6 +731,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { #if defined(TOOLKIT_VIEWS) RegisterBrowserViewLocalPrefs(registry); #endif @@ -10,7 +10,7 @@ index b806315041d481b485a9329097b5b626ff0921b0..73e949fdb3b751b923e759c35f546c9e } // Register prefs applicable to all profiles. -@@ -945,6 +946,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -987,6 +988,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 eef509f7c0f6..0679f5f614e8 100644 --- a/patches/chrome-browser-profile_resetter-brandcode_config_fetcher.cc.patch +++ b/patches/chrome-browser-profile_resetter-brandcode_config_fetcher.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc -index fc3a11a5719267d43d8063b4cbad464f7519c0e3..0ac85d36db11692d9defad965e8025eb21993ae8 100644 +index b2127e4d833b07cd667479a7185ed53447bb6c68..9f027b3c8059bb12096963c955912421506c9adb 100644 --- a/chrome/browser/profile_resetter/brandcode_config_fetcher.cc +++ b/chrome/browser/profile_resetter/brandcode_config_fetcher.cc @@ -146,6 +146,8 @@ BrandcodeConfigFetcher::BrandcodeConfigFetcher( diff --git a/patches/chrome-browser-profile_resetter-reset_report_uploader.cc.patch b/patches/chrome-browser-profile_resetter-reset_report_uploader.cc.patch index c7770fac5cfa..e54a88dee386 100644 --- a/patches/chrome-browser-profile_resetter-reset_report_uploader.cc.patch +++ b/patches/chrome-browser-profile_resetter-reset_report_uploader.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profile_resetter/reset_report_uploader.cc b/chrome/browser/profile_resetter/reset_report_uploader.cc -index a41afd505e69c6db8a949fd9a00dfd9defde3326..799d163af51d58c374e4af4e2d1231e50f4617bc 100644 +index fee0739a04ab8d54a5715e6c2e0fa557c6ec0952..57adb27517281380a6f999d9f7cb755a91ce858b 100644 --- a/chrome/browser/profile_resetter/reset_report_uploader.cc +++ b/chrome/browser/profile_resetter/reset_report_uploader.cc @@ -49,6 +49,7 @@ void ResetReportUploader::DispatchReport( diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index ab41b829fd2b..e8797215e050 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 28d3c597acc9e58bab439badb1d1dc9baa139048..a23013c78421e07a96a2d0bab2935a76fde35ea9 100644 +index 56058d9ee424840d1b98ecfee42c656413c49542..e3de78cd2ff55e1db8f54d7c82ab97390dce674a 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -140,7 +140,7 @@ const char Profile::kProfileKey[] = "__PROFILE__"; 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 57e4c12470e4..3dd15fb123dc 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 c39443398d04974564cd53bc7705dc68cd65e6cc..508f734ab5af72caac46897764d77ada0fa23a50 100644 +index 1b71fa4cf30913956e7001c008c81fb42652ecfb..4c81be136c57e851770732809e9a4afc6c792f95 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc -@@ -265,7 +265,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; +@@ -312,7 +312,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; #elif defined(OS_CHROMEOS) constexpr size_t kDefaultAvatarIconsCount = 27; #else @@ -11,7 +11,7 @@ index c39443398d04974564cd53bc7705dc68cd65e6cc..508f734ab5af72caac46897764d77ada #endif #if !defined(OS_ANDROID) -@@ -372,6 +372,7 @@ size_t GetPlaceholderAvatarIndex() { +@@ -419,6 +419,7 @@ size_t GetPlaceholderAvatarIndex() { size_t GetModernAvatarIconStartIndex() { #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) @@ -19,7 +19,7 @@ index c39443398d04974564cd53bc7705dc68cd65e6cc..508f734ab5af72caac46897764d77ada return GetPlaceholderAvatarIndex() + 1; #else // Only use the placeholder avatar on ChromeOS and Android. -@@ -397,6 +398,7 @@ std::string GetPlaceholderAvatarIconUrl() { +@@ -444,6 +445,7 @@ std::string GetPlaceholderAvatarIconUrl() { const IconResourceInfo* GetDefaultAvatarIconResourceInfo(size_t index) { CHECK_LT(index, kDefaultAvatarIconsCount); diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index ba0a380eab60..83aad01cbb1a 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,13 +1,13 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index 084648e9606f9847ff722901fb95626677a17c1e..80e5b28e1df1076b18ded2bed182a13e1092d47c 100644 +index 714af841142c924ed84cc5d2fb128ea42f1e47ec..2c3dbe59a65a94ae207f521c358489570039185a 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -365,7 +365,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, +@@ -372,7 +372,7 @@ std::unique_ptr Profile::CreateProfile(const base::FilePath& path, + NOTREACHED(); } - std::unique_ptr profile = base::WrapUnique( -- new ProfileImpl(path, delegate, create_mode, io_task_runner)); -+ new BraveProfileImpl(path, delegate, create_mode, io_task_runner)); +- std::unique_ptr profile = base::WrapUnique(new ProfileImpl( ++ std::unique_ptr profile = base::WrapUnique(new BraveProfileImpl( + path, delegate, create_mode, creation_time, io_task_runner)); #if BUILDFLAG(ENABLE_SUPERVISED_USERS) && !defined(OS_ANDROID) && \ !defined(OS_CHROMEOS) - if (create_mode == CREATE_MODE_SYNCHRONOUS && profile->IsLegacySupervised()) diff --git a/patches/chrome-browser-profiles-profile_impl.h.patch b/patches/chrome-browser-profiles-profile_impl.h.patch index c50c09cf388d..8c25c6ee01e4 100644 --- a/patches/chrome-browser-profiles-profile_impl.h.patch +++ b/patches/chrome-browser-profiles-profile_impl.h.patch @@ -1,12 +1,12 @@ diff --git a/chrome/browser/profiles/profile_impl.h b/chrome/browser/profiles/profile_impl.h -index e33619d098783950b33bc970c07d197340bd565e..57eeba6884964250a89b8bd1c20fcfddaa53f7a6 100644 +index 50b230b4daab4113e84b7d80e862b980b7ff69b3..4766794e08b874ddbc525b15f95d7f1a58b3e21c 100644 --- a/chrome/browser/profiles/profile_impl.h +++ b/chrome/browser/profiles/profile_impl.h -@@ -166,6 +166,7 @@ class ProfileImpl : public Profile { +@@ -169,6 +169,7 @@ class ProfileImpl : public Profile { void OnLogin() override; void InitChromeOSPreferences() override; #endif // defined(OS_CHROMEOS) + BRAVE_PROFILE_IMPL_H_ - private: - #if defined(OS_CHROMEOS) + void SetCreationTimeForTesting(base::Time creation_time) override; + diff --git a/patches/chrome-browser-profiles-profile_io_data.cc.patch b/patches/chrome-browser-profiles-profile_io_data.cc.patch index 49db89e3cb79..e6cc3c01a3f6 100644 --- a/patches/chrome-browser-profiles-profile_io_data.cc.patch +++ b/patches/chrome-browser-profiles-profile_io_data.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc -index 285f9e09a9020e8647fe363f7d3b0c867b1d26ea..10a247b701690ff70f1039a43d94dd164c3f18dd 100644 +index 33d88f92460754e91fac74831422cb818c50ef73..d1dbf898a3d517f369d96fa17dea087dd178ab95 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc -@@ -417,6 +417,9 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { +@@ -352,6 +352,9 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { extensions::kExtensionScheme, #endif content::kChromeUIScheme, diff --git a/patches/chrome-browser-profiles-profile_manager.h.patch b/patches/chrome-browser-profiles-profile_manager.h.patch index fa4a11cd6c53..947c83364dc1 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 985c64458bdf2c547a5b9286b448aaa2513b2109..a677df807effba3589b6a067ffc940432b064839 100644 +index 87ecf1fc998b01569fa10a886e7116299da449c1..40016aeadd02bb2ca2a252070c946d4a3dde0be4 100644 --- a/chrome/browser/profiles/profile_manager.h +++ b/chrome/browser/profiles/profile_manager.h -@@ -141,7 +141,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -146,7 +146,7 @@ class ProfileManager : public content::NotificationObserver, // Get the name of the last used profile, or if that's undefined, the default // profile. @@ -11,7 +11,7 @@ index 985c64458bdf2c547a5b9286b448aaa2513b2109..a677df807effba3589b6a067ffc94043 // Get the Profiles which are currently open, i.e. have open browsers or were // open the last time Chrome was running. Profiles that fail to initialize are -@@ -222,7 +222,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -227,7 +227,7 @@ class ProfileManager : public content::NotificationObserver, // Initializes user prefs of |profile|. This includes profile name and // avatar values. @@ -20,7 +20,7 @@ index 985c64458bdf2c547a5b9286b448aaa2513b2109..a677df807effba3589b6a067ffc94043 // Register and add testing profile to the ProfileManager. Use ONLY in tests. // This allows the creation of Profiles outside of the standard creation path -@@ -349,7 +349,7 @@ class ProfileManager : public content::NotificationObserver, +@@ -355,7 +355,7 @@ class ProfileManager : public content::NotificationObserver, // Apply settings for profiles created by the system rather than users: The // (desktop) Guest User profile and (desktop) System Profile. diff --git a/patches/chrome-browser-profiles-profile_window.h.patch b/patches/chrome-browser-profiles-profile_window.h.patch index fb8b4a13e4d0..766a24efa1ca 100644 --- a/patches/chrome-browser-profiles-profile_window.h.patch +++ b/patches/chrome-browser-profiles-profile_window.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_window.h b/chrome/browser/profiles/profile_window.h -index 9c45ff6ecf245ec6c45111b410d040ab845b2ffb..13025d48cfe4b098fc52afd49877a4ec79ac2b92 100644 +index 00014301cdb506f01e0c6632c8d35b8ea7f40584..1d01d4e519c0c8705ce5c21eb28b99351115c706 100644 --- a/chrome/browser/profiles/profile_window.h +++ b/chrome/browser/profiles/profile_window.h @@ -87,6 +87,7 @@ void SwitchToProfile(const base::FilePath& path, diff --git a/patches/chrome-browser-push_messaging-push_messaging_service_impl.cc.patch b/patches/chrome-browser-push_messaging-push_messaging_service_impl.cc.patch index 42d9dcfed24c..425c10b4e4d4 100644 --- a/patches/chrome-browser-push_messaging-push_messaging_service_impl.cc.patch +++ b/patches/chrome-browser-push_messaging-push_messaging_service_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/push_messaging/push_messaging_service_impl.cc b/chrome/browser/push_messaging/push_messaging_service_impl.cc -index 207929701b3f7c5f3f049abbddcf46f35a1ea0c2..393d2a9c3182bb2e44c696c1d3e055859ccadfc5 100644 +index ce505a8d3d58d0c1b0c96e6b3f6280f0e26576ba..85f28d93c86f925be869d9ec8944ae5e46674490 100644 --- a/chrome/browser/push_messaging/push_messaging_service_impl.cc +++ b/chrome/browser/push_messaging/push_messaging_service_impl.cc @@ -169,7 +169,8 @@ void PushMessagingServiceImpl::InitializeForProfile(Profile* profile) { 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 13b46e0981fa..ae38bf2e0378 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 7e993b49e93d4a51baa2f6f4bc7953ddc099f4c6..f21255d047bbf411ce4d0509da828c7486f7c668 100644 +index 138cc1909e5a17fa4678736b02325f499f32eab8..9f497b6598f3c98ee7c39246b73c30b9f623053c 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -112,6 +112,7 @@ class RenderViewContextMenu : public RenderViewContextMenuBase { +@@ -113,6 +113,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-renderer_host-chrome_render_message_filter.h.patch b/patches/chrome-browser-renderer_host-chrome_render_message_filter.h.patch index dda9eba422b3..609a942baeeb 100644 --- a/patches/chrome-browser-renderer_host-chrome_render_message_filter.h.patch +++ b/patches/chrome-browser-renderer_host-chrome_render_message_filter.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.h b/chrome/browser/renderer_host/chrome_render_message_filter.h -index 70c61e40907b7c38d39079c6ff695f9cbe7c6f38..29bd1c52e9e0d94f3c4753cd8001b20f7078457f 100644 +index bc8a29282827a68744da7eb8d2392bc52dab6952..f82985754d3a539c5f2b13dcc7b46814bf044b70 100644 --- a/chrome/browser/renderer_host/chrome_render_message_filter.h +++ b/chrome/browser/renderer_host/chrome_render_message_filter.h @@ -16,6 +16,7 @@ @@ -10,7 +10,7 @@ index 70c61e40907b7c38d39079c6ff695f9cbe7c6f38..29bd1c52e9e0d94f3c4753cd8001b20f class GURL; class Profile; -@@ -43,6 +44,7 @@ class ChromeRenderMessageFilter : public content::BrowserMessageFilter { +@@ -47,6 +48,7 @@ class ChromeRenderMessageFilter : public content::BrowserMessageFilter { content::BrowserThread::ID* thread) override; private: diff --git a/patches/chrome-browser-resources-bookmarks-command_manager.js.patch b/patches/chrome-browser-resources-bookmarks-command_manager.js.patch index 153d92708d31..9fb08f9e633e 100644 --- a/patches/chrome-browser-resources-bookmarks-command_manager.js.patch +++ b/patches/chrome-browser-resources-bookmarks-command_manager.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/bookmarks/command_manager.js b/chrome/browser/resources/bookmarks/command_manager.js -index a1675b32d1425fb0fb43141c44e2032aba5ad1c1..337ee5e73911d374665d47d47d402074718b010f 100644 +index 3d83ab732f610b80c0d9fbec67a4e1485e1ce401..098d35bf7237ddba7b7f75974df0f25216c107e1 100644 --- a/chrome/browser/resources/bookmarks/command_manager.js +++ b/chrome/browser/resources/bookmarks/command_manager.js -@@ -405,7 +405,7 @@ cr.define('bookmarks', function() { +@@ -411,7 +411,7 @@ cr.define('bookmarks', function() { chrome.bookmarks.export(); break; case Command.HELP_CENTER: diff --git a/patches/chrome-browser-resources-extensions-BUILD.gn.patch b/patches/chrome-browser-resources-extensions-BUILD.gn.patch index 39f43e0f9789..fe7772a77fab 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 7a60d45137f7c9bdc2f557c88fa16487fd4118db..3de1724a8694e65091a1c35df3ad60dd02ca79a3 100644 +index 1798f6238a7a1a462bd62cb33631c4a8497cd1cf..b51c7627b93cded6a911452101ea0087508b9604 100644 --- a/chrome/browser/resources/extensions/BUILD.gn +++ b/chrome/browser/resources/extensions/BUILD.gn @@ -21,6 +21,7 @@ optimize_webui("build") { diff --git a/patches/chrome-browser-resources-extensions-manager.html.patch b/patches/chrome-browser-resources-extensions-manager.html.patch index 201102a7c501..8da8a7929b35 100644 --- a/patches/chrome-browser-resources-extensions-manager.html.patch +++ b/patches/chrome-browser-resources-extensions-manager.html.patch @@ -1,11 +1,11 @@ diff --git a/chrome/browser/resources/extensions/manager.html b/chrome/browser/resources/extensions/manager.html -index 0acd9673c751cdfa84eaec7b2ce624ded7ab46ec..9d9eac482a0a7352d3741924f4d6bcd3f0401455 100644 +index 1c35c2850681d223134c891713778aab32e21993..3f7cf7cce6f2e97f236d84b63b73aaa28a924244 100644 --- a/chrome/browser/resources/extensions/manager.html +++ b/chrome/browser/resources/extensions/manager.html -@@ -2,7 +2,6 @@ - +@@ -3,7 +3,6 @@ + - diff --git a/patches/chrome-browser-resources-extensions-toolbar.html.patch b/patches/chrome-browser-resources-extensions-toolbar.html.patch index 04410d27f554..88ab622ad9bf 100644 --- a/patches/chrome-browser-resources-extensions-toolbar.html.patch +++ b/patches/chrome-browser-resources-extensions-toolbar.html.patch @@ -1,10 +1,10 @@ diff --git a/chrome/browser/resources/extensions/toolbar.html b/chrome/browser/resources/extensions/toolbar.html -index 7e08974284adad472b8691ace100770ebd64475c..da03ebaf3c24caf1a227448fada709604bc6cddd 100644 +index 9b8706bd762dc5a04fb89bf8a5e02449b03858e0..4a52bca80e42d3c00a6fb47d87658cd797707642 100644 --- a/chrome/browser/resources/extensions/toolbar.html +++ b/chrome/browser/resources/extensions/toolbar.html @@ -3,7 +3,7 @@ - + - + diff --git a/patches/chrome-browser-resources-local_discovery-local_discovery.js.patch b/patches/chrome-browser-resources-local_discovery-local_discovery.js.patch index 14ad0bb32642..6e6f129def86 100644 --- a/patches/chrome-browser-resources-local_discovery-local_discovery.js.patch +++ b/patches/chrome-browser-resources-local_discovery-local_discovery.js.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/local_discovery/local_discovery.js b/chrome/browser/resources/local_discovery/local_discovery.js -index 7094e5cec6bca24d97a80775dbf4fb5281ddfa4b..983e5120d92faef64cf635e67f5b0f794ca4f549 100644 +index 1d2a54502cfeb8a41e5e748e1aaca85c14589fbe..920fb93afbd5c918e5da1fe699f857ccc8453e69 100644 --- a/chrome/browser/resources/local_discovery/local_discovery.js +++ b/chrome/browser/resources/local_discovery/local_discovery.js -@@ -541,6 +541,7 @@ cr.define('local_discovery', function() { +@@ -540,6 +540,7 @@ cr.define('local_discovery', function() { $('cloud-devices-retry-link') .addEventListener('click', retryLoadCloudDevices); @@ -10,7 +10,7 @@ index 7094e5cec6bca24d97a80775dbf4fb5281ddfa4b..983e5120d92faef64cf635e67f5b0f79 $('cloud-devices-login-link') .addEventListener('click', cloudDevicesLoginButtonClicked); -@@ -549,6 +550,7 @@ cr.define('local_discovery', function() { +@@ -548,6 +549,7 @@ cr.define('local_discovery', function() { $('register-overlay-login-button') .addEventListener('click', registerOverlayLoginButtonClicked); diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index c3ba1e5cf721..91d97728f049 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 90c81d104577e075749584511f53770fe31c9105..f7aa87e98d6c65e35529543721ba02b78ea73d6c 100644 +index 4ba0dd05e724552e731a065692709cfd564d9e29..4866ce1b336f4d5cfd1caacebc58aa6d54a369b8 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn @@ -31,6 +31,7 @@ if (optimize_webui) { diff --git a/patches/chrome-browser-resources-settings-about_page-about_page.html.patch b/patches/chrome-browser-resources-settings-about_page-about_page.html.patch index 11b1d6755d19..4f51b809894e 100644 --- a/patches/chrome-browser-resources-settings-about_page-about_page.html.patch +++ b/patches/chrome-browser-resources-settings-about_page-about_page.html.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/about_page/about_page.html b/chrome/browser/resources/settings/about_page/about_page.html -index 18c371cdbbe94c2b995988994408543ed9dccbcb..d971ad5e836246fa51edbe0d380a7defd5d155c9 100644 +index 4571c6eea39c5c279c89f1621a6596e9676501e5..69bc8263a7626c62f4c8840e1bb40b544b3979ff 100644 --- a/chrome/browser/resources/settings/about_page/about_page.html +++ b/chrome/browser/resources/settings/about_page/about_page.html -@@ -136,7 +136,7 @@ +@@ -160,7 +160,7 @@ - +@@ -22,6 +22,12 @@ + + + + @@ -15,7 +15,7 @@ index df9863a3a64cec001f2d4a40663b0fe8512e9a25..782529ff189b082467619b1f74de65dc