From db193983d0a683e23f60e062b8532f106a2254cb Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 26 Feb 2026 13:49:06 +0000 Subject: [PATCH] Update patches from Chromium 145.0.7632.120 to Chromium 146.0.7680.32. --- patches/base-BUILD.gn.patch | 6 +-- .../base-metrics-histogram_functions.h.patch | 2 +- ...est-launcher-test_results_tracker.cc.patch | 2 +- ...base-threading-thread_restrictions.h.patch | 4 +- ...ase-trace_event-builtin_categories.h.patch | 4 +- ...ld-android-gradle-generate_gradle.py.patch | 4 +- ...ild-android-gyp-create_app_bundle.py.patch | 4 +- patches/build-android-gyp-proguard.py.patch | 4 +- ...d-android-gyp-util-resource_utils.py.patch | 2 +- ...d-pylib-gtest-gtest_test_instance.py.patch | 4 +- patches/build-config-BUILDCONFIG.gn.patch | 2 +- patches/build-config-android-config.gni.patch | 2 +- ...ld-config-android-internal_rules.gni.patch | 2 +- patches/build-config-android-rules.gni.patch | 2 +- patches/build-config-siso-main.star.patch | 6 +-- ...uild-config-unsafe_buffers_paths.txt.patch | 4 +- patches/build-rust-cargo_crate.gni.patch | 6 +-- patches/chrome-BUILD.gn.patch | 24 +++++----- patches/chrome-android-BUILD.gn.patch | 20 ++++----- ...rome-android-chrome_java_sources.gni.patch | 4 +- ...e-android-chrome_public_apk_tmpl.gni.patch | 4 +- ...ome-android-features-tab_ui-BUILD.gn.patch | 4 +- ...rowser-feed-FeedSurfaceMediator.java.patch | 4 +- ...ome-android-java-AndroidManifest.xml.patch | 12 ++--- ...a-res-layout-custom_tabs_toolbar.xml.patch | 2 +- ...id-java-res-xml-main_preferences.xml.patch | 4 +- ...me-browser-ChromeTabbedActivity.java.patch | 4 +- ...rome-browser-app-ChromeActivity.java.patch | 4 +- ..._data-ClearBrowsingDataFragment.java.patch | 4 +- ...menu-ChromeContextMenuPopulator.java.patch | 2 +- ...en-FullscreenHtmlApiHandlerBase.java.patch | 2 +- ...er-infobar-InfoBarContainerView.java.patch | 2 +- ...ions-NotificationPlatformBridge.java.patch | 4 +- ...m-chrome-browser-ntp-NewTabPage.java.patch | 2 +- ...rivacy-settings-PrivacySettings.java.patch | 8 ++-- ...ync-settings-ManageSyncSettings.java.patch | 6 +-- patches/chrome-app-BUILD.gn.patch | 4 +- patches/chrome-browser-BUILD.gn.patch | 6 +-- patches/chrome-browser-about_flags.cc.patch | 4 +- .../chrome-browser-actor-site_policy.cc.patch | 4 +- ...rowsing_data-browsing_data_bridge.cc.patch | 2 +- ...chrome-browser-app_controller_mac.mm.patch | 6 +-- ...me_browsing_data_remover_delegate.cc.patch | 2 +- ...e-browser-chrome_browser_main_mac.mm.patch | 4 +- ...me-browser-content_settings-BUILD.gn.patch | 4 +- ...pecific_content_settings_delegate.cc.patch | 4 +- ...s_side_panel_coordinator_unittest.cc.patch | 4 +- ...wnload-download_target_determiner.cc.patch | 6 +-- ...r-download-internal-android-BUILD.gn.patch | 4 +- .../chrome-browser-extensions-BUILD.gn.patch | 4 +- ..._private-extension_info_generator.cc.patch | 4 +- ...rivate-webrtc_logging_private_api.cc.patch | 4 +- ...ponent_extension_resource_manager.cc.patch | 2 +- ...r-extensions-extension_management.cc.patch | 4 +- ...ser-extensions-extension_tab_util.cc.patch | 4 +- ...rotocol-external_protocol_handler.cc.patch | 2 +- .../chrome-browser-global_features.cc.patch | 2 +- ...id-res-layout-hub_toolbar_layout.xml.patch | 6 +-- ...-media-webrtc-webrtc_log_uploader.cc.patch | 4 +- ...trics-chrome_feature_list_creator.cc.patch | 4 +- ...t-profile_network_context_service.cc.patch | 4 +- ...et-system_network_context_manager.cc.patch | 2 +- patches/chrome-browser-prefs-BUILD.gn.patch | 4 +- ...hrome-browser-prefs-browser_prefs.cc.patch | 10 ++--- ...prefs-chrome_pref_service_factory.cc.patch | 2 +- .../chrome-browser-profiles-profile.cc.patch | 2 +- ...profiles-profile_attributes_entry.cc.patch | 2 +- ...profiles-profile_avatar_icon_util.cc.patch | 4 +- ...ome-browser-profiles-profile_impl.cc.patch | 4 +- ...ext_menu-render_view_context_menu.cc.patch | 4 +- ...text_menu-render_view_context_menu.h.patch | 4 +- ...icate_manager-certificate_manager.ts.patch | 4 +- ...-browser-resources-settings-BUILD.gn.patch | 4 +- ...ettings-people_page-sync_controls.ts.patch | 2 +- ...tings-privacy_page-privacy_page.html.patch | 2 +- ...-browser-resources-settings-route.ts.patch | 2 +- ...owser-resources-settings-settings.ts.patch | 2 +- ...sources-settings-settings_shared.css.patch | 2 +- ...-settings-site_settings-constants.ts.patch | 4 +- ...-site_settings-site_settings_util.ts.patch | 4 +- ...el-bookmarks-power_bookmarks_list.ts.patch | 2 +- ...es-side_panel-read_anything-BUILD.gn.patch | 4 +- ...rowser-resources-tab_search-BUILD.gn.patch | 2 +- ...-browser-sessions-session_service.cc.patch | 4 +- ...e-browser-shell_integration_linux.cc.patch | 2 +- ...owser-signin-chrome_signin_helper.cc.patch | 4 +- ...-browser-signin-signin_promo_util.cc.patch | 2 +- ...e-browser-ssl-https_upgrades_util.cc.patch | 4 +- ...e_access_grant_permission_context.cc.patch | 4 +- ...browser-sync-sync_service_factory.cc.patch | 4 +- ...wser-themes-theme_service_factory.cc.patch | 4 +- patches/chrome-browser-ui-BUILD.gn.patch | 12 ++--- ...rowser-ui-actions-chrome_action_id.h.patch | 4 +- ...ui-android-appmenu-internal-BUILD.gn.patch | 2 +- ...-res-layout-url_action_container.xml.patch | 6 +-- ...-browser-ui-android-toolbar-BUILD.gn.patch | 6 +-- ...r-java-res-layout-toolbar_tablet.xml.patch | 4 +- ...rowser-toolbar-top-ToolbarPhone.java.patch | 12 ++--- ...owser-toolbar-top-ToolbarTablet.java.patch | 4 +- patches/chrome-browser-ui-browser.cc.patch | 10 ++--- ...hrome-browser-ui-browser_commands.cc.patch | 4 +- ...rome-browser-ui-browser_navigator.cc.patch | 4 +- ...hrome-browser-ui-browser_ui_prefs.cc.patch | 2 +- ...e-browser-ui-browser_window-BUILD.gn.patch | 4 +- ...-ui-browser_window-internal-BUILD.gn.patch | 4 +- ...dow-public-browser_window_features.h.patch | 4 +- .../chrome-browser-ui-chrome_pages.cc.patch | 4 +- ...browser-ui-messages-android-BUILD.gn.patch | 4 +- ...ssages-snackbar-SnackbarManager.java.patch | 4 +- ...ser-ui-omnibox-omnibox_edit_model.cc.patch | 4 +- .../chrome-browser-ui-tab_helpers.cc.patch | 4 +- ...rowser-ui-tabs-public-tab_features.h.patch | 4 +- ...i-tabs-recent_tabs_sub_menu_model.cc.patch | 4 +- .../chrome-browser-ui-tabs-tab_model.cc.patch | 4 +- ...me-browser-ui-tabs-tab_strip_model.h.patch | 4 +- ...e-browser-ui-tabs-tab_strip_prefs.cc.patch | 2 +- ...views-bookmarks-bookmark_bar_view.cc.patch | 4 +- ...-extensions_menu_delegate_desktop.cc.patch | 4 +- ...ns-extensions_menu_main_page_view.cc.patch | 4 +- ...owser-ui-views-frame-browser_view.cc.patch | 6 +-- ...e-horizontal_tab_strip_region_view.h.patch | 4 +- ...i-views-frame-multi_contents_view.cc.patch | 6 +-- ...cation_bar-icon_label_bubble_view.cc.patch | 4 +- ...ws-location_bar-location_bar_view.cc.patch | 2 +- ...s-location_bar-location_icon_view.cc.patch | 4 +- ...verlay-video_overlay_window_views.cc.patch | 6 +-- ...ermission_prompt_bubble_base_view.cc.patch | 4 +- ...ews-profiles-avatar_toolbar_button.h.patch | 4 +- ...to_self_device_picker_bubble_view.cc.patch | 2 +- ...ews-side_panel-side_panel_entry_id.h.patch | 4 +- ...-tabs-dragging-tab_drag_controller.h.patch | 2 +- .../chrome-browser-ui-views-tabs-tab.cc.patch | 8 ++-- .../chrome-browser-ui-views-tabs-tab.h.patch | 4 +- ...ws-tabs-tab_hover_card_bubble_view.h.patch | 4 +- ...e-browser-ui-views-tabs-tab_strip.cc.patch | 8 ++-- ...ser-ui-views-tabs-tab_style_views.cc.patch | 10 ++--- ...tabs-vertical-tab_collection_node.cc.patch | 4 +- ...on-browser_user_education_service.cc.patch | 4 +- .../chrome-browser-ui-webui-BUILD.gn.patch | 4 +- ...-chrome_web_ui_controller_factory.cc.patch | 4 +- ...nents-searchbox-searchbox_handler.cc.patch | 4 +- ...ui-webui-extensions-extensions_ui.cc.patch | 4 +- ...ui-print_preview-print_preview_ui.cc.patch | 2 +- ...ebui-settings-import_data_handler.cc.patch | 4 +- ...webui-settings-import_data_handler.h.patch | 2 +- ...-ui-webui-settings-people_handler.cc.patch | 8 ++-- ...ttings_localized_strings_provider.cc.patch | 4 +- ...side_panel-bookmarks-bookmarks.mojom.patch | 2 +- ...ome-browser-ui-webui-theme_source.cc.patch | 2 +- patches/chrome-browser-updater-BUILD.gn.patch | 2 +- ...hrome_proxy-chrome_proxy_main_win.cc.patch | 2 +- patches/chrome-common-BUILD.gn.patch | 10 ++--- ...extensions-api-developer_private.idl.patch | 4 +- ...me-installer-mac-signing-pipeline.py.patch | 6 +-- ...ler-mini_installer-mini_installer.cc.patch | 2 +- ...me-installer-setup-install_worker.cc.patch | 2 +- ...chrome-installer-setup-setup_main.cc.patch | 2 +- patches/chrome-installer-util-BUILD.gn.patch | 2 +- ...aller-util-google_update_settings.cc.patch | 2 +- .../chrome-installer-util-shell_util.cc.patch | 2 +- patches/chrome-renderer-BUILD.gn.patch | 4 +- ...er-chrome_content_renderer_client.cc.patch | 4 +- patches/chrome-test-BUILD.gn.patch | 4 +- ...test-base-testing_browser_process.cc.patch | 2 +- ...me-test-data-webui-settings-BUILD.gn.patch | 4 +- patches/chrome-utility-BUILD.gn.patch | 4 +- ...dresses-profile_requirement_utils.cc.patch | 2 +- ...e_settings-ChosenObjectSettings.java.patch | 2 +- ...settings-SingleCategorySettings.java.patch | 4 +- ...t-android-java-res-values-dimens.xml.patch | 4 +- ...er-page_specific_content_settings.cc.patch | 6 +-- ...content_settings_default_provider.cc.patch | 4 +- ...-content_settings_policy_provider.cc.patch | 8 ++-- ...ore-browser-content_settings_pref.cc.patch | 2 +- ...browser-content_settings_registry.cc.patch | 4 +- ...browser-content_settings_uma_util.cc.patch | 2 +- ...-core-common-cookie_settings_base.cc.patch | 6 +-- ...s-core-common-cookie_settings_base.h.patch | 2 +- ...nternal-common-download_item_impl.cc.patch | 4 +- ...embedder_support-user_agent_utils.cc.patch | 6 +-- ...ure_engagement-public-feature_list.h.patch | 6 +-- ...history-core-browser-history_types.h.patch | 2 +- patches/components-metrics-BUILD.gn.patch | 4 +- .../components-omnibox-browser-BUILD.gn.patch | 4 +- ...x-browser-autocomplete_controller.cc.patch | 6 +-- ...omnibox-browser-autocomplete_match.h.patch | 4 +- ...rypt-common-keychain_password_mac.mm.patch | 4 +- .../components-os_crypt-sync-BUILD.gn.patch | 4 +- ...s-os_crypt-sync-key_storage_linux.cc.patch | 2 +- .../components-page_info-page_info.cc.patch | 4 +- ...ore-browser-password_form_filling.cc.patch | 4 +- ...common-password_manager_pref_names.h.patch | 2 +- patches/components-permissions-BUILD.gn.patch | 4 +- ...ssions-permission_request_manager.cc.patch | 12 ++--- ...s-permissions-permission_uma_util.cc.patch | 4 +- ...nents-permissions-permission_util.cc.patch | 8 ++-- ...mponents-permissions-request_type.cc.patch | 4 +- ...policy-resources-policy_templates.py.patch | 2 +- ...licy-tools-generate_policy_source.py.patch | 2 +- ...g-core-common-safe_browsing_prefs.cc.patch | 2 +- .../components-search_engines-BUILD.gn.patch | 2 +- ...ch_engines-default_search_manager.cc.patch | 2 +- ...n-internal-identity_manager-BUILD.gn.patch | 4 +- ...s-sync-engine-sync_scheduler_impl.cc.patch | 2 +- ...nents-sync-protocol-proto_visitors.h.patch | 2 +- ...s-sync-protocol-protocol_sources.gni.patch | 4 +- .../components-sync-service-BUILD.gn.patch | 4 +- ...nts-sync-service-sync_service_impl.h.patch | 4 +- ...vice_info-device_info_sync_bridge.cc.patch | 10 ++--- ...components-update_client-pipeline.cc.patch | 2 +- ...-version-resources-about_version.css.patch | 2 +- ...coa-render_widget_host_view_cocoa.mm.patch | 4 +- patches/content-browser-BUILD.gn.patch | 4 +- ...rowser-devtools-protocol_config.json.patch | 2 +- ...tent-browser-gpu-gpu_internals_ui.cc.patch | 4 +- ...renderer_host-clipboard_host_impl.cc.patch | 4 +- ...r_host-navigation_controller_impl.cc.patch | 4 +- ...-renderer_host-navigation_request.cc.patch | 6 +-- ...derer_host-render_frame_host_impl.cc.patch | 8 ++-- ...t-browser-resources-gpu-info_view.ts.patch | 2 +- ...er-web_contents-web_contents_impl.cc.patch | 6 +-- ...content-browser-webui-web_ui_impl.cc.patch | 2 +- patches/content-common-BUILD.gn.patch | 2 +- patches/content-common-frame.mojom.patch | 4 +- patches/content-public-browser-BUILD.gn.patch | 4 +- ...ontent-renderer-render_frame_impl.cc.patch | 4 +- ...ntent-renderer-render_thread_impl.cc.patch | 4 +- patches/crypto-aead.cc.patch | 4 +- .../crypto-unexportable_key_metrics.cc.patch | 2 +- ...xtension_web_request_event_router.cc.patch | 4 +- ...r-native_extension_bindings_system.h.patch | 2 +- patches/ios-chrome-app-BUILD.gn.patch | 4 +- .../ios-chrome-browser-flags-BUILD.gn.patch | 4 +- ...-chrome-browser-flags-about_flags.mm.patch | 4 +- ...-shared-model-prefs-browser_prefs.mm.patch | 6 +-- ...ebui-url_data_manager_ios_backend.mm.patch | 4 +- ...ngs-checks-mojom_attributes_check.py.patch | 4 +- patches/net-BUILD.gn.patch | 4 +- patches/net-base-proxy_server.cc.patch | 6 +-- patches/net-cookies-canonical_cookie.cc.patch | 2 +- patches/net-dns-BUILD.gn.patch | 2 +- patches/net-dns-host_cache.cc.patch | 2 +- ...net-dns-host_resolver_manager_job.cc.patch | 4 +- ...net-http-transport_security_state.cc.patch | 2 +- ...nfigured_proxy_resolution_service.cc.patch | 4 +- ...st-installer-linux-installer.include.patch | 6 +-- .../sandbox-policy-win-sandbox_win.cc.patch | 4 +- ...ices-network-cors-cors_url_loader.cc.patch | 4 +- ...services-network-public-cpp-BUILD.gn.patch | 4 +- ...cy-permissions_policy_features.json5.patch | 4 +- .../third_party-blink-common-BUILD.gn.patch | 2 +- ...mmon-permissions-permission_utils.cc.patch | 2 +- ...d_party-blink-public-common-BUILD.gn.patch | 2 +- ...rd_party-blink-public-mojom-BUILD.gn.patch | 4 +- ...er-bindings-generated_in_modules.gni.patch | 4 +- ...renderer-bindings-idl_in_modules.gni.patch | 4 +- ...d_party-blink-renderer-core-BUILD.gn.patch | 4 +- ...re-frame-cached_permission_status.cc.patch | 4 +- ...derer-core-frame-local_dom_window.cc.patch | 2 +- ...e-html-canvas-html_canvas_element.cc.patch | 4 +- ...r-core-loader-frame_fetch_context.cc.patch | 4 +- ...core-loader-mixed_content_checker.cc.patch | 6 +-- ...-script-html_parser_script_runner.cc.patch | 4 +- ...enderer-core-script-script_loader.cc.patch | 2 +- ...arty-blink-renderer-modules-BUILD.gn.patch | 4 +- ...anvas2d-base_rendering_context_2d.cc.patch | 8 ++-- ...ebgl-webgl_rendering_context_base.cc.patch | 44 +++++++++---------- ...rty-blink-renderer-platform-BUILD.gn.patch | 4 +- ...tform-runtime_enabled_features.json5.patch | 10 ++--- patches/third_party-lit-v3_0-BUILD.gn.patch | 6 +-- .../third_party-polymer-v3_0-BUILD.gn.patch | 6 +-- .../config-gni-devtools_grd_files.gni.patch | 4 +- ...front_end-core-sdk-NetworkManager.ts.patch | 4 +- .../front_end-panels-network-BUILD.gn.patch | 4 +- ...anels-network-NetworkDataGridNode.ts.patch | 4 +- ...nd-panels-network-NetworkItemView.ts.patch | 4 +- ...meline-components-LiveMetricsView.ts.patch | 4 +- .../third_party-i18n-collect-strings.js.patch | 2 +- ...efinitions-prepopulated_engines.json.patch | 2 +- patches/tools-clang-scripts-update.py.patch | 2 +- patches/tools-crates-gnrt-lib-readme.rs.patch | 2 +- patches/tools-grit-grit-tool-build.py.patch | 4 +- ...tools-gritsettings-resource_ids.spec.patch | 2 +- ...json_schema_compiler-cc_generator.py.patch | 2 +- patches/tools-licenses-licenses.py.patch | 4 +- ...tograms-metadata-page-histograms.xml.patch | 4 +- ...-metadata-permissions-histograms.xml.patch | 2 +- patches/tools-typescript-ts_library.gni.patch | 2 +- .../tools-typescript-tsconfig_base.json.patch | 4 +- patches/ui-base-BUILD.gn.patch | 2 +- ...ui-base-clipboard-clipboard_ozone.cc.patch | 4 +- patches/ui-color-color_id.h.patch | 4 +- patches/ui-gfx-image-image_skia.cc.patch | 2 +- patches/ui-views-view.h.patch | 4 +- ...webui-resources-cr_elements-BUILD.gn.patch | 4 +- ...ebui-resources-tools-build_webui.gni.patch | 10 ++--- patches/v8/BUILD.gn.patch | 6 +-- patches/v8/src-codegen-compiler.cc.patch | 4 +- 298 files changed, 624 insertions(+), 624 deletions(-) diff --git a/patches/base-BUILD.gn.patch b/patches/base-BUILD.gn.patch index eeaa198880b..06c57300183 100644 --- a/patches/base-BUILD.gn.patch +++ b/patches/base-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/base/BUILD.gn b/base/BUILD.gn -index 2c08275379c5586d5ba02634d37ad52505c7d6a7..674bafbad02e1047b2efa0ddbab980749132151e 100644 +index d0317b2920ca8b545d3294d6121aa0085969ab0b..d6fcb16256402dbb67ea99df82296a001e4d38b9 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -4786,6 +4786,7 @@ if (is_android) { +@@ -4818,6 +4818,7 @@ if (is_android) { "android/java/src/org/chromium/base/UserDataHost.java", "android/java/src/org/chromium/base/ValueChangedCallback.java", ] @@ -10,7 +10,7 @@ index 2c08275379c5586d5ba02634d37ad52505c7d6a7..674bafbad02e1047b2efa0ddbab98074 resources_package = "org.chromium.base" -@@ -5442,6 +5443,7 @@ if (is_android) { +@@ -5474,6 +5475,7 @@ if (is_android) { "android/java/src/org/chromium/base/shared_preferences/SharedPreferencesManager.java", "android/java/src/org/chromium/base/shared_preferences/StrictPreferenceKeyChecker.java", ] diff --git a/patches/base-metrics-histogram_functions.h.patch b/patches/base-metrics-histogram_functions.h.patch index 3f4c60d311d..b73fffbf0d4 100644 --- a/patches/base-metrics-histogram_functions.h.patch +++ b/patches/base-metrics-histogram_functions.h.patch @@ -1,5 +1,5 @@ diff --git a/base/metrics/histogram_functions.h b/base/metrics/histogram_functions.h -index 9c0912d6314af55d31eca30e16c57b84400e0e5a..969577a42696ac3a19cddb49c13894ca506b637c 100644 +index 1fe7e3f414b2f888ec6fc2ecd306c26144719ddb..d37692dfbd363bda93c39e6d3367487c19510aaf 100644 --- a/base/metrics/histogram_functions.h +++ b/base/metrics/histogram_functions.h @@ -82,6 +82,7 @@ void UmaHistogramEnumeration(std::string_view name, T sample) { diff --git a/patches/base-test-launcher-test_results_tracker.cc.patch b/patches/base-test-launcher-test_results_tracker.cc.patch index 2351b1eb8d4..6c18ff93e1f 100644 --- a/patches/base-test-launcher-test_results_tracker.cc.patch +++ b/patches/base-test-launcher-test_results_tracker.cc.patch @@ -1,5 +1,5 @@ diff --git a/base/test/launcher/test_results_tracker.cc b/base/test/launcher/test_results_tracker.cc -index 760f0982cf35b9294cb916da82e7b39aa522142c..06642daac8a193e476279413fe35555a5e85e0b0 100644 +index 6970688273a878711870c85dafcfffd49b373381..238e2f2969d0ca06d04809977d9618ec78bcda6d 100644 --- a/base/test/launcher/test_results_tracker.cc +++ b/base/test/launcher/test_results_tracker.cc @@ -304,6 +304,7 @@ TestResultsTracker::~TestResultsTracker() { diff --git a/patches/base-threading-thread_restrictions.h.patch b/patches/base-threading-thread_restrictions.h.patch index acf4d21e367..a0ec42ad71d 100644 --- a/patches/base-threading-thread_restrictions.h.patch +++ b/patches/base-threading-thread_restrictions.h.patch @@ -1,8 +1,8 @@ diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h -index 6f000c21239c85de00733ccaef02feeabdf994de..bef7dcc2bd333dde8e796c1d7a578463e17f36fe 100644 +index b53745dd0a4011fb15ab16d61f9a6effd5c03598..934771aa66492bed993017a3eb5a98fd8660230b 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h -@@ -735,6 +735,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { +@@ -738,6 +738,7 @@ class BASE_EXPORT ScopedAllowBaseSyncPrimitives { ScopedAllowBaseSyncPrimitives& operator=( const ScopedAllowBaseSyncPrimitives&) = delete; diff --git a/patches/base-trace_event-builtin_categories.h.patch b/patches/base-trace_event-builtin_categories.h.patch index a5a67ee53c4..2b1c2fcb773 100644 --- a/patches/base-trace_event-builtin_categories.h.patch +++ b/patches/base-trace_event-builtin_categories.h.patch @@ -1,8 +1,8 @@ diff --git a/base/trace_event/builtin_categories.h b/base/trace_event/builtin_categories.h -index 8649b24d17fc9d8acf988f44422134ecc3ed0203..9f81140cfc2993fb69e42365b0b032e659bf8979 100644 +index 56408734b26428933a1fb8c04cee317c659feea7..4a60b4244fdc821c71aa8a9b19bd8619cf45458e 100644 --- a/base/trace_event/builtin_categories.h +++ b/base/trace_event/builtin_categories.h -@@ -277,6 +277,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS( +@@ -279,6 +279,7 @@ PERFETTO_DEFINE_CATEGORIES_IN_NAMESPACE_WITH_ATTRS( perfetto::Category("webrtc").SetTags("audio", "video"), perfetto::Category("webrtc_stats"), perfetto::Category("xr"), diff --git a/patches/build-android-gradle-generate_gradle.py.patch b/patches/build-android-gradle-generate_gradle.py.patch index f5c3fce0b5b..2462bd874fc 100644 --- a/patches/build-android-gradle-generate_gradle.py.patch +++ b/patches/build-android-gradle-generate_gradle.py.patch @@ -1,8 +1,8 @@ diff --git a/build/android/gradle/generate_gradle.py b/build/android/gradle/generate_gradle.py -index 5e1eec5fd80984a25681550633829d494a5fa517..665bc9a50a4fed1cd9b5d07dfb36a1565698f40c 100755 +index e1303b834c37101025f7dfa64916f62ae54c4cd1..7f4cd75e7af7bba1c2f7970e406ef6ea9c2ff1db 100755 --- a/build/android/gradle/generate_gradle.py +++ b/build/android/gradle/generate_gradle.py -@@ -913,5 +913,6 @@ def main(): +@@ -918,5 +918,6 @@ def main(): '+/main/docs/android_studio.md') diff --git a/patches/build-android-gyp-create_app_bundle.py.patch b/patches/build-android-gyp-create_app_bundle.py.patch index cc5769893be..cd0d91807d6 100644 --- a/patches/build-android-gyp-create_app_bundle.py.patch +++ b/patches/build-android-gyp-create_app_bundle.py.patch @@ -1,8 +1,8 @@ diff --git a/build/android/gyp/create_app_bundle.py b/build/android/gyp/create_app_bundle.py -index 4d26b56be2995bb8e1c1ff4c28fa501e6e128ead..a0909e8ec6d0ef9fc43a2e27e82fffbb15ab6d98 100755 +index 3f3d75d490e30904b970c6ef3312572c9483b037..6c011b1eedb922f7841358b98b6b92b235b318de 100755 --- a/build/android/gyp/create_app_bundle.py +++ b/build/android/gyp/create_app_bundle.py -@@ -80,6 +80,7 @@ _ALLOWLISTED_NON_BASE_SERVICES = { +@@ -79,6 +79,7 @@ _ALLOWLISTED_NON_BASE_SERVICES = { 'com.google.apps.tiktok.concurrent.InternalForegroundService', } diff --git a/patches/build-android-gyp-proguard.py.patch b/patches/build-android-gyp-proguard.py.patch index 45008c9cfc7..b84d3ada701 100644 --- a/patches/build-android-gyp-proguard.py.patch +++ b/patches/build-android-gyp-proguard.py.patch @@ -1,8 +1,8 @@ diff --git a/build/android/gyp/proguard.py b/build/android/gyp/proguard.py -index 4d5c8f777245672cb0620fbbdb463cd3904c8ee9..312d893746bc4ae573a52adb77fb2889dfc4c794 100755 +index ebe275036e26094ebe6ef0a6008db6dce46fbe6f..c359471eeb77ed95db9891726fab5a71419cfbd2 100755 --- a/build/android/gyp/proguard.py +++ b/build/android/gyp/proguard.py -@@ -394,6 +394,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data): +@@ -393,6 +393,7 @@ def _OptimizeWithR8(options, config_paths, libraries, dynamic_config_data): '--pg-map-output', tmp_mapping_path, ] diff --git a/patches/build-android-gyp-util-resource_utils.py.patch b/patches/build-android-gyp-util-resource_utils.py.patch index 407c48f9df1..24c961d2494 100644 --- a/patches/build-android-gyp-util-resource_utils.py.patch +++ b/patches/build-android-gyp-util-resource_utils.py.patch @@ -1,5 +1,5 @@ diff --git a/build/android/gyp/util/resource_utils.py b/build/android/gyp/util/resource_utils.py -index 4e32b6c997055ab8f793babeca32640f86469058..993320e8b49faf1c14584298177d776613d42aba 100644 +index 79df90b8aeb4e56844f1a493ffa74c9eba06b743..82f696ef4380ff548dff84694aaedb0d790016f6 100644 --- a/build/android/gyp/util/resource_utils.py +++ b/build/android/gyp/util/resource_utils.py @@ -256,6 +256,7 @@ class ResourceInfoFile: diff --git a/patches/build-android-pylib-gtest-gtest_test_instance.py.patch b/patches/build-android-pylib-gtest-gtest_test_instance.py.patch index be147326fbd..beb9ace24d9 100644 --- a/patches/build-android-pylib-gtest-gtest_test_instance.py.patch +++ b/patches/build-android-pylib-gtest-gtest_test_instance.py.patch @@ -1,8 +1,8 @@ diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py -index b7ce0bc9abe0f5e39383f8f57f9c531e0d068093..515ba4c01db326b98073d9534ca577757965003f 100644 +index b6f0e2a387e32aaebdaadffe577cd78cdfe4eb72..7e710e7422870c2c4ee5cc6d89e556bfcd52b92b 100644 --- a/build/android/pylib/gtest/gtest_test_instance.py +++ b/build/android/pylib/gtest/gtest_test_instance.py -@@ -731,3 +731,4 @@ class GtestTestInstance(test_instance.TestInstance): +@@ -742,3 +742,4 @@ class GtestTestInstance(test_instance.TestInstance): if self._deobfuscator: self._deobfuscator.Close() self._deobfuscator = None diff --git a/patches/build-config-BUILDCONFIG.gn.patch b/patches/build-config-BUILDCONFIG.gn.patch index da8d0f67c34..c037206d526 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 38719796a381e2dcf22782693f458b6750d2670f..6a8f9f0bcd74013739f09e94364a6511f64a892b 100644 +index 4174baa9c0e39b517ade66aab07123eaf9b58e47..6ac15e59c566a7721193f4dc7349b20fadf36a7e 100644 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -343,6 +343,7 @@ is_posix = !is_win && !is_fuchsia diff --git a/patches/build-config-android-config.gni.patch b/patches/build-config-android-config.gni.patch index 885213ad96c..2f3c9dfa323 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 516462806f693429aefce3f0e7cfe65cf22f180c..d0b0a7421eaee0f2541ab5f32c4b6b5e2e5801ab 100644 +index cc12ce785a97775955ec26d1821688b9bb48fce0..199be21a8ca00c625af4c8c0b031472e81664202 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -28,6 +28,7 @@ assert(!(incremental_install && !is_java_debug), diff --git a/patches/build-config-android-internal_rules.gni.patch b/patches/build-config-android-internal_rules.gni.patch index 48ff233961f..0981050b10b 100644 --- a/patches/build-config-android-internal_rules.gni.patch +++ b/patches/build-config-android-internal_rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/internal_rules.gni b/build/config/android/internal_rules.gni -index 802d68ced433e41c7bad5a7bd2ba2645bf347b70..789e9138eb001c98d36ba18b7b65dbd20a70e199 100644 +index b047ff19a3e8df53af9cc45d99e8ea8b82ea4f0a..bd5c6570e38f21cdfd4d89519fa7eaa60e7d42e7 100644 --- a/build/config/android/internal_rules.gni +++ b/build/config/android/internal_rules.gni @@ -3657,6 +3657,7 @@ if (enable_java_templates) { diff --git a/patches/build-config-android-rules.gni.patch b/patches/build-config-android-rules.gni.patch index 423c2c5aa6c..464f7294865 100644 --- a/patches/build-config-android-rules.gni.patch +++ b/patches/build-config-android-rules.gni.patch @@ -1,5 +1,5 @@ diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni -index caa35daa9944b99aee82cae1cf8042262b8cdb86..b0fc3bce0fc0d40be8f38607f74fdfd67fed7310 100644 +index cd213c57051d1780eb42a320ab25fb5c0b3956bf..65c9f59bb03dc2a16c2a7d03434154942c78b17a 100644 --- a/build/config/android/rules.gni +++ b/build/config/android/rules.gni @@ -208,6 +208,7 @@ if (!is_robolectric && enable_java_templates) { diff --git a/patches/build-config-siso-main.star.patch b/patches/build-config-siso-main.star.patch index f965b61e48a..0d4a158f59f 100644 --- a/patches/build-config-siso-main.star.patch +++ b/patches/build-config-siso-main.star.patch @@ -1,8 +1,8 @@ diff --git a/build/config/siso/main.star b/build/config/siso/main.star -index 34bb20173df31840d95ff57bafd4efb63b3d5010..567ae154c4a42e44ee8ec2a947e2756b885d06da 100644 +index f72e5f86f923b136034ebe5a46cb7d6588ccd70f..fdf8a614ee3acda31140b589bcf928829dffcb41 100644 --- a/build/config/siso/main.star +++ b/build/config/siso/main.star -@@ -20,6 +20,7 @@ load("./reproxy.star", "reproxy") +@@ -21,6 +21,7 @@ load("./reproxy.star", "reproxy") load("./rust.star", "rust") load("./simple.star", "simple") load("./windows.star", chromium_windows = "chromium") @@ -10,7 +10,7 @@ index 34bb20173df31840d95ff57bafd4efb63b3d5010..567ae154c4a42e44ee8ec2a947e2756b def __disable_remote(ctx, step_config): gn_logs_data = gn_logs.read(ctx) -@@ -103,6 +104,7 @@ def init(ctx): +@@ -85,6 +86,7 @@ def init(ctx): handlers.update(simple.handlers) handlers.update(reproxy.handlers) diff --git a/patches/build-config-unsafe_buffers_paths.txt.patch b/patches/build-config-unsafe_buffers_paths.txt.patch index f5dea6eb63c..49fcc454fa9 100644 --- a/patches/build-config-unsafe_buffers_paths.txt.patch +++ b/patches/build-config-unsafe_buffers_paths.txt.patch @@ -1,8 +1,8 @@ diff --git a/build/config/unsafe_buffers_paths.txt b/build/config/unsafe_buffers_paths.txt -index 62db5eb3f46b8c4b93725c2a0e24472259bf967e..0f75b65285bf116ba46359f646864e46a140eac5 100644 +index ec12fe9208233cf9f2c26921f1171ca5e4abe893..da45db4fd5ca0f91809776a54a904a0c3b5f25be 100644 --- a/build/config/unsafe_buffers_paths.txt +++ b/build/config/unsafe_buffers_paths.txt -@@ -30,3 +30,10 @@ $../../ +@@ -31,3 +31,10 @@ $../../ +third_party/liburlpattern/ -tools/ -v8/ diff --git a/patches/build-rust-cargo_crate.gni.patch b/patches/build-rust-cargo_crate.gni.patch index e94d239dd92..7a9cdf5170e 100644 --- a/patches/build-rust-cargo_crate.gni.patch +++ b/patches/build-rust-cargo_crate.gni.patch @@ -1,8 +1,8 @@ diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni -index 70f99056769ed2a72fcfdd5b00be4607b2faddb0..cadbe1927bfd8914c7b79a59adfd2b7e944bec96 100644 +index a993149fa6467acf67a43a34a3fd843edabffafa..87d09c26466618c61ae1596fbfab535959d9f45a 100644 --- a/build/rust/cargo_crate.gni +++ b/build/rust/cargo_crate.gni -@@ -180,6 +180,7 @@ template("cargo_crate") { +@@ -181,6 +181,7 @@ template("cargo_crate") { manifest_dir = rebase_path(build_gn_dir + "/crate", root_build_dir) } _rustenv += [ "CARGO_MANIFEST_DIR=${manifest_dir}" ] @@ -10,7 +10,7 @@ index 70f99056769ed2a72fcfdd5b00be4607b2faddb0..cadbe1927bfd8914c7b79a59adfd2b7e # cargo_crate() should set library_configs, executable_configs, # proc_macro_configs. Not configs. -@@ -272,6 +273,7 @@ template("cargo_crate") { +@@ -273,6 +274,7 @@ template("cargo_crate") { testonly = _testonly if (defined(invoker.visibility)) { visibility = invoker.visibility diff --git a/patches/chrome-BUILD.gn.patch b/patches/chrome-BUILD.gn.patch index cd7ed9f40c9..578adf66852 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 f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61a6367ad0 100644 +index d6686618cb86ba313f456adebf586c9e4a7ff89f..6973965468ea886f7b4360965aa094a8ff09a048 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -195,6 +195,7 @@ if (!is_android && !is_mac) { @@ -10,7 +10,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61 deps += [ ":chrome_dll", -@@ -500,11 +501,12 @@ if (is_win) { +@@ -499,11 +500,12 @@ if (is_win) { args += [ "--keystone=0" ] } } @@ -24,7 +24,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61 extra_substitutions = [ "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id", "CHROMIUM_SHORT_NAME=$chrome_product_short_name", -@@ -524,6 +526,7 @@ if (is_win) { +@@ -523,6 +525,7 @@ if (is_win) { "//chrome/common:buildflags", "//chrome/common:version_header", ] @@ -32,7 +32,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61 if (enable_updater) { deps += [ ":chromium_updater_privileged_helper" ] -@@ -669,6 +672,7 @@ if (is_win) { +@@ -668,6 +671,7 @@ if (is_win) { # this dependency directly copies the file into the framework's # resources directory. public_deps += [ ":chrome_framework_widevine_signature" ] @@ -40,7 +40,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61 } } -@@ -712,9 +716,11 @@ if (is_win) { +@@ -711,9 +715,11 @@ if (is_win) { "--scm=0", ] } @@ -52,7 +52,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61 if (is_chrome_branded && include_branded_entitlements) { # These entitlements are bound to the official Google Chrome signing # certificate and will not necessarily work in any other build. -@@ -739,6 +745,7 @@ if (is_win) { +@@ -738,6 +744,7 @@ if (is_win) { info_plist_target = invoker.info_plist_target } else { info_plist_target = ":chrome_helper_plist" @@ -60,7 +60,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61 } extra_substitutions = [ -@@ -922,6 +929,7 @@ if (is_win) { +@@ -921,6 +928,7 @@ if (is_win) { if (enable_updater) { if (is_chrome_branded) { sources += [ "//third_party/updater/chrome_mac_universal_prod/cipd/${updater_product_full_name}.app" ] @@ -68,7 +68,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61 } else { sources += [ "$root_out_dir/${updater_product_full_name}.app" ] -@@ -1208,6 +1216,7 @@ if (is_win) { +@@ -1206,6 +1214,7 @@ if (is_win) { "-current_version", chrome_dylib_version, ] @@ -76,7 +76,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61 if (!is_component_build) { # Specify a sensible install_name for static builds. The library is -@@ -1405,6 +1414,7 @@ if (is_win) { +@@ -1403,6 +1412,7 @@ if (is_win) { group("dependencies") { public_deps = [ @@ -84,7 +84,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61 "//build:branding_buildflags", "//build:chromeos_buildflags", "//chrome/browser", -@@ -1450,7 +1460,7 @@ group("dependencies") { +@@ -1448,7 +1458,7 @@ group("dependencies") { if (is_win) { process_version_rc_template("chrome_exe_version") { @@ -93,7 +93,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61 output = "$target_gen_dir/chrome_exe_version.rc" } -@@ -1499,6 +1509,7 @@ group("resources") { +@@ -1497,6 +1507,7 @@ group("resources") { "//chrome/browser:resources", "//chrome/common:resources", "//chrome/renderer:resources", @@ -101,7 +101,7 @@ index f8d29b704ab491524175e773062c624dfd59db0a..ea473a15b66901447def78c532ccdc61 ] } -@@ -1553,6 +1564,7 @@ if (!is_android) { +@@ -1551,6 +1562,7 @@ if (!is_android) { if (enable_resource_allowlist_generation) { repack_allowlist = _chrome_resource_allowlist deps = [ ":resource_allowlist" ] diff --git a/patches/chrome-android-BUILD.gn.patch b/patches/chrome-android-BUILD.gn.patch index 4ab434c1263..201c85d9c63 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 c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770ba0260fb 100644 +index 432a235c4081327daf699f6c41e09f2091ae31a0..7410d2f8b1f4f4fdfd68d8b9bde5320d89686cd6 100644 --- a/chrome/android/BUILD.gn +++ b/chrome/android/BUILD.gn -@@ -162,6 +162,7 @@ if (_is_default_toolchain) { +@@ -163,6 +163,7 @@ if (_is_default_toolchain) { "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png", "java/res_chromium_base/values/channel_constants.xml", ] @@ -10,7 +10,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770 } android_resources("chrome_app_java_resources") { -@@ -263,6 +264,7 @@ if (_is_default_toolchain) { +@@ -272,6 +273,7 @@ if (_is_default_toolchain) { if (enable_extensions_core) { deps += [ "//chrome/browser/ui/android/extensions:java_resources" ] } @@ -18,7 +18,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770 } android_resources("java_overlay_resources") { -@@ -800,6 +802,7 @@ if (_is_default_toolchain) { +@@ -813,6 +815,7 @@ if (_is_default_toolchain) { ] deps += feed_deps @@ -26,7 +26,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770 srcjar_deps = [ ":chrome_android_java_enums_srcjar", -@@ -817,6 +820,7 @@ if (_is_default_toolchain) { +@@ -830,6 +833,7 @@ if (_is_default_toolchain) { "//components/supervised_user/core/browser:supervised_user_utils_enum_javagen", "//components/touch_to_search/core/browser:quick_action_category_enum_javagen", ] @@ -34,7 +34,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770 # From java_sources.gni. sources = chrome_java_sources -@@ -950,6 +954,7 @@ if (_is_default_toolchain) { +@@ -967,6 +971,7 @@ if (_is_default_toolchain) { # TODO(crbug.com/434123514): see if we can remove these stub targets. deps += [ "//chrome/browser/ui/android/extensions/windowing/stub:java" ] } @@ -42,7 +42,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770 } action_with_pydeps("chrome_android_java_google_api_keys_srcjar") { -@@ -1676,6 +1681,7 @@ if (_is_default_toolchain) { +@@ -1719,6 +1724,7 @@ if (_is_default_toolchain) { "java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png", "java/res_chromium_base/values/channel_constants.xml", ] @@ -50,7 +50,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770 # Dep needed to ensure override works properly. deps = [ ":chrome_base_module_resources" ] -@@ -1828,6 +1834,7 @@ if (_is_default_toolchain) { +@@ -1871,6 +1877,7 @@ if (_is_default_toolchain) { ":${_variant}_locale_pak_assets", ":${_variant}_paks", ] @@ -58,7 +58,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770 } } -@@ -2086,6 +2093,7 @@ if (_is_default_toolchain) { +@@ -2129,6 +2136,7 @@ if (_is_default_toolchain) { "//third_party/androidx:androidx_annotation_annotation_experimental_java", "//third_party/androidx:androidx_browser_browser_java", ] @@ -66,7 +66,7 @@ index c8153b4a6d8174dac29edcd5cf9ecccd89d3b033..592d015f6e3113d1669a0120b2011770 # More deps for DFMs. if (dfmify_dev_ui) { -@@ -3064,6 +3072,7 @@ if (_is_default_toolchain) { +@@ -3107,6 +3115,7 @@ if (_is_default_toolchain) { "java/src/org/chromium/chrome/browser/webapps/WebApkUpdateManager.java", "java/src/org/chromium/chrome/browser/webapps/WebappRegistry.java", ] diff --git a/patches/chrome-android-chrome_java_sources.gni.patch b/patches/chrome-android-chrome_java_sources.gni.patch index 0f2d801b188..d144e54f84d 100644 --- a/patches/chrome-android-chrome_java_sources.gni.patch +++ b/patches/chrome-android-chrome_java_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni -index e9985e19fc111d78ce9acd0dd8cf29bc6ab5ac2e..277a47b0273a897cd7a713be411767c47206f6da 100644 +index 7baeeaff95f804c51945e68a8a1e967260340a2c..ff67097dfc5b8571397b2a688983f3092fffcdf2 100644 --- a/chrome/android/chrome_java_sources.gni +++ b/chrome/android/chrome_java_sources.gni -@@ -1290,3 +1290,4 @@ if (enable_screen_capture) { +@@ -1302,3 +1302,4 @@ if (enable_screen_capture) { "java/src/org/chromium/chrome/browser/media/MediaCapturePickerTabObserver.java", ] } diff --git a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch index c5c1166ec7e..07265662635 100644 --- a/patches/chrome-android-chrome_public_apk_tmpl.gni.patch +++ b/patches/chrome-android-chrome_public_apk_tmpl.gni.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni -index d079c147a169f57c7668057847c23d26ca3962f2..778327370536544fdbd8604e1bab534c921353a8 100644 +index 6bd4fc5504337705757f4f1e8683e5bcb8d4043a..ac7a59523f4312b4ba17cfaca77e0522bb7a2c82 100644 --- a/chrome/android/chrome_public_apk_tmpl.gni +++ b/chrome/android/chrome_public_apk_tmpl.gni @@ -291,6 +291,7 @@ template("chrome_common_apk_or_module_tmpl") { @@ -18,7 +18,7 @@ index d079c147a169f57c7668057847c23d26ca3962f2..778327370536544fdbd8604e1bab534c if (_is_test) { proguard_configs += [ "//chrome/android/proguard/apk_for_test.flags" ] } -@@ -665,6 +667,7 @@ template("chrome_common_apk_or_module_tmpl") { +@@ -666,6 +668,7 @@ template("chrome_common_apk_or_module_tmpl") { "version_code", "version_name", ]) diff --git a/patches/chrome-android-features-tab_ui-BUILD.gn.patch b/patches/chrome-android-features-tab_ui-BUILD.gn.patch index a9dc89d8cf7..001a6cc9fe6 100644 --- a/patches/chrome-android-features-tab_ui-BUILD.gn.patch +++ b/patches/chrome-android-features-tab_ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn -index a47da223c5a005ef631e9ff17197b02934998796..c2a0b31d9cd6a28020d371beccfa80cf9a33cc65 100644 +index 30b0a449fd2dafbd57ff053859621a07ca3ee5c6..ca59096b6b6a90d83cdc058d37c763fb5d3c3f8a 100644 --- a/chrome/android/features/tab_ui/BUILD.gn +++ b/chrome/android/features/tab_ui/BUILD.gn -@@ -132,6 +132,7 @@ android_resources("java_resources") { +@@ -135,6 +135,7 @@ android_resources("java_resources") { "java/res/xml/tab_archive_time_delta_preference.xml", "java/res/xml/tabs_settings.xml", ] diff --git a/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch b/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch index 09fe5096cd6..64a2a125f83 100644 --- a/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch +++ b/patches/chrome-android-feed-core-java-src-org-chromium-chrome-browser-feed-FeedSurfaceMediator.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java -index 7e5b4ff7d0d0ddd91cf0a01d3e4ecbe347fa27e7..fd1ed0584948c21c334691bc212116386a2d9e98 100644 +index 7d9d0d142300d1d2e2cdb13644b300550954b4ad..110890a4c2ff41ac9c2f1212718f298054c33c27 100644 --- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java +++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java -@@ -402,7 +402,7 @@ public class FeedSurfaceMediator +@@ -351,7 +351,7 @@ public class FeedSurfaceMediator // Start is showing, update the value of Pref.ENABLE_SNIPPETS_BY_DSE here. The // value should be updated before adding an observer to prevent an extra call of // updateContent(). diff --git a/patches/chrome-android-java-AndroidManifest.xml.patch b/patches/chrome-android-java-AndroidManifest.xml.patch index ed9ecca9d04..875ea502cbd 100644 --- a/patches/chrome-android-java-AndroidManifest.xml.patch +++ b/patches/chrome-android-java-AndroidManifest.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml -index 07ff09e882dcca63d950d18714a2f0e5a77d2626..31fbd7afa72d49557a9297be3492d0f239af76e4 100644 +index 1aef3a4966f4069890ad1be6265f9e48743b61e3..61aa5c7c9a230e6663c3a49a7fcdba8eb22056f6 100644 --- a/chrome/android/java/AndroidManifest.xml +++ b/chrome/android/java/AndroidManifest.xml @@ -38,6 +38,7 @@ by a child template that "extends" this file. @@ -80,7 +80,7 @@ index 07ff09e882dcca63d950d18714a2f0e5a77d2626..31fbd7afa72d49557a9297be3492d0f2 -@@ -390,6 +405,7 @@ by a child template that "extends" this file. +@@ -383,6 +398,7 @@ by a child template that "extends" this file. @@ -88,7 +88,7 @@ index 07ff09e882dcca63d950d18714a2f0e5a77d2626..31fbd7afa72d49557a9297be3492d0f2 -@@ -932,6 +948,7 @@ by a child template that "extends" this file. +@@ -925,6 +941,7 @@ by a child template that "extends" this file. @@ -96,7 +96,7 @@ index 07ff09e882dcca63d950d18714a2f0e5a77d2626..31fbd7afa72d49557a9297be3492d0f2 @@ -104,7 +104,7 @@ index 07ff09e882dcca63d950d18714a2f0e5a77d2626..31fbd7afa72d49557a9297be3492d0f2 {% endif %} diff --git a/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch b/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch index 2f2200bddc0..309ba70826d 100644 --- a/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch +++ b/patches/chrome-android-java-res-layout-custom_tabs_toolbar.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/res/layout/custom_tabs_toolbar.xml b/chrome/android/java/res/layout/custom_tabs_toolbar.xml -index 7b63c5ec2cb0ad7c32aa6110568e9c93553b3bf0..cb20eb415ea3dafa906f4b22b563575f46af0261 100644 +index 4a363158b6f437920665616f2cb9c91a0e6be27b..211be85e4955ac71fb8c11fcbf5d882034cebbd0 100644 --- a/chrome/android/java/res/layout/custom_tabs_toolbar.xml +++ b/chrome/android/java/res/layout/custom_tabs_toolbar.xml @@ -150,6 +150,7 @@ found in the LICENSE file. diff --git a/patches/chrome-android-java-res-xml-main_preferences.xml.patch b/patches/chrome-android-java-res-xml-main_preferences.xml.patch index 51b9458ec73..a0ea999e803 100644 --- a/patches/chrome-android-java-res-xml-main_preferences.xml.patch +++ b/patches/chrome-android-java-res-xml-main_preferences.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml -index 389d8c42443aa58cdd779f44a52e817cd9983333..ced95a9d3107b17dda16a8363a7e6fe837199211 100644 +index 2599b098db6b4228643a868d5093373cb1787b9c..2cdfa16591649676865177458d4af8276e7c9e55 100644 --- a/chrome/android/java/res/xml/main_preferences.xml +++ b/chrome/android/java/res/xml/main_preferences.xml -@@ -61,7 +61,7 @@ found in the LICENSE file. +@@ -64,7 +64,7 @@ found in the LICENSE file. android:key="autofill_section" android:order="11" android:title="@string/prefs_section_autofill"/> 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 9f7f1387cdf..e408288d70a 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ChromeTabbedActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -index d19cc4f7c86a6d16b4a381dc925869110ce03bd0..a2bfb77d425139807b8c9d6beb2f66a458759a50 100644 +index ec155c488f20e31440fd97f6f99b0e23fc834129..f6806542dcdd0f0b0328b272d7a9aef293c96f49 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ChromeTabbedActivity.java -@@ -872,6 +872,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt +@@ -887,6 +887,7 @@ public class ChromeTabbedActivity extends ChromeActivity implements PreAttachInt private void closeIfNoTabsAndHomepageEnabled( boolean isPendingClosure, boolean shouldRemoveWindowWithZeroTabs) { if (getTabModelSelector().getTotalTabCount() == 0) { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch index 65831d87c9e..3f03a7b576b 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-app-ChromeActivity.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -index d2c52397fba2cd4b3bc3ab4eb156dfb5195c48c2..b94bd83645e17258fae73541da121c7b6e34ba22 100644 +index 0d0b4f241827a19fb267d035623ae0264a89bca3..fb4928ef36fa6ebfa36b4a8b881a595c6851e400 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/app/ChromeActivity.java -@@ -654,7 +654,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity +@@ -656,7 +656,7 @@ public abstract class ChromeActivity extends AsyncInitializationActivity mBottomContainer = findViewById(R.id.bottom_container); mSnackbarManager = diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataFragment.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataFragment.java.patch index 359e7ea3bed..16465602714 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataFragment.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-browsing_data-ClearBrowsingDataFragment.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java -index 80c8e02ac2c2c95a540878778adcfe80dae0eed6..e0596f56cd2f642c24f7efaef17ed8ccf5996df5 100644 +index 83188504d8feb30dfa05f8c7024c70295777e666..ef34be18ca5ffc9b3d5d0a8e24ce19564063060c 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/browsing_data/ClearBrowsingDataFragment.java -@@ -354,7 +354,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment +@@ -356,7 +356,7 @@ public class ClearBrowsingDataFragment extends ChromeBaseSettingsFragment } /** Called when browsing data is about to be cleared. */ diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch index 81fc80587fa..09945375d56 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java -index 2fa43ec87b84fc96a6d2be96b582a6429d049f64..a197b54edafd8337f86fcd4be4811367ccfd5099 100644 +index 1483380693ecfd6350496b8f96ac0f36700156dc..4c47f26c98fd39d8f934bf7792c3547474516842 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java @@ -233,6 +233,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator { diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-fullscreen-FullscreenHtmlApiHandlerBase.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-fullscreen-FullscreenHtmlApiHandlerBase.java.patch index d43584d7c39..d8503e3c870 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-fullscreen-FullscreenHtmlApiHandlerBase.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-fullscreen-FullscreenHtmlApiHandlerBase.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java -index 4349e1774109d2d71f6cdd4e0266ae64dbc3b989..0c49b29d2d7024d239eae2ff4a072fb7e95642d2 100644 +index 79ee74e12d1f40d1ea8665efaa3616d3ef82d77b..f538023a9f185638a8a64152ab21e88984b952b4 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java @@ -319,6 +319,7 @@ public abstract class FullscreenHtmlApiHandlerBase diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-infobar-InfoBarContainerView.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-infobar-InfoBarContainerView.java.patch index eff3f664976..899c1dc1b6f 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-infobar-InfoBarContainerView.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-infobar-InfoBarContainerView.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainerView.java b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainerView.java -index d6f628c85406f22a3b739b839a6a8aa37733c803..fb5f1161c85d769c6091153f739814fa4f48ffc7 100644 +index 9c31fed21a20cc0ee6a871354cc3077945953111..d567a81855ddcb8a8abf102188ff44350a7cf150 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainerView.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainerView.java @@ -86,6 +86,7 @@ public class InfoBarContainerView extends SwipableOverlayView diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch index d53990a82f7..ca32afbdfea 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-notifications-NotificationPlatformBridge.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java -index 5f5dab6c7d871dc3faab39ca8ed34c5d8149e882..4e69b83092d63507a8a82e4da5d3dbd5023b8076 100644 +index 86d5ac08dffb657a040831656c2174e8748000a6..9a4fe5e006726ec7fda648d28e9b5aad9755ecfb 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/notifications/NotificationPlatformBridge.java @@ -146,7 +146,7 @@ public class NotificationPlatformBridge { @@ -11,7 +11,7 @@ index 5f5dab6c7d871dc3faab39ca8ed34c5d8149e882..4e69b83092d63507a8a82e4da5d3dbd5 public final String notificationId; public final @NotificationType int notificationType; public final String origin; -@@ -1034,7 +1034,7 @@ public class NotificationPlatformBridge { +@@ -1033,7 +1033,7 @@ public class NotificationPlatformBridge { .storeNotificationResourcesIfSuspended(notification); } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPage.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPage.java.patch index f72ab3a6416..3a57a010ca5 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPage.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-ntp-NewTabPage.java.patch @@ -1,5 +1,5 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java -index 7d653f954e0660ab5eeb43d81c0400980490b66a..2b3c93bcbdc9a248bd7be4526fbe7ac78aa183f9 100644 +index 9f32ee8c94ee001a8e9dc2f3c30c4c413e72235f..f7daf168960a7e0ecf027530a8d9d71abe26da1b 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/ntp/NewTabPage.java @@ -912,7 +912,7 @@ public class NewTabPage diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch index 94b1dd0053d..8dea58e4922 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-privacy-settings-PrivacySettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -index 333f2f0f020df62cf95210b20f63b637fd537183..55b315b35cd0b172e565dfb6c2b0905fc6e316cc 100644 +index 51f99660d4193b14d9583b2b53dfe6aab44012cd..4b1438fd5f31afeb782449e187d0a0fcb8f3c9be 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java -@@ -83,7 +83,7 @@ import java.util.function.Consumer; +@@ -84,7 +84,7 @@ import java.util.function.Consumer; /** Fragment to keep track of the all the privacy related preferences. */ @NullMarked @@ -11,7 +11,7 @@ index 333f2f0f020df62cf95210b20f63b637fd537183..55b315b35cd0b172e565dfb6c2b0905f implements Preference.OnPreferenceChangeListener { private static final String PREF_CAN_MAKE_PAYMENT = "can_make_payment"; private static final String PREF_PRELOAD_PAGES = "preload_pages"; -@@ -551,6 +551,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -563,6 +563,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); @@ -19,7 +19,7 @@ index 333f2f0f020df62cf95210b20f63b637fd537183..55b315b35cd0b172e565dfb6c2b0905f MenuItem help = menu.add(Menu.NONE, R.id.menu_id_targeted_help, Menu.NONE, R.string.menu_help); help.setIcon( -@@ -565,7 +566,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment +@@ -577,7 +578,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment .show(getActivity(), getString(R.string.help_context_privacy), null); return true; } diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch index 5d9f569facc..b0710ab8649 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-sync-settings-ManageSyncSettings.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -index 1ce4feb6c019b6793629356dd474c77328eb06ac..9b59b72a40ef019cffecbd79fd404db9ea5e9962 100644 +index d9b6b3fe661d038cabe3675471c09f57341eb177..954dbe6b9aca2ec138954d5e69a96796fecbd9c2 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/sync/settings/ManageSyncSettings.java -@@ -70,7 +70,7 @@ import org.chromium.chrome.browser.ui.signin.SignOutCoordinator; +@@ -64,7 +64,7 @@ import org.chromium.chrome.browser.ui.signin.SignOutCoordinator; import org.chromium.chrome.browser.ui.signin.SigninUtils; import org.chromium.chrome.browser.ui.signin.SignoutButtonPreference; import org.chromium.chrome.browser.ui.signin.history_sync.HistorySyncHelper; @@ -11,7 +11,7 @@ index 1ce4feb6c019b6793629356dd474c77328eb06ac..9b59b72a40ef019cffecbd79fd404db9 import org.chromium.components.browser_ui.settings.ChromeBasePreference; import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; import org.chromium.components.browser_ui.settings.SettingsUtils; -@@ -724,6 +724,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment +@@ -626,6 +626,7 @@ public class ManageSyncSettings extends ChromeBaseSettingsFragment */ private void updateSyncPreferences() { String signedInAccountName = diff --git a/patches/chrome-app-BUILD.gn.patch b/patches/chrome-app-BUILD.gn.patch index c874102c731..c6d2fe5a179 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 39858b88c8c293bf067ac72fb88aa13749ead163..cd9c5c9853ac5248c734263688f3e7188469082c 100644 +index 07d70529c374ad81dda76864598d1d212a426d28..b1d1f17bb8ab387ecc791b57d1c30dc3f514ea4c 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn -@@ -88,6 +88,7 @@ grit_strings("generated_resources") { +@@ -89,6 +89,7 @@ grit_strings("generated_resources") { if (is_android) { create_android_resources = true } diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 43a0e1045d0..4d0c5a65bee 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 f524f646ce0373c73dd638e4db08decf0cceb69d..885ccd52c3d3815d31eb6874a878d7825179995d 100644 +index 2fc3a991d89093ff9139eb09d74123197155caff..d1142da6bc2dda793dd59d5f22438f9f2b565488 100644 --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -2618,6 +2618,7 @@ static_library("browser") { +@@ -2599,6 +2599,7 @@ static_library("browser") { } else { sources += [ "net/net_error_diagnostics_dialog_stub.cc" ] } @@ -10,7 +10,7 @@ index f524f646ce0373c73dd638e4db08decf0cceb69d..885ccd52c3d3815d31eb6874a878d782 if (is_android) { sources += [ -@@ -8583,6 +8584,7 @@ static_library("browser_public_dependencies") { +@@ -8577,6 +8578,7 @@ static_library("browser_public_dependencies") { "//rlz:rlz_lib", ] } diff --git a/patches/chrome-browser-about_flags.cc.patch b/patches/chrome-browser-about_flags.cc.patch index 2b7bead0c71..f3f615b34d5 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 ac82cb9d3b07027e4de424444a34bb03d20b2c28..c02bf90d027d7ba853ccb34d847c3a908b39e6bf 100644 +index ec85200d643c964acb8fd7bf858e3e7932816d6b..6fc1aa57fc2e700ce12032b77443d423b1495017 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -5159,6 +5159,7 @@ const FeatureEntry::Choice kOmniboxAutofocusOnIncognitoNtpChoices[] = { +@@ -4647,6 +4647,7 @@ const FeatureEntry::FeatureVariation // // When adding a new choice, add it to the end of the list. const FeatureEntry kFeatureEntries[] = { diff --git a/patches/chrome-browser-actor-site_policy.cc.patch b/patches/chrome-browser-actor-site_policy.cc.patch index b5e417580d8..a47993cc25e 100644 --- a/patches/chrome-browser-actor-site_policy.cc.patch +++ b/patches/chrome-browser-actor-site_policy.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/actor/site_policy.cc b/chrome/browser/actor/site_policy.cc -index 019d3f039149541ab4acd9d20edec36024240ba1..eff285323fe9fdc316e41249f19436e550deb6ef 100644 +index 04cfedff5a8369e6a29f3e1ac7a9429e4f85d872..90e1d5f38feddade140296fd58123de5a7b214e6 100644 --- a/chrome/browser/actor/site_policy.cc +++ b/chrome/browser/actor/site_policy.cc -@@ -157,6 +157,7 @@ void MayActOnUrlInternal(const GURL& url, +@@ -159,6 +159,7 @@ void MayActOnUrlInternal(const GURL& url, return; } diff --git a/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch b/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch index da224314c81..2f71a74d5bc 100644 --- a/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch +++ b/patches/chrome-browser-android-browsing_data-browsing_data_bridge.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/android/browsing_data/browsing_data_bridge.cc b/chrome/browser/android/browsing_data/browsing_data_bridge.cc -index 18e17300b432d1131ff71290a64567b5d35e2115..cf0ec352be0d4c1338da69be2b0594a4d3df5261 100644 +index f4daf7c490cf9372badc0e63bb46abef811d293d..e07dc258c0441fe47510e52b71b087ab6724de91 100644 --- a/chrome/browser/android/browsing_data/browsing_data_bridge.cc +++ b/chrome/browser/android/browsing_data/browsing_data_bridge.cc @@ -119,6 +119,7 @@ static void JNI_BrowsingDataBridge_ClearBrowsingData( diff --git a/patches/chrome-browser-app_controller_mac.mm.patch b/patches/chrome-browser-app_controller_mac.mm.patch index d77ab7c31fb..1c2572c8572 100644 --- a/patches/chrome-browser-app_controller_mac.mm.patch +++ b/patches/chrome-browser-app_controller_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm -index 705adbe12a28f25a21a69bbeff456fc11218362f..8f53742e5445efec419a904a0787e1dde1867e83 100644 +index b7c3520adc628e244069c561fed563ffcb4b7f3f..de5d8bd6e14a0cc10f10f44f556159943a25fe24 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm -@@ -755,7 +755,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { +@@ -767,7 +767,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { + (AppController*)sharedController { static AppController* sharedController = [] { @@ -11,7 +11,7 @@ index 705adbe12a28f25a21a69bbeff456fc11218362f..8f53742e5445efec419a904a0787e1dd NSApp.delegate = sharedController; return sharedController; }(); -@@ -1379,7 +1379,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { +@@ -1442,7 +1442,7 @@ class AppControllerNativeThemeObserver : public ui::NativeThemeObserver { } auto it = _profileBookmarkMenuBridgeMap.find(profilePath); diff --git a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch index 36b0ac6d2a4..70f4059119d 100644 --- a/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch +++ b/patches/chrome-browser-browsing_data-chrome_browsing_data_remover_delegate.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc -index 6f1b8b32583798122074bf5b6ca9189b94468540..601d684b73a0cb893ac7b8725649a506625fa35f 100644 +index 0ec4102207985715be691d796b1f3b86d5ef32c2..581bd5e22b94d74db9888384ca993a6869300b8d 100644 --- a/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +++ b/chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc @@ -1625,6 +1625,7 @@ const char* ChromeBrowsingDataRemoverDelegate::GetHistogramSuffix( diff --git a/patches/chrome-browser-chrome_browser_main_mac.mm.patch b/patches/chrome-browser-chrome_browser_main_mac.mm.patch index 2330df14e07..d13ed57327e 100644 --- a/patches/chrome-browser-chrome_browser_main_mac.mm.patch +++ b/patches/chrome-browser-chrome_browser_main_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm -index 91ee1fc056fa5ce47b84643c48bc268a094dc7bd..b7b2c0c8613cbe57f5ee799bd259f9d6f1c03e09 100644 +index bdabbd8c0b3ac3bd947e523ea518918a5912c39b..ef1a76d4adfe2821af0759beb5130f30f19a6360 100644 --- a/chrome/browser/chrome_browser_main_mac.mm +++ b/chrome/browser/chrome_browser_main_mac.mm -@@ -101,6 +101,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { +@@ -102,6 +102,7 @@ void ChromeBrowserMainPartsMac::PreCreateMainMessageLoop() { // ChromeBrowserMainParts should have loaded the resource bundle by this // point (needed to load the nib). CHECK(ui::ResourceBundle::HasSharedInstance()); diff --git a/patches/chrome-browser-content_settings-BUILD.gn.patch b/patches/chrome-browser-content_settings-BUILD.gn.patch index d2f0a965056..489cdbbb35e 100644 --- a/patches/chrome-browser-content_settings-BUILD.gn.patch +++ b/patches/chrome-browser-content_settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/content_settings/BUILD.gn b/chrome/browser/content_settings/BUILD.gn -index 83addc7dcecca2ff54d85a36446db8577cd6e02d..297d33461738077b6d5f4d03929d046f679f56c4 100644 +index 3387a9bdbf5389fe64ca824dcd6fe89d3a6ac7b5..c1ea4e46367046670974b5d066a4200dafc827a5 100644 --- a/chrome/browser/content_settings/BUILD.gn +++ b/chrome/browser/content_settings/BUILD.gn -@@ -128,6 +128,7 @@ source_set("impl") { +@@ -131,6 +131,7 @@ source_set("impl") { if (enable_pdf) { deps += [ "//chrome/browser/pdf" ] } diff --git a/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch b/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch index 53cf1729f12..c0b6e061011 100644 --- a/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch +++ b/patches/chrome-browser-content_settings-page_specific_content_settings_delegate.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc -index a4860ac2623ff2a4f768ab5531ae27a244c4f939..88f6dfe55fd2560e3eb0cf2fb85aa190cbbf0896 100644 +index 00823f100a4fc579964d4bd93787916624313821..b997c4bb9e497022594aaf67f59e8eaa82e933d6 100644 --- a/chrome/browser/content_settings/page_specific_content_settings_delegate.cc +++ b/chrome/browser/content_settings/page_specific_content_settings_delegate.cc -@@ -196,6 +196,7 @@ void GetGuestViewDefaultContentSettingRules( +@@ -198,6 +198,7 @@ void GetGuestViewDefaultContentSettingRules( ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), content_settings::ContentSettingToValue(CONTENT_SETTING_BLOCK), content_settings::ProviderType::kNone, incognito)); diff --git a/patches/chrome-browser-contextual_tasks-contextual_tasks_side_panel_coordinator_unittest.cc.patch b/patches/chrome-browser-contextual_tasks-contextual_tasks_side_panel_coordinator_unittest.cc.patch index 45ebbc44ece..79c80ab277d 100644 --- a/patches/chrome-browser-contextual_tasks-contextual_tasks_side_panel_coordinator_unittest.cc.patch +++ b/patches/chrome-browser-contextual_tasks-contextual_tasks_side_panel_coordinator_unittest.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/contextual_tasks/contextual_tasks_side_panel_coordinator_unittest.cc b/chrome/browser/contextual_tasks/contextual_tasks_side_panel_coordinator_unittest.cc -index cd684bcac8e0591c5221b55f88e34157833fbeae..d0c9feca262786bf90a2e3429f046b00ee109ab7 100644 +index 05f3584f5a0399d6b2bae43d8048337b5bc0ded5..d27c47375322ad056248188ccae70ad12c3e291d 100644 --- a/chrome/browser/contextual_tasks/contextual_tasks_side_panel_coordinator_unittest.cc +++ b/chrome/browser/contextual_tasks/contextual_tasks_side_panel_coordinator_unittest.cc -@@ -123,6 +123,7 @@ class MockSidePanelUI : public SidePanelUI { +@@ -129,6 +129,7 @@ class MockSidePanelUI : public SidePanelUI { SetNoDelaysForTesting, (bool no_delays_for_testing), (override)); diff --git a/patches/chrome-browser-download-download_target_determiner.cc.patch b/patches/chrome-browser-download-download_target_determiner.cc.patch index 3f47d32e06d..5a838682a29 100644 --- a/patches/chrome-browser-download-download_target_determiner.cc.patch +++ b/patches/chrome-browser-download-download_target_determiner.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc -index e445fd06416d98fef91c540bcea376d39b826f08..d0d6eb556d960a2dcefa70a65d1d05fd8e06e27b 100644 +index 230a1c857445b4f52a0760ab31814bf348cf11cc..4878594786f49e083f92977077fe2b2aa2aceb02 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1216,6 +1216,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1217,6 +1217,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( download_->GetDownloadSource() != download::DownloadSource::DRAG_AND_DROP; if (HasPromptedForPath() || confirmation_reason_ != DownloadConfirmationReason::NONE || @@ -10,7 +10,7 @@ index e445fd06416d98fef91c540bcea376d39b826f08..d0d6eb556d960a2dcefa70a65d1d05fd user_approved_path) { // If the "DownloadRestrictions" enterprise policy explicitly disallows the // download, don't let the user gesture bypass the dangerous verdict. -@@ -1256,6 +1257,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1257,6 +1258,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 || (download_->HasUserGesture() && visits == VISITED_REFERRER))) return DownloadFileType::NOT_DANGEROUS; diff --git a/patches/chrome-browser-download-internal-android-BUILD.gn.patch b/patches/chrome-browser-download-internal-android-BUILD.gn.patch index 9518131572c..17f573fa165 100644 --- a/patches/chrome-browser-download-internal-android-BUILD.gn.patch +++ b/patches/chrome-browser-download-internal-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/download/internal/android/BUILD.gn b/chrome/browser/download/internal/android/BUILD.gn -index 3641277c0f8f12f6e58a77c5682e2980c5ed1a87..bc84b036488a82fe583dc79d042bc203c1fcb423 100644 +index 0d4ab1e15ea8bbda7bbbeab842b09d1df634be08..75e48ae111cc3bdc57df6dfdc377656b34035f1f 100644 --- a/chrome/browser/download/internal/android/BUILD.gn +++ b/chrome/browser/download/internal/android/BUILD.gn -@@ -211,6 +211,7 @@ android_resources("java_resources") { +@@ -210,6 +210,7 @@ android_resources("java_resources") { "java/res/values/ids.xml", "java/res/values/styles.xml", ] diff --git a/patches/chrome-browser-extensions-BUILD.gn.patch b/patches/chrome-browser-extensions-BUILD.gn.patch index b295423313a..42a4bd754a8 100644 --- a/patches/chrome-browser-extensions-BUILD.gn.patch +++ b/patches/chrome-browser-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn -index 5d5af07b158c0bcb4ecd8c394289724bdf0a870b..88ec49c4f6bd37f6db057207160211ebf506d56f 100644 +index 64e7c1122ba874b8199ecaa80ebbac478006a91c..b9154c348bcfd9b9469dfe992c437eedb7010802 100644 --- a/chrome/browser/extensions/BUILD.gn +++ b/chrome/browser/extensions/BUILD.gn -@@ -1562,6 +1562,7 @@ source_set("extensions") { +@@ -1570,6 +1570,7 @@ source_set("extensions") { "api/tabs/app_window_helper.h", ] } diff --git a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch index 3ae8a6b218c..1e99611a62b 100644 --- a/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch +++ b/patches/chrome-browser-extensions-api-developer_private-extension_info_generator.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -index 1ba9d4e28ee582afa4d146cada8af8bfb0770361..fee0596a73c8e5b7693fd7145fd2fec60347c840 100644 +index e29ca8a104ad7c3245ea4c12356669417cd67b8b..2089934d85343dc99176c83146fa5411dbf55196 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -@@ -729,6 +729,7 @@ void ExtensionInfoGenerator::FillExtensionInfo(const Extension& extension, +@@ -711,6 +711,7 @@ void ExtensionInfoGenerator::FillExtensionInfo(const Extension& extension, #else info.incognito_access_pending_change = false; #endif 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 a75ebcf075d..321b359c6b2 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,8 +1,8 @@ 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 c892073f6ab7c24e8f5255e271f93a26c75a4958..d21bd890d2cf350c4a4fd115c0d18b8632db1f6a 100644 +index 05704d3dd7d9d1b849ffc016f00a13195097be19..b3119e3389b97c4b965e97255065b057bd1c8b68 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 -@@ -92,6 +92,7 @@ content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest( +@@ -91,6 +91,7 @@ content::RenderProcessHost* WebrtcLoggingPrivateFunction::RphFromRequest( const api::webrtc_logging_private::RequestInfo& request, const std::string& security_origin, std::string* error) { diff --git a/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch b/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch index a335d45b004..56b85305753 100644 --- a/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch +++ b/patches/chrome-browser-extensions-chrome_component_extension_resource_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc -index ff14b77e36c1881d34cfd03a5ce075fa4873b2a4..fa1b313c8d05ab8fb5ee5b6be65561565ef3bf19 100644 +index 2dece2aeaff670b880685f43ed908f146cd1dde0..5243acd2a7a9487ddc6656a010a66ba0b8e1739b 100644 --- a/chrome/browser/extensions/chrome_component_extension_resource_manager.cc +++ b/chrome/browser/extensions/chrome_component_extension_resource_manager.cc @@ -144,6 +144,7 @@ ChromeComponentExtensionResourceManager::Data::Data() { diff --git a/patches/chrome-browser-extensions-extension_management.cc.patch b/patches/chrome-browser-extensions-extension_management.cc.patch index 3de40d63db0..ff4b2a12428 100644 --- a/patches/chrome-browser-extensions-extension_management.cc.patch +++ b/patches/chrome-browser-extensions-extension_management.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_management.cc b/chrome/browser/extensions/extension_management.cc -index dcd2e1fc9aa052387f929ce88e41a23d01362538..8ac75d056f008885bcaa0d9fa2938f61fa877f2b 100644 +index bb0e7b5cba7e0ab8853aabdd61b5ac3a75776cc7..aa3c8f6ed5e9342cf315fda13e2c547d4a607e1d 100644 --- a/chrome/browser/extensions/extension_management.cc +++ b/chrome/browser/extensions/extension_management.cc -@@ -1147,6 +1147,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext( +@@ -1152,6 +1152,7 @@ ExtensionManagementFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* context) const { TRACE_EVENT0("browser,startup", "ExtensionManagementFactory::BuildServiceInstanceFor"); diff --git a/patches/chrome-browser-extensions-extension_tab_util.cc.patch b/patches/chrome-browser-extensions-extension_tab_util.cc.patch index 0ad3dcbe512..0dbf9129cb6 100644 --- a/patches/chrome-browser-extensions-extension_tab_util.cc.patch +++ b/patches/chrome-browser-extensions-extension_tab_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc -index 7e5d7a19679af97e27f6c3833fea3ffb965c519d..c463c18ca051e5d9f23a7755ae1586ccc4cc6ea7 100644 +index 2b5f1e30a5e095e850e6438c2c2115f4b6406efa..1ed1b514525c323bd7edf2173cf546b8de0c856d 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc -@@ -1100,6 +1100,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) { +@@ -1101,6 +1101,7 @@ bool ExtensionTabUtil::IsKillURL(const GURL& url) { } if (!url.SchemeIs(content::kChromeUIScheme)) { 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 87f2ddd7e56..9abc202707c 100644 --- a/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch +++ b/patches/chrome-browser-external_protocol-external_protocol_handler.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/external_protocol/external_protocol_handler.cc b/chrome/browser/external_protocol/external_protocol_handler.cc -index 51f344626c5fd10f3e8487908881f5187288a78f..0e0e5f4fc8ecbf8ae8687415d002f46bac9042aa 100644 +index 9d7f383e3878f0410ca7e7f34d7941b60847c097..4b9db45c891ea676f0f19c2769bdf26d945b521d 100644 --- a/chrome/browser/external_protocol/external_protocol_handler.cc +++ b/chrome/browser/external_protocol/external_protocol_handler.cc @@ -414,7 +414,7 @@ ExternalProtocolHandler::BlockState ExternalProtocolHandler::GetBlockState( diff --git a/patches/chrome-browser-global_features.cc.patch b/patches/chrome-browser-global_features.cc.patch index c0314cfc2a5..55e06a78257 100644 --- a/patches/chrome-browser-global_features.cc.patch +++ b/patches/chrome-browser-global_features.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/global_features.cc b/chrome/browser/global_features.cc -index f5698f7b8c35a4f83be7ff87cb8bdd2eb343285c..65c1410a086b8ddfcfddd4889c9b5e10c5bba341 100644 +index e1c76d0788c262d1e2f4fe20329d3a3c31c1d646..9b816385699617b3e9d522f10a841abb2da503e8 100644 --- a/chrome/browser/global_features.cc +++ b/chrome/browser/global_features.cc @@ -71,6 +71,7 @@ diff --git a/patches/chrome-browser-hub-internal-android-res-layout-hub_toolbar_layout.xml.patch b/patches/chrome-browser-hub-internal-android-res-layout-hub_toolbar_layout.xml.patch index d069179a2a8..bef830c20c3 100644 --- a/patches/chrome-browser-hub-internal-android-res-layout-hub_toolbar_layout.xml.patch +++ b/patches/chrome-browser-hub-internal-android-res-layout-hub_toolbar_layout.xml.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml b/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml -index ad958053aeb2082222cea33886bb578120842391..c7af5895c07e74f1a3c4836028feb9801e520dbc 100644 +index 9d53a907e2adff177cb5ee5807f96e74510e4338..7ca33211d4ddc0e2f3cd7bd0af253f09579f3869 100644 --- a/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml +++ b/chrome/browser/hub/internal/android/res/layout/hub_toolbar_layout.xml @@ -21,7 +21,7 @@ found in the LICENSE file. @@ -11,7 +11,7 @@ index ad958053aeb2082222cea33886bb578120842391..c7af5895c07e74f1a3c4836028feb980 android:id="@+id/hub_toolbar" android:layout_width="match_parent" android:layout_height="wrap_content" -@@ -108,6 +108,7 @@ found in the LICENSE file. +@@ -109,6 +109,7 @@ found in the LICENSE file. android:tooltipText="@string/accessibility_search_loupe_tooltip_text" style="@style/ToolbarMenuButton" app:tint="@color/default_icon_color_tint_list" /> @@ -19,7 +19,7 @@ index ad958053aeb2082222cea33886bb578120842391..c7af5895c07e74f1a3c4836028feb980 -@@ -150,5 +151,5 @@ found in the LICENSE file. +@@ -151,5 +152,5 @@ found in the LICENSE file. android:gravity="top" android:importantForAccessibility="no" android:visibility="gone"/> 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 1ad41d57d25..035e4f8a779 100644 --- a/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch +++ b/patches/chrome-browser-media-webrtc-webrtc_log_uploader.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/media/webrtc/webrtc_log_uploader.cc b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -index c21884ac3ab0106260a54dbfa355ba2134cd5725..cec381d0852d12a0d71ef58b8324a9078e6d479b 100644 +index 269ec919d15699715b831ffadcc3525284427803..5c8f6aa405186c2bc2a207d8bc23c24078daaa8b 100644 --- a/chrome/browser/media/webrtc/webrtc_log_uploader.cc +++ b/chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -487,6 +487,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) { +@@ -431,6 +431,7 @@ std::string WebRtcLogUploader::CompressLog(WebRtcLogBuffer* buffer) { void WebRtcLogUploader::UploadCompressedLog( WebRtcLogUploader::UploadDoneData upload_done_data, std::unique_ptr post_data) { diff --git a/patches/chrome-browser-metrics-chrome_feature_list_creator.cc.patch b/patches/chrome-browser-metrics-chrome_feature_list_creator.cc.patch index 95a190ffb26..290ad3ff2f1 100644 --- a/patches/chrome-browser-metrics-chrome_feature_list_creator.cc.patch +++ b/patches/chrome-browser-metrics-chrome_feature_list_creator.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/metrics/chrome_feature_list_creator.cc b/chrome/browser/metrics/chrome_feature_list_creator.cc -index 164aa78ca9e0e398454e56cceab549b5de106bdd..4047976cbf840e87aed853988730984d717ddcae 100644 +index c8ab55cf0bb3f347fcd826c054eff3b1c1cf5e39..c09bb2979c9831320e0d565675964ca2dce5ad52 100644 --- a/chrome/browser/metrics/chrome_feature_list_creator.cc +++ b/chrome/browser/metrics/chrome_feature_list_creator.cc -@@ -355,5 +355,6 @@ void ChromeFeatureListCreator::SetupInitialPrefs() { +@@ -351,5 +351,6 @@ void ChromeFeatureListCreator::SetupInitialPrefs() { local_state_->SetTime(variations::prefs::kVariationsSeedDate, base::Time::Now()); } diff --git a/patches/chrome-browser-net-profile_network_context_service.cc.patch b/patches/chrome-browser-net-profile_network_context_service.cc.patch index d01db29601a..360482e19bb 100644 --- a/patches/chrome-browser-net-profile_network_context_service.cc.patch +++ b/patches/chrome-browser-net-profile_network_context_service.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/net/profile_network_context_service.cc b/chrome/browser/net/profile_network_context_service.cc -index e6f6074737d7d65e7318544b22da0c5bb1e91ce6..e2b0fa6624504df22188707f84a2b482b6a18bce 100644 +index d0bb264e55f1f962af3f076c2de0eb3911cabfc2..882c149b84b9807711e2df9dbbad4533117aee9b 100644 --- a/chrome/browser/net/profile_network_context_service.cc +++ b/chrome/browser/net/profile_network_context_service.cc -@@ -718,6 +718,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() { +@@ -704,6 +704,7 @@ network::mojom::CTPolicyPtr ProfileNetworkContextService::GetCTPolicy() { std::vector excluded_spkis( TranslateStringArray(ct_excluded_spkis)); 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 bdcdea051ef..5c8718b1bec 100644 --- a/patches/chrome-browser-net-system_network_context_manager.cc.patch +++ b/patches/chrome-browser-net-system_network_context_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/net/system_network_context_manager.cc b/chrome/browser/net/system_network_context_manager.cc -index 50f5e572971bcd3da23183b399abe542fcd76604..bfff02e4fc72b6ed5ba12a3ce3d7798cf0f713ac 100644 +index 341cae2bda7fce9e5133966cb8670b9858a44654..1b5175a36e7f0084a5d33200bea780b5cf6a3fb0 100644 --- a/chrome/browser/net/system_network_context_manager.cc +++ b/chrome/browser/net/system_network_context_manager.cc @@ -478,7 +478,7 @@ class SystemNetworkContextManager::URLLoaderFactoryForSystem diff --git a/patches/chrome-browser-prefs-BUILD.gn.patch b/patches/chrome-browser-prefs-BUILD.gn.patch index 9cc2b339703..074b71e442e 100644 --- a/patches/chrome-browser-prefs-BUILD.gn.patch +++ b/patches/chrome-browser-prefs-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/prefs/BUILD.gn b/chrome/browser/prefs/BUILD.gn -index 47ee65a6234e2082ebf5a342019a698603e7e8b3..409c00395c0bed3a33966801b2b15af272d8eb44 100644 +index e7e27da2d113967179a9f9b9f5019bc5e86f81f4..4bfea38dc702c110c4ed139d5022a034d72f78a4 100644 --- a/chrome/browser/prefs/BUILD.gn +++ b/chrome/browser/prefs/BUILD.gn -@@ -162,6 +162,7 @@ source_set("impl") { +@@ -164,6 +164,7 @@ source_set("impl") { "//services/preferences/tracked", "//services/preferences/tracked:features", ] diff --git a/patches/chrome-browser-prefs-browser_prefs.cc.patch b/patches/chrome-browser-prefs-browser_prefs.cc.patch index aae1bc3e732..8b6ea936c02 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 5ce533fda6173bd319cd11a869c6c5b38985a094..2ebc500511982156361593e278990f4a317e8200 100644 +index 868bfe1564db32f7c94ee68742c7066fa4c36199..64e158af3f1576eef07a7bfa3dc4b52cf062eb12 100644 --- a/chrome/browser/prefs/browser_prefs.cc +++ b/chrome/browser/prefs/browser_prefs.cc -@@ -1662,6 +1662,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { +@@ -1687,6 +1687,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) { false); // This is intentionally last. @@ -10,7 +10,7 @@ index 5ce533fda6173bd319cd11a869c6c5b38985a094..2ebc500511982156361593e278990f4a RegisterLocalStatePrefsForMigration(registry); } -@@ -2146,6 +2147,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, +@@ -2171,6 +2172,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry, #endif // BUILDFLAG(IS_ANDROID) registry->RegisterBooleanPref(prefs::kStaticStorageQuotaEnabled, false); @@ -18,7 +18,7 @@ index 5ce533fda6173bd319cd11a869c6c5b38985a094..2ebc500511982156361593e278990f4a } void RegisterUserProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { -@@ -2554,6 +2556,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, +@@ -2593,6 +2595,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, profile_prefs->ClearPref(kObsoletePasswordsUseUPMLocalAndSeparateStores); profile_prefs->ClearPref(kObsoleteEmptyProfileStoreLoginDatabase); profile_prefs->ClearPref(kObsoleteUpmAutoExportCsvNeedsDeletion); @@ -26,7 +26,7 @@ index 5ce533fda6173bd319cd11a869c6c5b38985a094..2ebc500511982156361593e278990f4a base::DeleteFile(profile_path.Append(FILE_PATH_LITERAL("Login Data"))); base::DeleteFile( profile_path.Append(FILE_PATH_LITERAL("Login Data For Account"))); -@@ -2561,6 +2564,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, +@@ -2600,6 +2603,7 @@ void MigrateObsoleteProfilePrefs(PrefService* profile_prefs, profile_path.Append(FILE_PATH_LITERAL("Login Data-journal"))); base::DeleteFile( profile_path.Append(FILE_PATH_LITERAL("Login Data For Account-journal"))); diff --git a/patches/chrome-browser-prefs-chrome_pref_service_factory.cc.patch b/patches/chrome-browser-prefs-chrome_pref_service_factory.cc.patch index bd08b296994..2dbb5b09541 100644 --- a/patches/chrome-browser-prefs-chrome_pref_service_factory.cc.patch +++ b/patches/chrome-browser-prefs-chrome_pref_service_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc -index 95428bea917ec1c156b46e449c6fd17c740c03ab..545be90ba58257c9c98e2c7303af9a72653f5e8a 100644 +index cf4ebf3d26398785e8ef558eb0b010fe4b752601..2f265b95bbcfa6ae7595b6684b418a466838d9ca 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc @@ -193,6 +193,7 @@ const auto kTrackedPrefs = std::to_array({ diff --git a/patches/chrome-browser-profiles-profile.cc.patch b/patches/chrome-browser-profiles-profile.cc.patch index c30cf94ae52..45dda8dc194 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 d252c882b70153f568cbe68f881056c232ffe118..e3990e9a8c3e7df24aae8f6a296d94dc7e36114d 100644 +index 64b3e5af4de03e477d91af925bf70d78df398410..c38651d8c4105c82b4ebfded90d56bc43a63abad 100644 --- a/chrome/browser/profiles/profile.cc +++ b/chrome/browser/profiles/profile.cc @@ -114,6 +114,7 @@ bool Profile::OTRProfileID::AllowsBrowserWindows() const { diff --git a/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch b/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch index 62c76c390cb..fa859a4872e 100644 --- a/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch +++ b/patches/chrome-browser-profiles-profile_attributes_entry.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_attributes_entry.cc b/chrome/browser/profiles/profile_attributes_entry.cc -index 4e0f17990817293a98c16a24d0006bbd604a5bdb..05c272d55de8e1c77dbdb560c41933a07fbe4c5e 100644 +index 37210cb33ba7777a4466aac755c734502df88ea2..14215b26d9d0b414c3d907ebd2c4e0e7c7759f3f 100644 --- a/chrome/browser/profiles/profile_attributes_entry.cc +++ b/chrome/browser/profiles/profile_attributes_entry.cc @@ -1106,6 +1106,7 @@ bool ProfileAttributesEntry::ClearValue(const char* key) { 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 0fd9be546f2..b70b24a87cd 100644 --- a/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch +++ b/patches/chrome-browser-profiles-profile_avatar_icon_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc -index 0e1725bf6d5b087bf1af2b192acb7581fa346ee7..b9e5ddaec5dab160762840e8a5278ad74c59b4ca 100644 +index 7ceef75f86e1dd08fd0d3d5a9ec9f224a8453fd8..e20c208fd6e927b9ee8dde336016d31c59d3f153 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc @@ -459,7 +459,7 @@ constexpr size_t kDefaultAvatarIconsCount = 1; @@ -27,7 +27,7 @@ index 0e1725bf6d5b087bf1af2b192acb7581fa346ee7..b9e5ddaec5dab160762840e8a5278ad7 static const std::array resource_info = {{ // Old avatar icons: -@@ -969,6 +971,7 @@ base::Value::List GetIconsAndLabelsForProfileAvatarSelector( +@@ -969,6 +971,7 @@ base::ListValue GetIconsAndLabelsForProfileAvatarSelector( selected_avatar_idx == GetPlaceholderAvatarIndex()); avatars.Insert(avatars.begin(), base::Value(std::move(generic_avatar_info))); diff --git a/patches/chrome-browser-profiles-profile_impl.cc.patch b/patches/chrome-browser-profiles-profile_impl.cc.patch index 646182e8ebf..9194379b972 100644 --- a/patches/chrome-browser-profiles-profile_impl.cc.patch +++ b/patches/chrome-browser-profiles-profile_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc -index 8981bef78da4f234bb261c66d8e1fe5a149ea94c..b510a8cc38f2c62f6301ef660226d1d1db1ac339 100644 +index 6bc3db5c106e40aadc0aec040ed029603387a8fb..aa5f018e5043729b5f61f9db25a89f450474b963 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc -@@ -566,6 +566,7 @@ void ProfileImpl::TakePrefsFromStartupData() { +@@ -570,6 +570,7 @@ void ProfileImpl::TakePrefsFromStartupData() { CreateExtensionPrefStore(this, /*incognito_pref_store=*/false)); ProfileKeyStartupAccessor::GetInstance()->Reset(); diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch index 8653a786d50..183ddfd6137 100644 --- a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch +++ b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -index 2dabd636233471e1df67c3b0a77da789c914b3bd..6fb3de57c2c358fd7eb40c9490afd2f2e9447d1b 100644 +index 62cdd2ab941685926c34b90d9858211bdeaaba6f..7f6fb5722c3e9804639f2cc5fc60baf9b79e4cc9 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc -@@ -2483,6 +2483,7 @@ void RenderViewContextMenu::AppendSearchProvider() { +@@ -2507,6 +2507,7 @@ void RenderViewContextMenu::AppendSearchProvider() { if (!selection_navigation_url_.is_valid()) { return; } diff --git a/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch b/patches/chrome-browser-renderer_context_menu-render_view_context_menu.h.patch index eeab6f0a637..4beeec29730 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 5b3684ecf0c1bde67c50dddcf08b180865cb7808..1fe60ef8c3d8e25bcacc870a9043c1d93cc6aa52 100644 +index 5caabda59bb17fb8558b66538eb02f6aedb224f3..86f07dfa90fa3e5ba650f93033dff71eb6ab2e16 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.h +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.h -@@ -199,6 +199,7 @@ class RenderViewContextMenu +@@ -200,6 +200,7 @@ class RenderViewContextMenu // Returns true if keyboard lock is active and requires the user to press and // hold escape to exit exclusive access mode. bool IsPressAndHoldEscRequiredToExitFullscreen() const; diff --git a/patches/chrome-browser-resources-certificate_manager-certificate_manager.ts.patch b/patches/chrome-browser-resources-certificate_manager-certificate_manager.ts.patch index a8ed7944168..170468d5c71 100644 --- a/patches/chrome-browser-resources-certificate_manager-certificate_manager.ts.patch +++ b/patches/chrome-browser-resources-certificate_manager-certificate_manager.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/certificate_manager/certificate_manager.ts b/chrome/browser/resources/certificate_manager/certificate_manager.ts -index 1dac1e54d4561a3c3b685af3fc26938b77a02ecd..b5bce0d48a868834c9a8373236a26c0a87153246 100644 +index 36f29e1137ebb11e3cf9e6a28e25b8f87a2383ab..8a3533cabaf4b9f5ba33f0dc3f6af6de636e5285 100644 --- a/chrome/browser/resources/certificate_manager/certificate_manager.ts +++ b/chrome/browser/resources/certificate_manager/certificate_manager.ts -@@ -547,4 +547,4 @@ declare global { +@@ -537,4 +537,4 @@ declare global { } } diff --git a/patches/chrome-browser-resources-settings-BUILD.gn.patch b/patches/chrome-browser-resources-settings-BUILD.gn.patch index c5f996e9c26..f00d6937822 100644 --- a/patches/chrome-browser-resources-settings-BUILD.gn.patch +++ b/patches/chrome-browser-resources-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/BUILD.gn b/chrome/browser/resources/settings/BUILD.gn -index 04b2069bd3bdb50f034b997e2461fe386287e4c4..95e2d2682e246c2b6a107d2b9382f5d1e67cd75e 100644 +index 01bd4cfbf9588d70d21db6543b100c61b2950971..927fe2b260fb50bc544ef1717351caa255852d6c 100644 --- a/chrome/browser/resources/settings/BUILD.gn +++ b/chrome/browser/resources/settings/BUILD.gn -@@ -508,4 +508,5 @@ build_webui("build") { +@@ -505,4 +505,5 @@ build_webui("build") { "$root_gen_dir/chrome/browser/resources/settings_shared/tsc", root_build_dir) ] } diff --git a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch index 05835ac0107..b9f8d0aa690 100644 --- a/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch +++ b/patches/chrome-browser-resources-settings-people_page-sync_controls.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/people_page/sync_controls.ts b/chrome/browser/resources/settings/people_page/sync_controls.ts -index 099860c380c2d6678031550aacf7324d7910f49e..fc56006556493d9ff1960207db9214ec55cb3825 100644 +index f3074049c1f3a37b679f2571b74f827cb796c1bc..e110dae96b16ccfef52f6953dd59581b65e7d389 100644 --- a/chrome/browser/resources/settings/people_page/sync_controls.ts +++ b/chrome/browser/resources/settings/people_page/sync_controls.ts @@ -176,7 +176,7 @@ export class SettingsSyncControlsElement extends diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch index b5d2abbf109..cadca14379b 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.html.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.html b/chrome/browser/resources/settings/privacy_page/privacy_page.html -index 4cb0a0a1b0016de745268992bcc20875d778ef78..9234c6645c404911246c60f2d2c7cea983b31f62 100644 +index d3c540ea1b2403d102414c3aeb7e85b837452405..f02442fba2dde111c154001eedb440f232d2edf0 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.html +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.html @@ -18,6 +18,7 @@ diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch index 15e5394cc89..f569afb9633 100644 --- a/patches/chrome-browser-resources-settings-route.ts.patch +++ b/patches/chrome-browser-resources-settings-route.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/route.ts b/chrome/browser/resources/settings/route.ts -index a116759bfcca4b25940f6abf17ff559beba91c80..e1bbfb1e96f90acbd1e2182de2c5b3cfff343760 100644 +index 00a5445f8771177bfc4dd232ed52fa8a642072e0..c2c26d1d4d0ee20f5bf7f1e7ea666dd68f7b7cdf 100644 --- a/chrome/browser/resources/settings/route.ts +++ b/chrome/browser/resources/settings/route.ts @@ -9,6 +9,7 @@ import {pageVisibility} from './page_visibility.js'; diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch index 5d4450529be..7b0f39bb468 100644 --- a/patches/chrome-browser-resources-settings-settings.ts.patch +++ b/patches/chrome-browser-resources-settings-settings.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings.ts b/chrome/browser/resources/settings/settings.ts -index f008482e60b034e1147fe29c4cbfc4c74768c507..2a90897c40932af6d1853fe044cb4476616e5907 100644 +index 692a677c7c4d5070907a4ef9cb5a385f58408dc8..99eeb34c42730b8a38e47d09c2e90e2c76115268 100644 --- a/chrome/browser/resources/settings/settings.ts +++ b/chrome/browser/resources/settings/settings.ts @@ -2,6 +2,7 @@ diff --git a/patches/chrome-browser-resources-settings-settings_shared.css.patch b/patches/chrome-browser-resources-settings-settings_shared.css.patch index 799dc3db683..4e7e4987185 100644 --- a/patches/chrome-browser-resources-settings-settings_shared.css.patch +++ b/patches/chrome-browser-resources-settings-settings_shared.css.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/settings_shared.css b/chrome/browser/resources/settings/settings_shared.css -index 54efa4fa0ed87f632e5a645f500eeb330c5c5d84..2762884b3eac121669e3ee666ff51a9bafef0191 100644 +index 37ebfb19d55e0e8f37a7b821864e41319def14ea..cfc224f1de6b7ce56e498b5ac90f585e1e604c12 100644 --- a/chrome/browser/resources/settings/settings_shared.css +++ b/chrome/browser/resources/settings/settings_shared.css @@ -8,7 +8,8 @@ diff --git a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch index 03274d2ef5b..54bcc04f83c 100644 --- a/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-constants.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/site_settings/constants.ts b/chrome/browser/resources/settings/site_settings/constants.ts -index 0b0c74c6bff2433e25d07e3b11ffd1e2dd013457..8febddefb692e8744a1477b83dbd2f3bd218c158 100644 +index 3c614567af955aa39343758a94ccf795c1d2195c..1705b280594749f8b9bfe1e21a34196156a5bb5f 100644 --- a/chrome/browser/resources/settings/site_settings/constants.ts +++ b/chrome/browser/resources/settings/site_settings/constants.ts -@@ -70,6 +70,7 @@ export enum ContentSettingsTypes { +@@ -69,6 +69,7 @@ export enum ContentSettingsTypes { PDF_DOCUMENTS = 'pdfDocuments', SITE_DATA = 'site-data', OFFER_WRITING_HELP = 'offer-writing-help', diff --git a/patches/chrome-browser-resources-settings-site_settings-site_settings_util.ts.patch b/patches/chrome-browser-resources-settings-site_settings-site_settings_util.ts.patch index 5c538b14d67..56203624e63 100644 --- a/patches/chrome-browser-resources-settings-site_settings-site_settings_util.ts.patch +++ b/patches/chrome-browser-resources-settings-site_settings-site_settings_util.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/site_settings/site_settings_util.ts b/chrome/browser/resources/settings/site_settings/site_settings_util.ts -index 3e7a9ac471b9ac13cae27fbe373b3c4f6433be8d..08fd3505dbf55b5d23d433d36b81c9b5505a95e6 100644 +index a99e7905e5271c003288729f68c42e9e0b362c43..c22cf28897462f6cfd2352b1e2b7c888335bb8a5 100644 --- a/chrome/browser/resources/settings/site_settings/site_settings_util.ts +++ b/chrome/browser/resources/settings/site_settings/site_settings_util.ts -@@ -114,7 +114,7 @@ export function getLocalizationStringForContentType( +@@ -113,7 +113,7 @@ export function getLocalizationStringForContentType( case ContentSettingsTypes.SMART_CARD_READERS: return null; default: diff --git a/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmarks_list.ts.patch b/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmarks_list.ts.patch index 29f30197f91..8ef1b85e010 100644 --- a/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmarks_list.ts.patch +++ b/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmarks_list.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts -index 365d21e0702c86296a608797c7fa52dfab6af67a..36b32637166166dc6db30f73ad133d6a719c702e 100644 +index b4c2d9e3d436550dc1dd861c927692df3b291730..0a669cef64a5fc0afce150a72baa010bb9a1d355 100644 --- a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts +++ b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts @@ -194,7 +194,8 @@ export class PowerBookmarksListElement extends PolymerElement implements diff --git a/patches/chrome-browser-resources-side_panel-read_anything-BUILD.gn.patch b/patches/chrome-browser-resources-side_panel-read_anything-BUILD.gn.patch index 5bc565a3bd4..9f668cd4aeb 100644 --- a/patches/chrome-browser-resources-side_panel-read_anything-BUILD.gn.patch +++ b/patches/chrome-browser-resources-side_panel-read_anything-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/side_panel/read_anything/BUILD.gn b/chrome/browser/resources/side_panel/read_anything/BUILD.gn -index a7d7017bc27e73d14a55755ce01f60f74d17f4ad..7eaaffd073e954fdf15897a32d02ca56fe9d3919 100644 +index b273323c8702eda5877a23377e85b92a6b117fd6..f6352416b9201383733e5e8617c2e56421fc94ea 100644 --- a/chrome/browser/resources/side_panel/read_anything/BUILD.gn +++ b/chrome/browser/resources/side_panel/read_anything/BUILD.gn -@@ -115,7 +115,7 @@ build_webui("build") { +@@ -114,7 +114,7 @@ build_webui("build") { target_gen_dir) ] webui_context_type = "untrusted" diff --git a/patches/chrome-browser-resources-tab_search-BUILD.gn.patch b/patches/chrome-browser-resources-tab_search-BUILD.gn.patch index 7ae0ed39c38..68fe2b3f902 100644 --- a/patches/chrome-browser-resources-tab_search-BUILD.gn.patch +++ b/patches/chrome-browser-resources-tab_search-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/tab_search/BUILD.gn b/chrome/browser/resources/tab_search/BUILD.gn -index d8bc1b7393fd55b984adbc850909b9f13a2c195f..6aad94f29dd6e0d9d4227093da2644917c8b8965 100644 +index f9c3c4dc649d0c8bdf1366236fc7e2cc8b2f53fd..881ec562a5520514ef1418a78cd0b42f8d5e08b1 100644 --- a/chrome/browser/resources/tab_search/BUILD.gn +++ b/chrome/browser/resources/tab_search/BUILD.gn @@ -130,4 +130,5 @@ build_webui("build") { diff --git a/patches/chrome-browser-sessions-session_service.cc.patch b/patches/chrome-browser-sessions-session_service.cc.patch index 3e8246055db..20c130ec925 100644 --- a/patches/chrome-browser-sessions-session_service.cc.patch +++ b/patches/chrome-browser-sessions-session_service.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/sessions/session_service.cc b/chrome/browser/sessions/session_service.cc -index cade5ee32bf8a2eb92c14a461dd7da07395b5bd1..e8036e71c8bd966df9521e00dafe2f3334909762 100644 +index 2eaacf40c2473f8d0147d79e99c9432c7d7ffdc3..d925c66c28d2aa2a66b383e31ada67f814e7f8f1 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc -@@ -384,6 +384,7 @@ void SessionService::TabClosed(SessionID window_id, SessionID tab_id) { +@@ -385,6 +385,7 @@ void SessionService::TabClosed(SessionID window_id, SessionID tab_id) { window_id) == window_closing_ids_.end()) && IsOnlyOneTabLeft()) { // This is the last tab in the last tabbed browser. diff --git a/patches/chrome-browser-shell_integration_linux.cc.patch b/patches/chrome-browser-shell_integration_linux.cc.patch index a12f5d822db..1cc96325f75 100644 --- a/patches/chrome-browser-shell_integration_linux.cc.patch +++ b/patches/chrome-browser-shell_integration_linux.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/shell_integration_linux.cc b/chrome/browser/shell_integration_linux.cc -index 8cb4529d2548fc9d8cdaf52530e8d119857077f8..34f6c35983ed8fc6427acf021c7923b33a95c29d 100644 +index da32d124606ca2d19359c6c7a2ee5c74f12b90c2..21e999630e30f8ca30011f87cdeba00b62e18e53 100644 --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc @@ -516,7 +516,7 @@ std::string GetIconName() { diff --git a/patches/chrome-browser-signin-chrome_signin_helper.cc.patch b/patches/chrome-browser-signin-chrome_signin_helper.cc.patch index 92e97c2781b..e5f714b070b 100644 --- a/patches/chrome-browser-signin-chrome_signin_helper.cc.patch +++ b/patches/chrome-browser-signin-chrome_signin_helper.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/signin/chrome_signin_helper.cc b/chrome/browser/signin/chrome_signin_helper.cc -index 6eb55ae4b0d8e5c8667104808c05418fcf13e3ce..5de3f24c7260ee47c6f944ab01fd1b7e7d60be83 100644 +index dfb7b597b28b4e7b740dc4d64343e3a3a9302d88..e866ca9d5a262e0ca82f1a8d692ea858f560d379 100644 --- a/chrome/browser/signin/chrome_signin_helper.cc +++ b/chrome/browser/signin/chrome_signin_helper.cc -@@ -232,6 +232,7 @@ void ProcessMirrorHeader( +@@ -248,6 +248,7 @@ void ProcessMirrorHeader( // Do not allow non-Google origins to open incognito windows. // TODO(crbug.com/40064889): Expand this check to all Mirror headers, // regardless of `service_type`. diff --git a/patches/chrome-browser-signin-signin_promo_util.cc.patch b/patches/chrome-browser-signin-signin_promo_util.cc.patch index b1becac9401..5940f07635b 100644 --- a/patches/chrome-browser-signin-signin_promo_util.cc.patch +++ b/patches/chrome-browser-signin-signin_promo_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/signin/signin_promo_util.cc b/chrome/browser/signin/signin_promo_util.cc -index 76d991763c9a992cc1b3e2613a04f6425c0b9438..5cbbb39f79076e1426297d6b0c1f19a290058879 100644 +index 13318216f3429ec12488fbfd07ca93b0b27a73d5..f7fffaf509ae5f1e305923c2482c27fb1fa724c1 100644 --- a/chrome/browser/signin/signin_promo_util.cc +++ b/chrome/browser/signin/signin_promo_util.cc @@ -377,6 +377,7 @@ bool ShouldShowPromoBasedOnImpressionOrDismissalCount(Profile& profile, diff --git a/patches/chrome-browser-ssl-https_upgrades_util.cc.patch b/patches/chrome-browser-ssl-https_upgrades_util.cc.patch index 6e8c08fb383..08562e860b0 100644 --- a/patches/chrome-browser-ssl-https_upgrades_util.cc.patch +++ b/patches/chrome-browser-ssl-https_upgrades_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ssl/https_upgrades_util.cc b/chrome/browser/ssl/https_upgrades_util.cc -index 330ce07feb36770d4604155266b375794c836ad0..92e98c0f61aea89279815e80b58fd438bffecca2 100644 +index ee5c21622922f5033688f91a4bf4844580f36322..71fd6b1072f06c0b3f0cbdfac06db0c18b057d27 100644 --- a/chrome/browser/ssl/https_upgrades_util.cc +++ b/chrome/browser/ssl/https_upgrades_util.cc -@@ -72,11 +72,11 @@ ComputeInterstitialState(content::WebContents* web_contents, const GURL& url) { +@@ -71,11 +71,11 @@ ComputeInterstitialState(content::WebContents* web_contents, const GURL& url) { security_interstitials::https_only_mode::HttpInterstitialState interstitial_state; interstitial_state.enabled_by_pref = diff --git a/patches/chrome-browser-storage_access_api-storage_access_grant_permission_context.cc.patch b/patches/chrome-browser-storage_access_api-storage_access_grant_permission_context.cc.patch index 3b45ac7386e..0912975b81c 100644 --- a/patches/chrome-browser-storage_access_api-storage_access_grant_permission_context.cc.patch +++ b/patches/chrome-browser-storage_access_api-storage_access_grant_permission_context.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc -index 266a4356fa947a89ac0b82f1cb0b890418e2727a..2541305a07c9a14782b2e0a2bcec6f1dc3eaac8a 100644 +index db1734d92f89712ca74d388a7778a15ef66f9d19..371ceafd5dfaa78ebab36fc75e16514c0386de53 100644 --- a/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc +++ b/chrome/browser/storage_access_api/storage_access_grant_permission_context.cc -@@ -498,6 +498,7 @@ void StorageAccessGrantPermissionContext::CheckForAutoGrantOrAutoDenial( +@@ -477,6 +477,7 @@ void StorageAccessGrantPermissionContext::CheckForAutoGrantOrAutoDenial( break; } } diff --git a/patches/chrome-browser-sync-sync_service_factory.cc.patch b/patches/chrome-browser-sync-sync_service_factory.cc.patch index df1c79760c1..856fa9a9d0f 100644 --- a/patches/chrome-browser-sync-sync_service_factory.cc.patch +++ b/patches/chrome-browser-sync-sync_service_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/sync/sync_service_factory.cc b/chrome/browser/sync/sync_service_factory.cc -index dcefb4f3d8b379ed82a8750a9fb5a0252612b894..489ba451c808d4e3f5f23ec17db78c3f4d2572f0 100644 +index c75419f5d4310f05c0bf272f011febbddae808ad..a10984d02e2f36920b3806fbe5952f076e95f8f9 100644 --- a/chrome/browser/sync/sync_service_factory.cc +++ b/chrome/browser/sync/sync_service_factory.cc -@@ -438,7 +438,7 @@ std::unique_ptr BuildSyncService( +@@ -437,7 +437,7 @@ std::unique_ptr BuildSyncService( } auto sync_service = diff --git a/patches/chrome-browser-themes-theme_service_factory.cc.patch b/patches/chrome-browser-themes-theme_service_factory.cc.patch index dc208520406..658a3104390 100644 --- a/patches/chrome-browser-themes-theme_service_factory.cc.patch +++ b/patches/chrome-browser-themes-theme_service_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/themes/theme_service_factory.cc b/chrome/browser/themes/theme_service_factory.cc -index c733ac3f31c16c0ba52bee5fb52819fe4c936aaa..de8ae8ec731af0aa1bbe1ab3e1093e9d09ab774c 100644 +index e20727241ec2ff59adc1cbb12c02227aa1e0aa06..da899f7642c60a79ae3b9ded408f3e9b4c5741d3 100644 --- a/chrome/browser/themes/theme_service_factory.cc +++ b/chrome/browser/themes/theme_service_factory.cc -@@ -97,6 +97,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; +@@ -98,6 +98,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; std::unique_ptr ThemeServiceFactory::BuildServiceInstanceForBrowserContext( content::BrowserContext* profile) const { diff --git a/patches/chrome-browser-ui-BUILD.gn.patch b/patches/chrome-browser-ui-BUILD.gn.patch index 1e546e87aee..9bd4a0c6087 100644 --- a/patches/chrome-browser-ui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn -index 851a22b4dfdbebda14303bd08464e865aabf72c2..88e70d32dabb5735b0d738123df8ca331507274b 100644 +index dac5e9152bb28b2e3ed65e5412f9f172a9aaf3ab..833de51a8a4d9bd8fa0dcc5fa34f1931c60bff08 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -775,6 +775,7 @@ static_library("ui") { +@@ -772,6 +772,7 @@ static_library("ui") { # gets componentized. "//chrome/browser/ui/extensions:impl", ] @@ -10,7 +10,7 @@ index 851a22b4dfdbebda14303bd08464e865aabf72c2..88e70d32dabb5735b0d738123df8ca33 if (enable_vr && is_win) { deps += [ "//chrome/browser/vr:vr_base" ] -@@ -3366,7 +3367,10 @@ static_library("ui") { +@@ -3367,7 +3368,10 @@ static_library("ui") { "//chrome/updater/app/server/win:updater_legacy_idl", ] } else { @@ -22,7 +22,7 @@ index 851a22b4dfdbebda14303bd08464e865aabf72c2..88e70d32dabb5735b0d738123df8ca33 } } -@@ -5520,6 +5524,7 @@ static_library("ui_public_dependencies") { +@@ -5519,6 +5523,7 @@ static_library("ui_public_dependencies") { "//components/enterprise/buildflags", "//components/paint_preview/buildflags", "//components/safe_browsing:buildflags", @@ -30,7 +30,7 @@ index 851a22b4dfdbebda14303bd08464e865aabf72c2..88e70d32dabb5735b0d738123df8ca33 "//components/segmentation_platform/public", "//components/sync", "//components/sync_user_events", -@@ -5531,6 +5536,7 @@ static_library("ui_public_dependencies") { +@@ -5530,6 +5535,7 @@ static_library("ui_public_dependencies") { if (enable_extensions_core) { public_deps += [ "//extensions/browser" ] } @@ -38,7 +38,7 @@ index 851a22b4dfdbebda14303bd08464e865aabf72c2..88e70d32dabb5735b0d738123df8ca33 if (!is_android) { public_deps += [ "//build:branding_buildflags", -@@ -5655,6 +5661,7 @@ source_set("browser_navigator_params_headers") { +@@ -5670,6 +5676,7 @@ source_set("browser_navigator_params_headers") { "//url", ] deps = [] diff --git a/patches/chrome-browser-ui-actions-chrome_action_id.h.patch b/patches/chrome-browser-ui-actions-chrome_action_id.h.patch index 5dba9a2c044..ef0a73b88b7 100644 --- a/patches/chrome-browser-ui-actions-chrome_action_id.h.patch +++ b/patches/chrome-browser-ui-actions-chrome_action_id.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/actions/chrome_action_id.h b/chrome/browser/ui/actions/chrome_action_id.h -index 0c2d565adb0ab25b237163961215535c748431fd..06f52abf21c808d8a7ca17ef87a431f044aedb3f 100644 +index faf125bfd6439aa0e4add87c965d5f970d848432..87c3cdd66981596d394fa07c5b36d30e81162844 100644 --- a/chrome/browser/ui/actions/chrome_action_id.h +++ b/chrome/browser/ui/actions/chrome_action_id.h -@@ -553,6 +553,7 @@ +@@ -554,6 +554,7 @@ /* Side Panel items */ \ E(kActionSidePanelShowAboutThisSite) \ E(kActionSidePanelShowAssistant) \ diff --git a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch index 2ab034ca8cf..a652f8e8ff4 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/BUILD.gn b/chrome/browser/ui/android/appmenu/internal/BUILD.gn -index 1ad886bf472a66697287a3d66b3fe14fd0d9a15f..daf3c0f3b6d29892db5ae42908cdaf057a468c7f 100644 +index 6912b8350e11908daa03dfb46b8182116a419b67..1ae9428477ab08ee71a57abb1e0e7fb1f7ed995d 100644 --- a/chrome/browser/ui/android/appmenu/internal/BUILD.gn +++ b/chrome/browser/ui/android/appmenu/internal/BUILD.gn @@ -22,6 +22,7 @@ android_library("java") { diff --git a/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch b/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch index 749cf6deace..e25d5dec85d 100644 --- a/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch +++ b/patches/chrome-browser-ui-android-omnibox-java-res-layout-url_action_container.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml -index 1b9777d2d65f64d64fa392ede02218acfa6dcc68..cefad80327c18c93e00bacd9cc4896fc2134c752 100644 +index 4ee0f59a9e23733351e19e354924f14534eaabce..8919708878ec23d0bed05a42135dc37fb539f92c 100644 --- a/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml +++ b/chrome/browser/ui/android/omnibox/java/res/layout/url_action_container.xml -@@ -46,6 +46,7 @@ found in the LICENSE file. +@@ -57,6 +57,7 @@ found in the LICENSE file. app:layout_constraintTop_toBottomOf="@id/location_bar_attachments" app:layout_constraintEnd_toStartOf="@id/margin_spacer"/> @@ -10,7 +10,7 @@ index 1b9777d2d65f64d64fa392ede02218acfa6dcc68..cefad80327c18c93e00bacd9cc4896fc -@@ -80,7 +81,7 @@ found in the LICENSE file. +@@ -91,7 +92,7 @@ found in the LICENSE file. android:contentDescription="@string/accessibility_toolbar_btn_delete_url" android:tooltipText="@string/accessibility_toolbar_btn_delete_url" app:layout_constraintTop_toBottomOf="@id/location_bar_attachments" diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index af588410dd6..24e45e69ea9 100644 --- a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch +++ b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn -index 05fd645a802ad73f65457f03488b49ee48d3eddc..67d5a18760848a5e59f89b97fa69f165acc218e7 100644 +index 3808e0d4ae7927ddc5c5ae104708a3097308b49b..fa2a9f4641a10c49b4a5ba2a8420338be7f15b43 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -141,6 +141,7 @@ android_library("java") { +@@ -146,6 +146,7 @@ android_library("core_java") { "java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/HeightTransitionHandler.java", "java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java", ] @@ -10,7 +10,7 @@ index 05fd645a802ad73f65457f03488b49ee48d3eddc..67d5a18760848a5e59f89b97fa69f165 deps = [ ":java_resources", -@@ -372,6 +373,7 @@ android_resources("java_resources") { +@@ -354,6 +355,7 @@ android_resources("java_resources") { "//components/browser_ui/styles/android:java_resources", "//ui/android:ui_java_resources", ] diff --git a/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch index 6c17164cbf7..ffda299e90d 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_tablet.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml -index a97c0048f5a0dd25c497f150b4fcb58167125c4f..595b0b303fb16fec5514f47960f782de9fbf8586 100644 +index 1cccb68181828003d6b99ae39c531513bb5ae4b5..aa0586dd47d8be0ae5a10b33888c702da5f1046c 100644 --- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml +++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_tablet.xml -@@ -71,6 +71,7 @@ found in the LICENSE file. +@@ -78,6 +78,7 @@ found in the LICENSE file. android:background="@drawable/modern_toolbar_tablet_text_box_background" android:paddingEnd="@dimen/location_bar_end_padding" android:clipToPadding="false" /> diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch index e1433b522fb..722b3786e2c 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarPhone.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -index 288a1e7f6d29e68fb23b4c99991f0f90f3e5e295..a7bae220a2a3bbbed20db8f0e4ce66470033ffb1 100644 +index 3710bd58f1303fd863e040fbd78e9dce6c982dff..bab8b2407be8466a711b5bb52543bda3b091b85d 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarPhone.java -@@ -591,6 +591,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -585,6 +585,7 @@ public class ToolbarPhone extends ToolbarLayout if (mOptionalButtonCoordinator != null) { mOptionalButtonCoordinator.setBackgroundColorFilter(color); } @@ -10,7 +10,7 @@ index 288a1e7f6d29e68fb23b4c99991f0f90f3e5e295..a7bae220a2a3bbbed20db8f0e4ce6647 } private void updateModernLocationBarCorners() { -@@ -1255,6 +1256,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -1259,6 +1260,7 @@ public class ToolbarPhone extends ToolbarLayout * Tab Page. */ private void updateLocationBarLayoutForExpansionAnimation() { @@ -18,7 +18,7 @@ index 288a1e7f6d29e68fb23b4c99991f0f90f3e5e295..a7bae220a2a3bbbed20db8f0e4ce6647 TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation"); if (isInTabSwitcherMode()) return; -@@ -1657,6 +1659,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -1661,6 +1663,7 @@ public class ToolbarPhone extends ToolbarLayout canvas.restore(); } @@ -26,7 +26,7 @@ index 288a1e7f6d29e68fb23b4c99991f0f90f3e5e295..a7bae220a2a3bbbed20db8f0e4ce6647 // Draw the tab stack button and associated text if necessary. if (getTabSwitcherButtonCoordinator() != null && mUrlExpansionFraction != 1f) { // Draw the tab stack button image. -@@ -2021,6 +2024,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -2025,6 +2028,7 @@ public class ToolbarPhone extends ToolbarLayout @Override public void onHomeButtonIsEnabledUpdate(boolean homeButtonEnabled) { mIsHomeButtonEnabled = homeButtonEnabled; @@ -34,7 +34,7 @@ index 288a1e7f6d29e68fb23b4c99991f0f90f3e5e295..a7bae220a2a3bbbed20db8f0e4ce6647 updateButtonVisibility(); } -@@ -2427,6 +2431,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -2431,6 +2435,7 @@ public class ToolbarPhone extends ToolbarLayout } else { populateUrlClearExpansionAnimatorSet(animators); } diff --git a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch index 143ff54628f..6b94cfae618 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-src-org-chromium-chrome-browser-toolbar-top-ToolbarTablet.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -index 9b597b55399404e13cd2dbca36e084ec578e3c2b..ff808d8bbc5f4e03f9af4d8ea926f0c2dd3544a3 100644 +index 31e47d759a66b2dda7e9f7885de02bb09ddbf814..21a10d0bc27b55d399751805d29f3fefc6b306f4 100644 --- a/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java +++ b/chrome/browser/ui/android/toolbar/java/src/org/chromium/chrome/browser/toolbar/top/ToolbarTablet.java -@@ -270,6 +270,7 @@ public class ToolbarTablet extends ToolbarLayout { +@@ -286,6 +286,7 @@ public class ToolbarTablet extends ToolbarLayout { mLocationBar.getTabletCoordinator().tintBackground(textBoxColor); mLocationBar.updateVisualsForState(); setToolbarHairlineColor(color); diff --git a/patches/chrome-browser-ui-browser.cc.patch b/patches/chrome-browser-ui-browser.cc.patch index 4dff9267826..b97e64a2dfb 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index 8d8c63242dc131a9d43c26292b60c09c7367555a..a30a5a991a8b5669c4a4f91caf00411fa13d3c75 100644 +index ca32d6faace3a9cd5f189626310a10fdf3fd87a2..1ab3833ce39dcafc5833ffec64f76fa0ab3189f7 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc -@@ -555,7 +555,7 @@ Browser* Browser::Create(const CreateParams& params) { +@@ -544,7 +544,7 @@ Browser* Browser::Create(const CreateParams& params) { // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628. CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -11,7 +11,7 @@ index 8d8c63242dc131a9d43c26292b60c09c7367555a..a30a5a991a8b5669c4a4f91caf00411f Browser* const browser_ptr = browser.get(); BrowserManagerServiceFactory::GetForProfile(params.profile) ->AddBrowser(std::move(browser)); -@@ -571,7 +571,7 @@ std::unique_ptr Browser::DeprecatedCreateOwnedForTesting( +@@ -560,7 +560,7 @@ std::unique_ptr Browser::DeprecatedCreateOwnedForTesting( // should handle this; see e.g. crbug.com/1141608 and crbug.com/1261628. CHECK_EQ(CreationStatus::kOk, GetCreationStatusForProfile(params.profile)); @@ -20,7 +20,7 @@ index 8d8c63242dc131a9d43c26292b60c09c7367555a..a30a5a991a8b5669c4a4f91caf00411f BrowserManagerServiceFactory::GetForProfile(params.profile) ->AddBrowserForTesting(browser.get()); return browser; -@@ -584,7 +584,7 @@ Browser::Browser(const CreateParams& params) +@@ -573,7 +573,7 @@ Browser::Browser(const CreateParams& params) window_(nullptr), tab_strip_model_delegate_( std::make_unique(this)), @@ -29,7 +29,7 @@ index 8d8c63242dc131a9d43c26292b60c09c7367555a..a30a5a991a8b5669c4a4f91caf00411f tab_strip_model_delegate_.get(), params.profile, // Tab groups are disabled for app browsers. -@@ -1349,6 +1349,7 @@ void Browser::OnWindowClosing() { +@@ -1321,6 +1321,7 @@ void Browser::OnWindowClosing() { if (tab_restore_service && notify_restore_service) { tab_restore_service->BrowserClosing(GetFeatures().live_tab_context()); } diff --git a/patches/chrome-browser-ui-browser_commands.cc.patch b/patches/chrome-browser-ui-browser_commands.cc.patch index 91668a37927..9644c5f188f 100644 --- a/patches/chrome-browser-ui-browser_commands.cc.patch +++ b/patches/chrome-browser-ui-browser_commands.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc -index 43e2b81f9903ff4ea44c9fa9307b628071bdd1c3..f88cd1245c8b55f8217264e2cc9cb29da5f6c005 100644 +index 3f477375e099dfb2f60c035b34318a593f7eaf5f..5a58254cafb2185f4f0f7042accd2733434e681f 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc -@@ -1187,6 +1187,7 @@ void CloseTab(BrowserWindowInterface* browser) { +@@ -1159,6 +1159,7 @@ void CloseTab(BrowserWindowInterface* browser) { } ToastController* toast_controller = browser->GetFeatures().toast_controller(); diff --git a/patches/chrome-browser-ui-browser_navigator.cc.patch b/patches/chrome-browser-ui-browser_navigator.cc.patch index f9245b5ca72..958c8dc6c16 100644 --- a/patches/chrome-browser-ui-browser_navigator.cc.patch +++ b/patches/chrome-browser-ui-browser_navigator.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc -index 090c52c00dcf445b638e0041f0c355fc17d79a57..728331db18da482b9d0f4b3adf78f5e108285b1b 100644 +index b5c2da1226eaef4c5aa7a60cd8ba3ff0e3f46a44..c4fdcc07ac06b9c6871e0d4f4cd10f5ef431642c 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc -@@ -557,6 +557,7 @@ base::WeakPtr Navigate(NavigateParams* params) { +@@ -559,6 +559,7 @@ base::WeakPtr Navigate(NavigateParams* params) { return nullptr; } } diff --git a/patches/chrome-browser-ui-browser_ui_prefs.cc.patch b/patches/chrome-browser-ui-browser_ui_prefs.cc.patch index c877e10a72a..2d1c7cc4640 100644 --- a/patches/chrome-browser-ui-browser_ui_prefs.cc.patch +++ b/patches/chrome-browser-ui-browser_ui_prefs.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc -index e94568b1c754238ed2190174b5b0f5cce4f7f84b..8e77bb29873aded4893739821b9e59676ca6879d 100644 +index 837e75e79bac19250455c0c995e96a55ce4cdeb8..d882a46512cddbecf5a22e43cce1c2ceb8c35a8d 100644 --- a/chrome/browser/ui/browser_ui_prefs.cc +++ b/chrome/browser/ui/browser_ui_prefs.cc @@ -130,7 +130,7 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) { diff --git a/patches/chrome-browser-ui-browser_window-BUILD.gn.patch b/patches/chrome-browser-ui-browser_window-BUILD.gn.patch index c677f3df2e4..1a1087f5ed0 100644 --- a/patches/chrome-browser-ui-browser_window-BUILD.gn.patch +++ b/patches/chrome-browser-ui-browser_window-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_window/BUILD.gn b/chrome/browser/ui/browser_window/BUILD.gn -index b5678cdd869df5cdc03b2831454737fed14b98c3..2cca263624d655dcab3172003f7a44faa0a4facd 100644 +index 1a64c7b6ff3c7dec0bc652e994e89d8523b70ba3..d60b5a3adc26c4e19403d40644226e82f68ebff9 100644 --- a/chrome/browser/ui/browser_window/BUILD.gn +++ b/chrome/browser/ui/browser_window/BUILD.gn -@@ -33,6 +33,7 @@ source_set("browser_window") { +@@ -34,6 +34,7 @@ source_set("browser_window") { "//ui/base:types", ] } diff --git a/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch b/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch index f66faa857f6..c52280f26b3 100644 --- a/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch +++ b/patches/chrome-browser-ui-browser_window-internal-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_window/internal/BUILD.gn b/chrome/browser/ui/browser_window/internal/BUILD.gn -index 9c7bdd671ba932efa105a8a9a8c7282d9829ae8f..bd2e3752b1587e78e88af9e73f2df2782952a031 100644 +index 76f31dc6de99c928919f8702c20bd9bb9094fffa..d5b0f4cff2ca3e26714bda1b58ba68caffa47f6d 100644 --- a/chrome/browser/ui/browser_window/internal/BUILD.gn +++ b/chrome/browser/ui/browser_window/internal/BUILD.gn -@@ -126,6 +126,7 @@ source_set("internal") { +@@ -141,6 +141,7 @@ source_set("internal") { deps += [ "//chrome/browser/ui:overscroll_pref_manager" ] } } diff --git a/patches/chrome-browser-ui-browser_window-public-browser_window_features.h.patch b/patches/chrome-browser-ui-browser_window-public-browser_window_features.h.patch index acb2ad4ad61..1aba20df579 100644 --- a/patches/chrome-browser-ui-browser_window-public-browser_window_features.h.patch +++ b/patches/chrome-browser-ui-browser_window-public-browser_window_features.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/browser_window/public/browser_window_features.h b/chrome/browser/ui/browser_window/public/browser_window_features.h -index 46dc20753de4bcf25eb31099e284d5c71b4dc8f0..520e1d2153ea5e9beab616f3b006a33bb5ab05ae 100644 +index 7e7d6be3f3a7d0baa25820a2a0b14471b68af192..7ff21e5fd2460215e4c621230a17e4c6b9d1912c 100644 --- a/chrome/browser/ui/browser_window/public/browser_window_features.h +++ b/chrome/browser/ui/browser_window/public/browser_window_features.h -@@ -216,7 +216,7 @@ class OmniboxPopupCloser; +@@ -227,7 +227,7 @@ class SkillsUiWindowController; class BrowserWindowFeatures { public: BrowserWindowFeatures(); diff --git a/patches/chrome-browser-ui-chrome_pages.cc.patch b/patches/chrome-browser-ui-chrome_pages.cc.patch index 8ae680f6cb4..fea9d14df41 100644 --- a/patches/chrome-browser-ui-chrome_pages.cc.patch +++ b/patches/chrome-browser-ui-chrome_pages.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc -index 6b1f7bc1be5f15686901442a7a53e145739bcc36..ea191aabffc48fa20a6bc474567947503a5c8a36 100644 +index d55eb8f03c8fd475ed887ff39d5bae08a950ba21..200372820c736c978e0f9654692bbf73607f752c 100644 --- a/chrome/browser/ui/chrome_pages.cc +++ b/chrome/browser/ui/chrome_pages.cc -@@ -439,7 +439,7 @@ void ShowSlow(Browser* browser) { +@@ -436,7 +436,7 @@ void ShowSlow(Browser* browser) { #endif } diff --git a/patches/chrome-browser-ui-messages-android-BUILD.gn.patch b/patches/chrome-browser-ui-messages-android-BUILD.gn.patch index b4d822c7217..f7585cabbb9 100644 --- a/patches/chrome-browser-ui-messages-android-BUILD.gn.patch +++ b/patches/chrome-browser-ui-messages-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/messages/android/BUILD.gn b/chrome/browser/ui/messages/android/BUILD.gn -index 976eddf05dc43002e0bf5eb1b7f13e43ce7e2308..78eb9357339ea173f5bcd55b5b299ca72256d66c 100644 +index c9db8afb7c0ec55c954e7d8e12074549463b73b9..fd6d2214b1da276d6eb2d2e221ae902533f241c7 100644 --- a/chrome/browser/ui/messages/android/BUILD.gn +++ b/chrome/browser/ui/messages/android/BUILD.gn -@@ -33,6 +33,7 @@ android_library("java") { +@@ -34,6 +34,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarView.java", ] diff --git a/patches/chrome-browser-ui-messages-android-java-src-org-chromium-chrome-browser-ui-messages-snackbar-SnackbarManager.java.patch b/patches/chrome-browser-ui-messages-android-java-src-org-chromium-chrome-browser-ui-messages-snackbar-SnackbarManager.java.patch index 5e339ef2940..ea49ef6dd45 100644 --- a/patches/chrome-browser-ui-messages-android-java-src-org-chromium-chrome-browser-ui-messages-snackbar-SnackbarManager.java.patch +++ b/patches/chrome-browser-ui-messages-android-java-src-org-chromium-chrome-browser-ui-messages-snackbar-SnackbarManager.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java -index bad6a3ae6a99457cb6f435eaab4df0337285328f..9a3dd86937e79c5554816df902fa0443db6086d7 100644 +index f6df6411a4e3262f5732885f7bd6eecdae20387d..4f8fb59f2019742739b78a0329e9697bcb160aaa 100644 --- a/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java +++ b/chrome/browser/ui/messages/android/java/src/org/chromium/chrome/browser/ui/messages/snackbar/SnackbarManager.java -@@ -338,7 +338,7 @@ public class SnackbarManager +@@ -400,7 +400,7 @@ public class SnackbarManager boolean viewChanged = true; if (mView == null) { mView = diff --git a/patches/chrome-browser-ui-omnibox-omnibox_edit_model.cc.patch b/patches/chrome-browser-ui-omnibox-omnibox_edit_model.cc.patch index 0a658d5cd74..0dd34a29c71 100644 --- a/patches/chrome-browser-ui-omnibox-omnibox_edit_model.cc.patch +++ b/patches/chrome-browser-ui-omnibox-omnibox_edit_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc -index bbedc6b9dcfd71fd26fecf6597a3df994b8b63aa..ad1a73db721780d085511c99e05eea4f1389ab14 100644 +index 80ba372967e3520c06ccc4c34880d9fd0d507036..e0ee6c55dd96ec419c8be94f1fce42732bd300ec 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc -@@ -668,6 +668,7 @@ void OmniboxEditModel::StartAutocomplete(bool has_selected_text, +@@ -669,6 +669,7 @@ void OmniboxEditModel::StartAutocomplete(bool has_selected_text, input_.set_lens_overlay_suggest_inputs(*suggest_inputs); } diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index de4d4f39f6d..a1b8a521888 100644 --- a/patches/chrome-browser-ui-tab_helpers.cc.patch +++ b/patches/chrome-browser-ui-tab_helpers.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc -index 562d5196b37ba8257e50f4165d37533d42fad315..57039dd4b429d032ff6fa345bce09e2e4c3bf7f7 100644 +index 3eef54036784743b2e764ea1763905396e28387a..f30417fd64a55f593959e04e706c720c23b74bf7 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -803,4 +803,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -796,4 +796,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { // This is common code for all of us. PLEASE DO YOUR PART to keep it tidy and // organized. diff --git a/patches/chrome-browser-ui-tabs-public-tab_features.h.patch b/patches/chrome-browser-ui-tabs-public-tab_features.h.patch index 818c30d51b5..9f351f59670 100644 --- a/patches/chrome-browser-ui-tabs-public-tab_features.h.patch +++ b/patches/chrome-browser-ui-tabs-public-tab_features.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/public/tab_features.h b/chrome/browser/ui/tabs/public/tab_features.h -index 06ee4fe09ab6e11ef5771b52159ad8831ecb3eed..f57ee834ad3de522c2f474d2582d72fc10b3eb60 100644 +index f1220cd85bc91782a1a5adcfcfbaef350b5a10a1..59aff2e2ea6f87fc40d7dcac8b98fa0db51af09d 100644 --- a/chrome/browser/ui/tabs/public/tab_features.h +++ b/chrome/browser/ui/tabs/public/tab_features.h -@@ -155,7 +155,7 @@ class TabCreationMetricsController; +@@ -177,7 +177,7 @@ class TabInterface; class TabFeatures { public: TabFeatures(); diff --git a/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model.cc.patch b/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model.cc.patch index 0e886fb5d78..c8933c236b3 100644 --- a/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model.cc.patch +++ b/patches/chrome-browser-ui-tabs-recent_tabs_sub_menu_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc -index 0099aba7e3000c68ce1c556ea2bc6b68872ab85c..f411eb4d0fc3aa0043e5e692ad2b33a534003d9e 100644 +index 09d9cf4829384ec599049658cfb67565274cb970..2ea7efd64b40d858ac9cd04f86831e0a7e22e834 100644 --- a/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc +++ b/chrome/browser/ui/tabs/recent_tabs_sub_menu_model.cc -@@ -519,6 +519,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { +@@ -520,6 +520,7 @@ void RecentTabsSubMenuModel::BuildTabsFromOtherDevices() { DCHECK(!session->GetSessionName().empty()); std::unique_ptr device_menu_model = CreateOtherDeviceSubMenu(session, tabs_in_session); diff --git a/patches/chrome-browser-ui-tabs-tab_model.cc.patch b/patches/chrome-browser-ui-tabs-tab_model.cc.patch index cf3092dca02..89cb167370c 100644 --- a/patches/chrome-browser-ui-tabs-tab_model.cc.patch +++ b/patches/chrome-browser-ui-tabs-tab_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/tab_model.cc b/chrome/browser/ui/tabs/tab_model.cc -index 33d4c5ef97089aca8eb27aafe98bea941b4a4996..d84ff18cd4c667432c9f383fee8845e3d7883113 100644 +index 6283f2549826f5f333d280dab1c3d02ce0ae2973..006a08acdc20a6501d3bbb5f11033da6a85d6b70 100644 --- a/chrome/browser/ui/tabs/tab_model.cc +++ b/chrome/browser/ui/tabs/tab_model.cc -@@ -80,7 +80,7 @@ TabModel::TabModel(std::unique_ptr contents, +@@ -56,7 +56,7 @@ TabModel::TabModel(std::unique_ptr contents, // TODO(https://crbug.com/362038317): Tab-helpers should be created in exactly // one place, which is here. TabHelpers::AttachTabHelpers(contents_); diff --git a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch index 54ce544b88c..597701e8fa8 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_model.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h -index 641b3015ba76e23627a5cb6e08c2ee34443dc3eb..f0ed1d1013c447d4898e5373493370456ba32ba9 100644 +index f7dd86abd83e01f2567b3a3354a7987c50a3e4a4..bda7af9bf9271d38b154e134624bb3df9817d04c 100644 --- a/chrome/browser/ui/tabs/tab_strip_model.h +++ b/chrome/browser/ui/tabs/tab_strip_model.h -@@ -211,6 +211,7 @@ class TabStripModel { +@@ -212,6 +212,7 @@ class TabStripModel { TabStripModel(const TabStripModel&) = delete; TabStripModel& operator=(const TabStripModel&) = delete; diff --git a/patches/chrome-browser-ui-tabs-tab_strip_prefs.cc.patch b/patches/chrome-browser-ui-tabs-tab_strip_prefs.cc.patch index 25b49c34107..b03265e6b80 100644 --- a/patches/chrome-browser-ui-tabs-tab_strip_prefs.cc.patch +++ b/patches/chrome-browser-ui-tabs-tab_strip_prefs.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/tabs/tab_strip_prefs.cc b/chrome/browser/ui/tabs/tab_strip_prefs.cc -index df9da41576c52b30f58624e2748afa1c241820e0..9534b0870cb6e793efd86e9463f97b7d51fb9a7c 100644 +index 09bd26bf7c26a84ad9b1e766dfd15fdbf2b4285c..f29bb60426378b420b07e9d6f95f85274bdaa8fa 100644 --- a/chrome/browser/ui/tabs/tab_strip_prefs.cc +++ b/chrome/browser/ui/tabs/tab_strip_prefs.cc @@ -20,6 +20,7 @@ std::optional g_tab_search_trailing_tabstrip_at_startup = std::nullopt; diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index 700b5c301c9..a8c9f013eb9 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -index df68a7afcbf9796f15de2f385fac256c40f58956..068a76a148a28068f672f01f93a6c7b397061f80 100644 +index 0aa98f687c0fdc6b0b5cf5bf46fd18f7c4039c53..81152b1dc7f76b4484b3bc97f7cf9225430adbee 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -892,6 +892,7 @@ void BookmarkBarView::Layout(PassKey) { +@@ -894,6 +894,7 @@ void BookmarkBarView::Layout(PassKey) { x = next_x; } } diff --git a/patches/chrome-browser-ui-views-extensions-extensions_menu_delegate_desktop.cc.patch b/patches/chrome-browser-ui-views-extensions-extensions_menu_delegate_desktop.cc.patch index 32408508e54..e78b34816c1 100644 --- a/patches/chrome-browser-ui-views-extensions-extensions_menu_delegate_desktop.cc.patch +++ b/patches/chrome-browser-ui-views-extensions-extensions_menu_delegate_desktop.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/extensions/extensions_menu_delegate_desktop.cc b/chrome/browser/ui/views/extensions/extensions_menu_delegate_desktop.cc -index 2f0b532246d50b26d6a6f95b3d24b0ef61062a04..bebf94015e7e8571ca85ea67af7c9e66f2eb7788 100644 +index b9a8d967d1d56c4aff8edc00fa7ca6e9774e1d1b..da76645e5edb10d6857c9730d85b4e740d8ed3a8 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_delegate_desktop.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_delegate_desktop.cc -@@ -315,6 +315,7 @@ void ExtensionsMenuDelegateDesktop::OnUserPermissionsSettingsChanged() { +@@ -359,6 +359,7 @@ void ExtensionsMenuDelegateDesktop::OnUserPermissionsSettingsChanged() { } void ExtensionsMenuDelegateDesktop::OpenMainPage() { diff --git a/patches/chrome-browser-ui-views-extensions-extensions_menu_main_page_view.cc.patch b/patches/chrome-browser-ui-views-extensions-extensions_menu_main_page_view.cc.patch index 2f29cbe7069..c60e368849b 100644 --- a/patches/chrome-browser-ui-views-extensions-extensions_menu_main_page_view.cc.patch +++ b/patches/chrome-browser-ui-views-extensions-extensions_menu_main_page_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc b/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc -index dc54f0319c9754a20b40dfe565deaf23831b2262..c74071dba8de11c87cd52c1fb3a847113f24bf79 100644 +index 08a986e57fbe38d12570715cf3cf2e92a375e4e3..8b242d39e96070d9c4621d7b84c0a5e85420766e 100644 --- a/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc +++ b/chrome/browser/ui/views/extensions/extensions_menu_main_page_view.cc -@@ -189,6 +189,7 @@ void ExtensionsMenuMainPageView::CreateAndInsertMenuEntry( +@@ -199,6 +199,7 @@ void ExtensionsMenuMainPageView::CreateAndInsertMenuEntry( ExtensionsMenuViewModel::MenuEntryState entry_state, int index) { auto extension_id = action_model->GetId(); diff --git a/patches/chrome-browser-ui-views-frame-browser_view.cc.patch b/patches/chrome-browser-ui-views-frame-browser_view.cc.patch index 00a9fa080c4..6eb4c6a49c9 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view.cc.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc -index 1596366892e11ff1d48cf0984d36adf15ffd9ac5..bc27b2f358114f32118354d504dc209dd6197911 100644 +index a29e3f73ef39bf2998b1fce9edc42b0f1290fcd4..8e74cee2611836c1e4781b9e1829a64475adcf9d 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc -@@ -615,6 +615,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) { +@@ -629,6 +629,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) { DCHECK(src); DCHECK(dst); DCHECK(point); @@ -10,7 +10,7 @@ index 1596366892e11ff1d48cf0984d36adf15ffd9ac5..bc27b2f358114f32118354d504dc209d views::View::ConvertPointToTarget(src, dst, point); return dst->HitTestPoint(*point); } -@@ -1843,6 +1844,7 @@ void BrowserView::OnActiveTabChanged(content::WebContents* old_contents, +@@ -1933,6 +1934,7 @@ void BrowserView::OnActiveTabChanged(content::WebContents* old_contents, !browser_->tab_strip_model()->closing_all() && GetWidget()->IsActive() && GetWidget()->IsVisible() && !tab_change_in_split_view; #endif diff --git a/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.h.patch b/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.h.patch index 8daa5f4cacf..3a851427767 100644 --- a/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.h.patch +++ b/patches/chrome-browser-ui-views-frame-horizontal_tab_strip_region_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.h b/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.h -index cac14d659f786ba7ad20ef7d3c72698b97e270d1..1126e6a13239ed3a21fb94e10e32f21203848e64 100644 +index dc7ac8a7a850cb675ba82eeceef79acd3240a342..302b1d79d1c9de96b4e0697aa7764a9abb75179c 100644 --- a/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.h +++ b/chrome/browser/ui/views/frame/horizontal_tab_strip_region_view.h -@@ -29,7 +29,7 @@ class TabSearchPositionMetricsLogger; +@@ -33,7 +33,7 @@ class TabStripControlButton; // Container for the tabstrip and the other views sharing space with it - // with the exception of the caption buttons. diff --git a/patches/chrome-browser-ui-views-frame-multi_contents_view.cc.patch b/patches/chrome-browser-ui-views-frame-multi_contents_view.cc.patch index 036d79f802c..66f01ae01d4 100644 --- a/patches/chrome-browser-ui-views-frame-multi_contents_view.cc.patch +++ b/patches/chrome-browser-ui-views-frame-multi_contents_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/frame/multi_contents_view.cc b/chrome/browser/ui/views/frame/multi_contents_view.cc -index 6903a80bfc8e98477ec750803d6bf3bb51be63b7..a8b98d6694cc5a228a50b934f11ce930fe18957b 100644 +index aaec9ccc448c92fc1d951e5eccec29134e70aa1d..729960492966b7606b5f5d4644e5611a4b11dae2 100644 --- a/chrome/browser/ui/views/frame/multi_contents_view.cc +++ b/chrome/browser/ui/views/frame/multi_contents_view.cc -@@ -75,7 +75,7 @@ MultiContentsView::MultiContentsView( +@@ -78,7 +78,7 @@ MultiContentsView::MultiContentsView( AddChildView(std::make_unique(browser_view)); contents_container_views_.push_back( @@ -11,7 +11,7 @@ index 6903a80bfc8e98477ec750803d6bf3bb51be63b7..a8b98d6694cc5a228a50b934f11ce930 contents_container_views_[0] ->contents_view() ->set_is_primary_web_contents_for_window(true); -@@ -84,7 +84,7 @@ MultiContentsView::MultiContentsView( +@@ -87,7 +87,7 @@ MultiContentsView::MultiContentsView( resize_area_->SetVisible(false); contents_container_views_.push_back( diff --git a/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch index d88a8853e10..7c38b280c84 100644 --- a/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-icon_label_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc -index 0585acc5fc2d8497f2e6a057412a1133781774a3..c99f71fb298403909e973d7bcc7122c84f3ec2e8 100644 +index a5c48e669dbf2f16648536bc4ccf47ecefd04f44..8c9983248602e46b0aea7a2358ce8eccf8adb54d 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc -@@ -827,6 +827,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const { +@@ -826,6 +826,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const { {radii.lower_right(), radii.lower_right()}, {radii.lower_left(), radii.lower_left()}}; diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch index 69c9f021f19..a6fe65efbc6 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index 6df107aefb0eb72096713904ace190565820a337..2aa4b7f8707ed16702e7681f16d4f4bde25c53a3 100644 +index b54a09e3b0d8b93c74166297a98010e4d7e4592e..46c71a834ffdf72d6c00c388109b850abc95693b 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -849,6 +849,7 @@ void LocationBarView::Layout(PassKey) { diff --git a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch index 452757ecaa1..05f45e15e59 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_icon_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_icon_view.cc b/chrome/browser/ui/views/location_bar/location_icon_view.cc -index d208a92039594496b7c7d229fd206c6da314fa19..57b52eb532108a912b231e0e11c7e04164f0698a 100644 +index b4b4716eb7d04f1f33fbc609a91bb66e8a55f6d8..612c7d63e17bd0b8ca88068b5b66aed0bfdce1c9 100644 --- a/chrome/browser/ui/views/location_bar/location_icon_view.cc +++ b/chrome/browser/ui/views/location_bar/location_icon_view.cc -@@ -341,6 +341,7 @@ void LocationIconView::UpdateBackground() { +@@ -347,6 +347,7 @@ void LocationIconView::UpdateBackground() { SetBackgroundColor(GetColorProvider()->GetColor(id)); diff --git a/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch index 2d4c1c3be39..40321e63138 100644 --- a/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch +++ b/patches/chrome-browser-ui-views-overlay-video_overlay_window_views.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -index 8ccc5385ede42f3dd771c9fe143cf630ae0709f1..a6c29b1c9c4a5b7b2ab047dd200127fc7af997ad 100644 +index 94648718cc291dea8d5f4d7eace79c67d92bdd5f..e28b60c593f1a39e34545243a066be2079131d47 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc -@@ -353,7 +353,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( +@@ -354,7 +354,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( // constructor. It's important that the constructor be private, because it // doesn't initialize the object fully. auto overlay_window = @@ -11,7 +11,7 @@ index 8ccc5385ede42f3dd771c9fe143cf630ae0709f1..a6c29b1c9c4a5b7b2ab047dd200127fc overlay_window->SetColorModeOverride(ui::ColorProviderKey::ColorMode::kDark); -@@ -994,6 +994,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { +@@ -1004,6 +1004,7 @@ void VideoOverlayWindowViews::UpdateMaxSize(const gfx::Rect& work_area) { max_size_ = new_max_size; diff --git a/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch b/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch index feb6640b4cb..748a0194027 100644 --- a/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch +++ b/patches/chrome-browser-ui-views-permissions-permission_prompt_bubble_base_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc -index 8f3b2ecb35c41b47bec9b860fef8a496ba41c878..f8e957bc7ffe98b2bfd45b29451b0d5b9c53478c 100644 +index e0667cfefce493511aed00ec6bbc415324035f8f..7b5258e58b4b9cd6fd5b52919e3e6ff8abc9274b 100644 --- a/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc +++ b/chrome/browser/ui/views/permissions/permission_prompt_bubble_base_view.cc -@@ -161,6 +161,7 @@ void PermissionPromptBubbleBaseView::CreatePermissionButtons( +@@ -163,6 +163,7 @@ void PermissionPromptBubbleBaseView::CreatePermissionButtons( SetButtonStyle(ui::mojom::DialogButton::kOk, ui::ButtonStyle::kTonal); SetButtonStyle(ui::mojom::DialogButton::kCancel, ui::ButtonStyle::kTonal); } diff --git a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch index a307ed02522..73508316f72 100644 --- a/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch +++ b/patches/chrome-browser-ui-views-profiles-avatar_toolbar_button.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -index 40560a8f05201145e324b8bfb4533dbe561e7201..aac7ab23ecfeee162bdb4839f509be8493745151 100644 +index 341cc8bea7ae84d7eb2bebd762cd253652a89c01..474d0d0a6bbae5d5cd92477d0b90eac104861d8c 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -@@ -168,6 +168,7 @@ class AvatarToolbarButton : public ToolbarButton, +@@ -169,6 +169,7 @@ class AvatarToolbarButton : public ToolbarButton, #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) private: diff --git a/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch b/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch index 0ef6ff7f6e6..fad50091364 100644 --- a/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-send_tab_to_self-send_tab_to_self_device_picker_bubble_view.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc -index 8f7b84009386460d1f2fbc19c794f584e6d874f7..ce9203fa78fe9a2286bd0a01086a54297ae27454 100644 +index d4334bcf223efd6246d46dfc3e611e821bfb60b2..170ff8bbc930f3b5fe638de2391ff4b8df68c1ec 100644 --- a/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc +++ b/chrome/browser/ui/views/send_tab_to_self/send_tab_to_self_device_picker_bubble_view.cc @@ -127,6 +127,7 @@ void SendTabToSelfDevicePickerBubbleView::Init() { diff --git a/patches/chrome-browser-ui-views-side_panel-side_panel_entry_id.h.patch b/patches/chrome-browser-ui-views-side_panel-side_panel_entry_id.h.patch index af582e516fa..6cc30a87c65 100644 --- a/patches/chrome-browser-ui-views-side_panel-side_panel_entry_id.h.patch +++ b/patches/chrome-browser-ui-views-side_panel-side_panel_entry_id.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/side_panel/side_panel_entry_id.h b/chrome/browser/ui/views/side_panel/side_panel_entry_id.h -index 201d94283a5c0d3c51a4598830693f3ef7a9c099..2281a57d216bde32607afd0d818f294964423f3c 100644 +index 3b9183e62402dd9841f7391ffc0d2ecb040ea292..87492031d1c49750b042551c02b59d08ce3080ad 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_entry_id.h +++ b/chrome/browser/ui/views/side_panel/side_panel_entry_id.h -@@ -30,6 +30,7 @@ +@@ -31,6 +31,7 @@ V(kSideSearch, kActionSidePanelShowSideSearch, "SideSearch") \ V(kLens, kActionSidePanelShowLens, "Lens") \ V(kAssistant, kActionSidePanelShowAssistant, "Assistant") \ diff --git a/patches/chrome-browser-ui-views-tabs-dragging-tab_drag_controller.h.patch b/patches/chrome-browser-ui-views-tabs-dragging-tab_drag_controller.h.patch index 420bd792bc8..e716c1b3eb7 100644 --- a/patches/chrome-browser-ui-views-tabs-dragging-tab_drag_controller.h.patch +++ b/patches/chrome-browser-ui-views-tabs-dragging-tab_drag_controller.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h b/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h -index 9290051ae762808f557a6c57eae670f891142faa..6a3c15ae4d6a8c800d4721488fd72fe426b7ebd9 100644 +index a0d15aa1a0777306b1f02d8692bafce05c4ad12f..aa544007f56b5f29107b4f8b98a2ebfdba363b1d 100644 --- a/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h +++ b/chrome/browser/ui/views/tabs/dragging/tab_drag_controller.h @@ -133,7 +133,7 @@ class TabDragController : public views::WidgetObserver, diff --git a/patches/chrome-browser-ui-views-tabs-tab.cc.patch b/patches/chrome-browser-ui-views-tabs-tab.cc.patch index b61f80d8aa0..dd82e1537ed 100644 --- a/patches/chrome-browser-ui-views-tabs-tab.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc -index e93fd54830bd105424109e9ec1ab418c2f71305f..1811121c39b8db70029b73f34917e8bfb8194768 100644 +index e06a60bba0f89ed1a1c5897f3ec2cff37b81ff55..c00ab548d538422091f9fd4b8135d392b284f174 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc -@@ -376,6 +376,7 @@ void Tab::Layout(PassKey) { +@@ -391,6 +391,7 @@ void Tab::Layout(PassKey) { // indicator, but visually it will be smaller at kFaviconSize wide. gfx::Rect favicon_bounds(start, contents_rect.y(), 0, 0); if (showing_icon_) { @@ -10,7 +10,7 @@ index e93fd54830bd105424109e9ec1ab418c2f71305f..1811121c39b8db70029b73f34917e8bf if (center_icon_) { // When centering the favicon, the favicon is allowed to escape the normal // contents rect. -@@ -476,6 +477,7 @@ void Tab::Layout(PassKey) { +@@ -488,6 +489,7 @@ void Tab::Layout(PassKey) { int title_right = contents_rect.right(); if (showing_alert_indicator_) { title_right = alert_indicator_button_->x() - after_title_padding; @@ -18,7 +18,7 @@ index e93fd54830bd105424109e9ec1ab418c2f71305f..1811121c39b8db70029b73f34917e8bf } else if (showing_close_button_) { // Allow the title to overlay the close button's empty border padding. title_right = close_x - after_title_padding; -@@ -622,7 +624,7 @@ void Tab::OnMouseReleased(const ui::MouseEvent& event) { +@@ -634,7 +636,7 @@ void Tab::OnMouseReleased(const ui::MouseEvent& event) { // Close tab on middle click, but only if the button is released over the tab // (normal windows behavior is to discard presses of a UI element where the // releases happen off the element). diff --git a/patches/chrome-browser-ui-views-tabs-tab.h.patch b/patches/chrome-browser-ui-views-tabs-tab.h.patch index 34c28c213c1..6457f0dabf5 100644 --- a/patches/chrome-browser-ui-views-tabs-tab.h.patch +++ b/patches/chrome-browser-ui-views-tabs-tab.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h -index 2a22c08242f7e505934b8e6adcd81d9f64c24002..e3a502c17d4814f322ecea09318fca29f20c95d3 100644 +index 4aebda48a37fc766beeaa2b4cc2dbde1cb5560a0..28cc108bfd4fb02f77ce022ce3b23c0c353a8edd 100644 --- a/chrome/browser/ui/views/tabs/tab.h +++ b/chrome/browser/ui/views/tabs/tab.h -@@ -312,7 +312,7 @@ class Tab : public gfx::AnimationDelegate, +@@ -307,7 +307,7 @@ class Tab : public gfx::AnimationDelegate, // Whether we are showing the close button. It is cached so that we can // detect when it changes and layout appropriately. diff --git a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch b/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch index 8d07f184857..a0e76120f01 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_hover_card_bubble_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -index a98211fe211f888e0c95be7c719a22750bb5ba2f..b43a67c183d8982e84d0db91f64f657bb44d533a 100644 +index a2d2cda4540c5bb898231d97241bfe47ad04baa5..191442aae1cef8ae659e197f3babc5fccaa9627c 100644 --- a/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h +++ b/chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.h -@@ -95,6 +95,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { +@@ -100,6 +100,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { // available, or `std::nullopt` to disable crossfades entirely. static std::optional GetPreviewImageCrossfadeStart(); diff --git a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch index 8c4b7d1e018..15b608aadd4 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc -index 9f67abe2a84421d2cad94dc1db1666c5c391abcb..d5bb0eafb05a7aabe737c40fb8849610b6a9518d 100644 +index 5c7588e2be76fd4d023b616e720729b66a6a0495..ffccf1d7ff8457d09bc8df4f4b8b06375bc9642b 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -342,7 +342,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, @@ -11,7 +11,7 @@ index 9f67abe2a84421d2cad94dc1db1666c5c391abcb..d5bb0eafb05a7aabe737c40fb8849610 // !!! Init may delete `drag_controller_` on some platforms. !!! // Init takes capture, which on some platforms may reenter Chrome, the -@@ -582,6 +582,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -577,6 +577,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, std::vector CalculateBoundsForDraggedViews( const std::vector& views) override { @@ -19,7 +19,7 @@ index 9f67abe2a84421d2cad94dc1db1666c5c391abcb..d5bb0eafb05a7aabe737c40fb8849610 CHECK(!views.empty()) << "The views vector must not be empty."; std::vector bounds; -@@ -930,6 +931,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -925,6 +926,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, continue; } @@ -27,7 +27,7 @@ index 9f67abe2a84421d2cad94dc1db1666c5c391abcb..d5bb0eafb05a7aabe737c40fb8849610 // If there's a group header here, and we're dragging a group, we might // end up on either side of that header. Check both cases to find the // best option. -@@ -1469,7 +1471,7 @@ void TabStrip::SetSelection(const ui::ListSelectionModel& new_selection) { +@@ -1481,7 +1483,7 @@ void TabStrip::SetSelection(const ui::ListSelectionModel& new_selection) { const tab_groups::TabGroupId new_group = selected_tab->group().value(); // If the tab that is about to be selected is in a collapsed group, // automatically expand the group. diff --git a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch index dc9fb52167d..18dd1f24718 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_style_views.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_style_views.cc b/chrome/browser/ui/views/tabs/tab_style_views.cc -index aacd3e86550da8d2657b77b513c3d70ca9805c4d..2de9de9c1731062ed65fa4160f01b0e14691e9c2 100644 +index 5bf425a33e86505518beb2c8dd17587965fc616a..2fc5cbeaacafd30bc68d591b879ae50adfeb0a56 100644 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc +++ b/chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -121,6 +121,7 @@ class TabStyleViewsImpl : public TabStyleViews { +@@ -123,6 +123,7 @@ class TabStyleViewsImpl : public TabStyleViews { TabStyle::TabSelectionState GetSelectionState() const; private: @@ -10,7 +10,7 @@ index aacd3e86550da8d2657b77b513c3d70ca9805c4d..2de9de9c1731062ed65fa4160f01b0e1 // Gets the bounds for the leading and trailing separators for a tab. TabStyle::SeparatorBounds GetSeparatorBounds(float scale) const; -@@ -130,6 +131,7 @@ class TabStyleViewsImpl : public TabStyleViews { +@@ -132,6 +133,7 @@ class TabStyleViewsImpl : public TabStyleViews { TabStyle::SeparatorOpacities GetSeparatorOpacities(bool for_layout) const; // Returns whether the mouse is currently hovering this tab. @@ -18,7 +18,7 @@ index aacd3e86550da8d2657b77b513c3d70ca9805c4d..2de9de9c1731062ed65fa4160f01b0e1 bool IsHovering() const; // Returns whether the hover animation is being shown. -@@ -355,6 +357,7 @@ SkPath TabStyleViewsImpl::GetPath(TabStyle::PathType path_type, +@@ -361,6 +363,7 @@ SkPath TabStyleViewsImpl::GetPath(TabStyle::PathType path_type, extension_corner_radius -= 0.5f * stroke_adjustment; } const bool compact_left_to_bottom = ShouldCompactLeadingEdge(path_type); @@ -26,7 +26,7 @@ index aacd3e86550da8d2657b77b513c3d70ca9805c4d..2de9de9c1731062ed65fa4160f01b0e1 float left_extension_corner_radius = extension_corner_radius; if (compact_left_to_bottom) { -@@ -1023,14 +1026,18 @@ void TabStyleViewsImpl::PaintSeparators(gfx::Canvas* canvas) const { +@@ -1031,14 +1034,18 @@ void TabStyleViewsImpl::PaintSeparators(gfx::Canvas* canvas) const { SK_AlphaOPAQUE)); }; diff --git a/patches/chrome-browser-ui-views-tabs-vertical-tab_collection_node.cc.patch b/patches/chrome-browser-ui-views-tabs-vertical-tab_collection_node.cc.patch index d4621f59027..872559e26f1 100644 --- a/patches/chrome-browser-ui-views-tabs-vertical-tab_collection_node.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-vertical-tab_collection_node.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/tabs/vertical/tab_collection_node.cc b/chrome/browser/ui/views/tabs/vertical/tab_collection_node.cc -index 974c97e54ea870087bdfe52849ab5092d837444b..7af50f988336a8835af41ce2ffb9a6a151001e4b 100644 +index 03179be5b1ebeb6f1261c9705573553b16b7ee1f..df5e36ab776a9b96e9ac28c1956abdf776fcd85d 100644 --- a/chrome/browser/ui/views/tabs/vertical/tab_collection_node.cc +++ b/chrome/browser/ui/views/tabs/vertical/tab_collection_node.cc @@ -37,6 +37,7 @@ TabCollectionNode::Type GetTypeFromNode(tabs::ConstChildPtr node_data_) { @@ -10,7 +10,7 @@ index 974c97e54ea870087bdfe52849ab5092d837444b..7af50f988336a8835af41ce2ffb9a6a1 } } CHECK(std::holds_alternative(node_data_)); -@@ -118,6 +119,7 @@ std::unique_ptr TabCollectionNode::CreateViewForNode( +@@ -105,6 +106,7 @@ std::unique_ptr TabCollectionNode::CreateViewForNode( return std::make_unique(node_for_view); case Type::TAB: return std::make_unique(node_for_view); diff --git a/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch b/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch index f1b3546d7fc..8c46ce98220 100644 --- a/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch +++ b/patches/chrome-browser-ui-views-user_education-browser_user_education_service.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/user_education/browser_user_education_service.cc b/chrome/browser/ui/views/user_education/browser_user_education_service.cc -index 555542a648fcd0b06343d42703e3d51a0160fcf9..e03c499a4731656d260b6786fa55a157823e9197 100644 +index a53d5278a899e2420a516f0199cd444aed10b65e..d38af15706f58fbdfe35c9a10b652b35be33493c 100644 --- a/chrome/browser/ui/views/user_education/browser_user_education_service.cc +++ b/chrome/browser/ui/views/user_education/browser_user_education_service.cc -@@ -269,6 +269,7 @@ void MaybeRegisterChromeFeaturePromos( +@@ -268,6 +268,7 @@ void MaybeRegisterChromeFeaturePromos( feature_engagement::kIPHWebUiHelpBubbleTestFeature)) { return; } diff --git a/patches/chrome-browser-ui-webui-BUILD.gn.patch b/patches/chrome-browser-ui-webui-BUILD.gn.patch index 77dcfc376ba..a46eb324690 100644 --- a/patches/chrome-browser-ui-webui-BUILD.gn.patch +++ b/patches/chrome-browser-ui-webui-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/BUILD.gn b/chrome/browser/ui/webui/BUILD.gn -index 324d714746db7ec6c496776414deada4f845bee6..11cb12ef23443369f081ab6a2fc9d2bcd63bbb61 100644 +index cc84beb728fbac36fd63613378508bc9a778b59a..e9319e53f4ba436bd9e7d9d660154f19ad6ffa3e 100644 --- a/chrome/browser/ui/webui/BUILD.gn +++ b/chrome/browser/ui/webui/BUILD.gn -@@ -136,6 +136,7 @@ source_set("configs") { +@@ -146,6 +146,7 @@ source_set("configs") { if (is_mac) { deps += [ "//chrome/browser/ui/webui/unexportable_keys_internals" ] } diff --git a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch index 9074022d908..6bca678e676 100644 --- a/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch +++ b/patches/chrome-browser-ui-webui-chrome_web_ui_controller_factory.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -index baecb99d5b2b272d8a90bd8a333a6f034f778372..4508f2d2c3122fc20cda21cf776e75dffec48dff 100644 +index b2aa6f2e332205f520045a0253bb57338ab64ef8..292ee64939c7b7f2fc9bfec529385c5f566cc974 100644 --- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc +++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -341,6 +341,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( +@@ -339,6 +339,7 @@ void ChromeWebUIControllerFactory::GetFaviconForURL( // static ChromeWebUIControllerFactory* ChromeWebUIControllerFactory::GetInstance() { diff --git a/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch b/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch index 20acf17f541..57e34597d97 100644 --- a/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-cr_components-searchbox-searchbox_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc -index 716f41e697bb4d58c53874ac08a89b372337fcf8..f07aca047d2a2f308344b2185d78b5eaf4517708 100644 +index cd0b30a37888598f120b335faec2d4e6ca7fdab1..83ce7e87c68cf52b6618337f7ed401700162b4ef 100644 --- a/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc +++ b/chrome/browser/ui/webui/cr_components/searchbox/searchbox_handler.cc -@@ -614,6 +614,7 @@ std::string SearchboxHandler::AutocompleteIconToResourceName( +@@ -616,6 +616,7 @@ std::string SearchboxHandler::AutocompleteIconToResourceName( // TODO(446953331): It's error-prone to keep the above if's up to date. When // omnibox input and popup views are replaced with webUI, matches and // actions can store an icon enum instead of `VectorIcon`. diff --git a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch index c8e002c81d7..d5f27abe48d 100644 --- a/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-extensions-extensions_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/extensions/extensions_ui.cc b/chrome/browser/ui/webui/extensions/extensions_ui.cc -index 641f3b237049a97902f987bba13135e9b2b0d56f..1e035d204d5f64e24d401f181799ffb4340cecf8 100644 +index f482bb58c258f82030f5c288100e554da1f20a8a..631323afef87a3658a905edec61dcef0a24af9b3 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -508,6 +508,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, +@@ -513,6 +513,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME))); #endif // BUILDFLAG(IS_CHROMEOS) diff --git a/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch b/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch index 0841ac96ae5..75748e21f07 100644 --- a/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-print_preview-print_preview_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc -index a440fd1cf46b89d1a4d6a0801732b62abb7715e7..ba75753c646c8578200342a98f68967d5c330d73 100644 +index bdbf965d6d2e2ac1687e325f2e2deb636d7fce9e..40a7d026395a7f76b3edef95acf381c7676923b7 100644 --- a/chrome/browser/ui/webui/print_preview/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview/print_preview_ui.cc @@ -150,7 +150,7 @@ PrintPreviewRequestIdMap& GetPrintPreviewRequestIdMap() { diff --git a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch index be9b712e56c..bab3106d759 100644 --- a/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-import_data_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/import_data_handler.cc b/chrome/browser/ui/webui/settings/import_data_handler.cc -index 1e4ecb4f715698a5f7d3f8c885293e92c549d66b..b1147d64653c5a310f6ec8129b0fcf864f5e3d4e 100644 +index cdbe7b0119d5daffbabc669c08de49cae4680b03..9a08618d88c60eb3b51777de885d6ad1a66c5ea5 100644 --- a/chrome/browser/ui/webui/settings/import_data_handler.cc +++ b/chrome/browser/ui/webui/settings/import_data_handler.cc -@@ -146,6 +146,7 @@ void ImportDataHandler::HandleImportData(const base::Value::List& args) { +@@ -146,6 +146,7 @@ void ImportDataHandler::HandleImportData(const base::ListValue& args) { if (*type_dict.FindBool(prefs::kImportDialogSearchEngine)) { selected_items |= user_data_importer::SEARCH_ENGINES; } diff --git a/patches/chrome-browser-ui-webui-settings-import_data_handler.h.patch b/patches/chrome-browser-ui-webui-settings-import_data_handler.h.patch index 13a857cc478..b93a06442d0 100644 --- a/patches/chrome-browser-ui-webui-settings-import_data_handler.h.patch +++ b/patches/chrome-browser-ui-webui-settings-import_data_handler.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/import_data_handler.h b/chrome/browser/ui/webui/settings/import_data_handler.h -index d6863d2f9cecd4a0081b4156cd1a4113f2f270ec..fe8afba082c425cd74f9ccffc5dda09d1ba2f556 100644 +index 89cd5efda8587ca522e7d1b96c7b219654d20865..90a2410d87c13389f966797c0f04690ab4e1514f 100644 --- a/chrome/browser/ui/webui/settings/import_data_handler.h +++ b/chrome/browser/ui/webui/settings/import_data_handler.h @@ -37,6 +37,7 @@ class ImportDataHandler : public SettingsPageUIHandler, diff --git a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch index f631fb50bcc..ad9c2b72e86 100644 --- a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/people_handler.cc b/chrome/browser/ui/webui/settings/people_handler.cc -index c10269e4ec99bbcac3cebcaa888508c12b009901..f79f60f53a2377f3ab9af32f21eb4901b5d21621 100644 +index ef29f7482a041eaa038276dcc46a86d968983fd6..7a0ad30cb2148d410bf6d92c275571beeef416c5 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -1155,6 +1155,7 @@ void PeopleHandler::OnSyncShutdown(syncer::SyncService* sync_service) { +@@ -1153,6 +1153,7 @@ void PeopleHandler::OnSyncShutdown(syncer::SyncService* sync_service) { void PeopleHandler::BeforeUnloadDialogCancelled() { // The before unload dialog is only shown during the first sync setup. @@ -10,7 +10,7 @@ index c10269e4ec99bbcac3cebcaa888508c12b009901..f79f60f53a2377f3ab9af32f21eb4901 DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount( signin::ConsentLevel::kSync)); syncer::SyncService* service = GetSyncService(); -@@ -1204,6 +1205,7 @@ base::Value::Dict PeopleHandler::GetSyncStatusDictionary() const { +@@ -1202,6 +1203,7 @@ base::DictValue PeopleHandler::GetSyncStatusDictionary() const { service && !disallowed_by_policy && service->IsSetupInProgress() && !service->GetUserSettings()->IsInitialSyncFeatureSetupComplete() && identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)); @@ -18,7 +18,7 @@ index c10269e4ec99bbcac3cebcaa888508c12b009901..f79f60f53a2377f3ab9af32f21eb4901 SyncStatusLabels status_labels = GetSyncStatusLabelsForSettings( SyncServiceFactory::GetForProfile(profile_)); -@@ -1414,6 +1416,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { +@@ -1412,6 +1414,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { } bool PeopleHandler::IsProfileAuthNeededOrHasErrors() { diff --git a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch index ce37cee936c..db6e6039d2e 100644 --- a/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-settings_localized_strings_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -index 4b1a87c81136e23f67529020b397ef4bd2774834..852e9c977e464d08d1515d66dc38cdafbaec37a5 100644 +index 8f0484192905fcd21b274148cc863cf3e52366ee..519492d073dabd9fedf8f6cdc676b15410436eb8 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -4190,6 +4190,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -4225,6 +4225,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-ui-webui-side_panel-bookmarks-bookmarks.mojom.patch b/patches/chrome-browser-ui-webui-side_panel-bookmarks-bookmarks.mojom.patch index d47096bb25b..ff0f76a9397 100644 --- a/patches/chrome-browser-ui-webui-side_panel-bookmarks-bookmarks.mojom.patch +++ b/patches/chrome-browser-ui-webui-side_panel-bookmarks-bookmarks.mojom.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks.mojom b/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks.mojom -index d2dbe0832ec4edee77059b8d1fb83db766fc0210..4449bca8394bc1882db09071b004731a599410ec 100644 +index a9a1f6ebe551462e08be2d0a5499728ec5d68713..b8671493a2bd65213abbd304f6d36d16126e7e8e 100644 --- a/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks.mojom +++ b/chrome/browser/ui/webui/side_panel/bookmarks/bookmarks.mojom @@ -23,9 +23,10 @@ enum SortOrder { diff --git a/patches/chrome-browser-ui-webui-theme_source.cc.patch b/patches/chrome-browser-ui-webui-theme_source.cc.patch index f916c6e9779..779defb6113 100644 --- a/patches/chrome-browser-ui-webui-theme_source.cc.patch +++ b/patches/chrome-browser-ui-webui-theme_source.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/theme_source.cc b/chrome/browser/ui/webui/theme_source.cc -index caf2757c8894f320b76d9dd188f34a6a1780b625..c4f9a33c2bf79a39be6117786dd7f7885f971a7f 100644 +index 74512212a61d332099816a0e3db6fb900dd430c6..816f79086b2557e657f7be1bc6e0e56d77b1edb5 100644 --- a/chrome/browser/ui/webui/theme_source.cc +++ b/chrome/browser/ui/webui/theme_source.cc @@ -354,6 +354,7 @@ void ThemeSource::SendColorsCss( diff --git a/patches/chrome-browser-updater-BUILD.gn.patch b/patches/chrome-browser-updater-BUILD.gn.patch index 68e3d6496e9..6627a256c5f 100644 --- a/patches/chrome-browser-updater-BUILD.gn.patch +++ b/patches/chrome-browser-updater-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/updater/BUILD.gn b/chrome/browser/updater/BUILD.gn -index f8a93ff9323b95db68eb515e67edfbfd79d486b6..91d1d071a95d66830c5a32c1a18a7e5c96eb95e4 100644 +index 924151133e660019818f8f789c44c9d665fe77db..6c7193776c2d9708db358d9890e5f796a4584f67 100644 --- a/chrome/browser/updater/BUILD.gn +++ b/chrome/browser/updater/BUILD.gn @@ -36,6 +36,7 @@ source_set("updater") { diff --git a/patches/chrome-chrome_proxy-chrome_proxy_main_win.cc.patch b/patches/chrome-chrome_proxy-chrome_proxy_main_win.cc.patch index df26f7739c0..8db0e951a99 100644 --- a/patches/chrome-chrome_proxy-chrome_proxy_main_win.cc.patch +++ b/patches/chrome-chrome_proxy-chrome_proxy_main_win.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/chrome_proxy/chrome_proxy_main_win.cc b/chrome/chrome_proxy/chrome_proxy_main_win.cc -index 4fcbf2229155734a3cdceabe76184f69266678de..b48350a29f2728e8de579e97a404617b69015f95 100644 +index 776f544e4630a65d74bc81b50c6e08dad6f43818..86eba23b41e0b63b0ae85d71f71f4f515817e3a2 100644 --- a/chrome/chrome_proxy/chrome_proxy_main_win.cc +++ b/chrome/chrome_proxy/chrome_proxy_main_win.cc @@ -15,7 +15,10 @@ diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index a7d52bb1251..21c2a1cc1b0 100644 --- a/patches/chrome-common-BUILD.gn.patch +++ b/patches/chrome-common-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn -index a847b3115f4c471a4b1aeb77c6b904b5769953d1..14360d0c9054caafa7e7ce637d65fcee32b0dc89 100644 +index c64007c87236e1813a2223a5f23a075a08be01a4..6b3aed3070b77aa8c306497f49f5e542c8fed394 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -93,6 +93,7 @@ source_set("channel_info") { +@@ -92,6 +92,7 @@ source_set("channel_info") { } else if (is_posix) { sources += [ "channel_info_posix.cc" ] } @@ -10,7 +10,7 @@ index a847b3115f4c471a4b1aeb77c6b904b5769953d1..14360d0c9054caafa7e7ce637d65fcee } source_set("ini_parser") { -@@ -280,6 +281,7 @@ static_library("common_lib") { +@@ -281,6 +282,7 @@ static_library("common_lib") { public_deps += [ "//components/cdm/common" ] } @@ -18,7 +18,7 @@ index a847b3115f4c471a4b1aeb77c6b904b5769953d1..14360d0c9054caafa7e7ce637d65fcee if (enable_extensions_core) { public_deps += [ "//chrome/common/extensions", -@@ -472,6 +474,7 @@ static_library("non_code_constants") { +@@ -473,6 +475,7 @@ static_library("non_code_constants") { if (is_win) { sources += [ "chrome_icon_resources_win.h" ] } @@ -26,7 +26,7 @@ index a847b3115f4c471a4b1aeb77c6b904b5769953d1..14360d0c9054caafa7e7ce637d65fcee } component("chrome_features") { -@@ -577,6 +580,7 @@ static_library("constants") { +@@ -578,6 +581,7 @@ static_library("constants") { "//third_party/widevine/cdm:buildflags", ] diff --git a/patches/chrome-common-extensions-api-developer_private.idl.patch b/patches/chrome-common-extensions-api-developer_private.idl.patch index 09700f1ccbe..f899cc2c22c 100644 --- a/patches/chrome-common-extensions-api-developer_private.idl.patch +++ b/patches/chrome-common-extensions-api-developer_private.idl.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl -index 0a9e404cbcd4ab8dc117c31df14d5539d36ee7e1..27f54b2a1f61d48c1f28184219fe72a82942df6a 100644 +index de49ac2ac204bcd882067a8944759a1199d7ab82..c2938670f7ed7159cff350b7388a08e419f126e5 100644 --- a/chrome/common/extensions/api/developer_private.idl +++ b/chrome/common/extensions/api/developer_private.idl -@@ -233,6 +233,7 @@ namespace developerPrivate { +@@ -229,6 +229,7 @@ namespace developerPrivate { AccessModifier incognitoAccess; AccessModifier userScriptsAccess; boolean incognitoAccessPendingChange; diff --git a/patches/chrome-installer-mac-signing-pipeline.py.patch b/patches/chrome-installer-mac-signing-pipeline.py.patch index 7d2b3041185..0309f0caf83 100644 --- a/patches/chrome-installer-mac-signing-pipeline.py.patch +++ b/patches/chrome-installer-mac-signing-pipeline.py.patch @@ -1,8 +1,8 @@ diff --git a/chrome/installer/mac/signing/pipeline.py b/chrome/installer/mac/signing/pipeline.py -index 442930b31ca6d591ce20ffdc2cf99c87d5c771b3..bfc2b75e3e01fe24b08e2ed41e35fe9012ba3e64 100644 +index 9b7fa2d29faf76020f60fb7917147abbe506e22d..62fe129d5243f93bb6392bc71951d1dfb628367d 100644 --- a/chrome/installer/mac/signing/pipeline.py +++ b/chrome/installer/mac/signing/pipeline.py -@@ -687,6 +687,9 @@ async def sign_all(orig_paths, +@@ -696,6 +696,9 @@ async def sign_all(orig_paths, _package_and_maybe_notarize_distributions( config, distributions, notary_paths), timeout=60 * 60 * 2) @@ -12,7 +12,7 @@ index 442930b31ca6d591ce20ffdc2cf99c87d5c771b3..bfc2b75e3e01fe24b08e2ed41e35fe90 async def _sign_and_maybe_notarize_distributions(config, distributions, -@@ -821,3 +824,5 @@ async def _package_and_maybe_notarize_distributions(config, distributions, +@@ -830,3 +833,5 @@ async def _package_and_maybe_notarize_distributions(config, distributions, if config.notarize.should_staple(): for path in staple_paths: notarize.staple(path) diff --git a/patches/chrome-installer-mini_installer-mini_installer.cc.patch b/patches/chrome-installer-mini_installer-mini_installer.cc.patch index 195fbd69a55..b3754fc2229 100644 --- a/patches/chrome-installer-mini_installer-mini_installer.cc.patch +++ b/patches/chrome-installer-mini_installer-mini_installer.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mini_installer/mini_installer.cc b/chrome/installer/mini_installer/mini_installer.cc -index 44f29f2fafda83685479c791da3aa4ddbd4cde73..14e01e32520b87ef5cbc96a346326f07d5ddf853 100644 +index 6d913151bf11d366559d27e81f8e6b4dd27fe723..e3437d29501926f58cc4c2b4ead40b4a754423de 100644 --- a/chrome/installer/mini_installer/mini_installer.cc +++ b/chrome/installer/mini_installer/mini_installer.cc @@ -462,6 +462,7 @@ ProcessExitResult UnpackBinaryResources(HMODULE module, diff --git a/patches/chrome-installer-setup-install_worker.cc.patch b/patches/chrome-installer-setup-install_worker.cc.patch index 7a588a285a3..ffce752cf74 100644 --- a/patches/chrome-installer-setup-install_worker.cc.patch +++ b/patches/chrome-installer-setup-install_worker.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc -index 317e77e81c0407a089e07cf3cc8179d33f7b3542..960d1c519d107139a61203977a2c9800cac31300 100644 +index 4ce4d015542292fc5563d9b8d13490fd1644c6aa..b38ef55d4b85d9b823af3521178654c4debe20ea 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -106,6 +106,7 @@ void AddInstallerCopyTasks(const InstallParams& install_params, diff --git a/patches/chrome-installer-setup-setup_main.cc.patch b/patches/chrome-installer-setup-setup_main.cc.patch index 40c4d6dc1b3..5251a7740c2 100644 --- a/patches/chrome-installer-setup-setup_main.cc.patch +++ b/patches/chrome-installer-setup-setup_main.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/setup/setup_main.cc b/chrome/installer/setup/setup_main.cc -index 10acca87dfb81dc744b4fb31fe28e58fd2a53db3..b4a34f2609b9765e6274a2dcf896de7807367f2a 100644 +index 7ca7d00b209839cfc502c6b4ce7fc3285ff100e9..2a3bc1bfbd686f3ed2c889e80e638266e1c5812e 100644 --- a/chrome/installer/setup/setup_main.cc +++ b/chrome/installer/setup/setup_main.cc @@ -706,6 +706,7 @@ installer::InstallStatus InstallProducts(InstallationState& original_state, diff --git a/patches/chrome-installer-util-BUILD.gn.patch b/patches/chrome-installer-util-BUILD.gn.patch index 497552b46fa..a148a23bf54 100644 --- a/patches/chrome-installer-util-BUILD.gn.patch +++ b/patches/chrome-installer-util-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/util/BUILD.gn b/chrome/installer/util/BUILD.gn -index f7d3ac043e245288211974d9c9cc10ea327f83a6..0d3ef781c071d7b83f25b657917a5ade73d716d4 100644 +index 7c88a60f19ee782f139bebed13e926789e943df0..5a4ad54d02cd7ad862e4a2c1cab6b8b120f3ed75 100644 --- a/chrome/installer/util/BUILD.gn +++ b/chrome/installer/util/BUILD.gn @@ -202,6 +202,7 @@ static_library("with_no_strings") { diff --git a/patches/chrome-installer-util-google_update_settings.cc.patch b/patches/chrome-installer-util-google_update_settings.cc.patch index 7e6859748b4..e5602a2c13c 100644 --- a/patches/chrome-installer-util-google_update_settings.cc.patch +++ b/patches/chrome-installer-util-google_update_settings.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/util/google_update_settings.cc b/chrome/installer/util/google_update_settings.cc -index aa6e966d2ca32fa33ed411c322600f1a1f378d7a..69214a3ccaed5004afaff1ae889a6aa03b94d876 100644 +index 19617a52633d339db4eb174077d3286c0f2ab018..e1cc75e5c0bb31084ade515d9e657c4bf7daee56 100644 --- a/chrome/installer/util/google_update_settings.cc +++ b/chrome/installer/util/google_update_settings.cc @@ -33,7 +33,11 @@ using base::win::RegKey; diff --git a/patches/chrome-installer-util-shell_util.cc.patch b/patches/chrome-installer-util-shell_util.cc.patch index 3c0e8d3f188..98cc9ac031e 100644 --- a/patches/chrome-installer-util-shell_util.cc.patch +++ b/patches/chrome-installer-util-shell_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/util/shell_util.cc b/chrome/installer/util/shell_util.cc -index 3ee708f3a330e914081ce11c2ca4051ed8181cdf..349f62683ed1058d870ab02dd8ae3502a50b7e12 100644 +index 3713405305ad093d7a9be44012a9e83fd2781ca0..906bea1af549f66379591b896af03effe847d4c6 100644 --- a/chrome/installer/util/shell_util.cc +++ b/chrome/installer/util/shell_util.cc @@ -375,6 +375,7 @@ void GetChromeProgIdEntries( diff --git a/patches/chrome-renderer-BUILD.gn.patch b/patches/chrome-renderer-BUILD.gn.patch index 1d2a4cf9457..eb6dd4ace7a 100644 --- a/patches/chrome-renderer-BUILD.gn.patch +++ b/patches/chrome-renderer-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/BUILD.gn b/chrome/renderer/BUILD.gn -index 2d7bb6e888f5890744b0ab6c3c8403115d32fb7c..4e4f793c08c583a1291cebf7b1270a09ca688cac 100644 +index ccc22d2c563306b13bf2c0aef62f2c22f8ec0bc1..f4af7b9709771242ad7f19514915b6d2d78c4055 100644 --- a/chrome/renderer/BUILD.gn +++ b/chrome/renderer/BUILD.gn -@@ -240,6 +240,7 @@ static_library("renderer") { +@@ -243,6 +243,7 @@ static_library("renderer") { deps += [ "//components/webapps/isolated_web_apps:scheme" ] } diff --git a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch index 09e14c5a43e..f156158fb4d 100644 --- a/patches/chrome-renderer-chrome_content_renderer_client.cc.patch +++ b/patches/chrome-renderer-chrome_content_renderer_client.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc -index 1a0da18ecdcbeb304bfa9a6ad7a999a732be75d5..a3ca81a6a332d6abeb339395a75000c7ff179cb8 100644 +index a9d53bb566fab5b45c867e3fe90228a7ff4d09bb..03107916fec27bcd221e6d4830b65e0607269ccb 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc -@@ -598,7 +598,7 @@ void ChromeContentRendererClient::RenderFrameCreated( +@@ -604,7 +604,7 @@ void ChromeContentRendererClient::RenderFrameCreated( extensions::ExtensionsRendererClient::Get()->dispatcher()); #endif content_settings::ContentSettingsAgentImpl* content_settings = diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 19c879d1885..eab88866aa3 100644 --- a/patches/chrome-test-BUILD.gn.patch +++ b/patches/chrome-test-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn -index 8138679b6b43c837b56f093c324daff38220f6aa..5f3a53a53c94cd125b87c95c33898e2c8774bf4b 100644 +index dbe8f32f53ff9dc8da619edc0f2c5316fcca75e5..71a08f7611d33114373fa689aca319f28012d204 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -692,6 +692,7 @@ static_library("test_support") { +@@ -696,6 +696,7 @@ static_library("test_support") { "//ui/gl", ] diff --git a/patches/chrome-test-base-testing_browser_process.cc.patch b/patches/chrome-test-base-testing_browser_process.cc.patch index 7aefa449f4f..421a0033ee9 100644 --- a/patches/chrome-test-base-testing_browser_process.cc.patch +++ b/patches/chrome-test-base-testing_browser_process.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc -index b4838560c58a06f5546e6ba929ee63c0a0bfaaf6..022f92aa59108ee464ef6936b9eeb2e8c0056591 100644 +index 379e386017a164bf8c6734b2c435d798971b1091..d05261677d7b7f732b555adadb15ebe0a7237231 100644 --- a/chrome/test/base/testing_browser_process.cc +++ b/chrome/test/base/testing_browser_process.cc @@ -151,10 +151,12 @@ void TestingBrowserProcess::CreateInstance() { diff --git a/patches/chrome-test-data-webui-settings-BUILD.gn.patch b/patches/chrome-test-data-webui-settings-BUILD.gn.patch index caad1f0bcd4..68d7ff3718e 100644 --- a/patches/chrome-test-data-webui-settings-BUILD.gn.patch +++ b/patches/chrome-test-data-webui-settings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/test/data/webui/settings/BUILD.gn b/chrome/test/data/webui/settings/BUILD.gn -index 853297da759dad1aab16316a0f68c2b947511c09..ea75a7e5fb4ddefbd4d4569e20fb25f3038dcc4e 100644 +index c29225f39a37703ae8662a6c6431d88f72c63b6b..3f53fd3c097e20cb478ad8f2ba392ec2ec1fdf5c 100644 --- a/chrome/test/data/webui/settings/BUILD.gn +++ b/chrome/test/data/webui/settings/BUILD.gn -@@ -289,6 +289,7 @@ build_webui_tests("build") { +@@ -285,6 +285,7 @@ build_webui_tests("build") { ts_definitions += [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ] } diff --git a/patches/chrome-utility-BUILD.gn.patch b/patches/chrome-utility-BUILD.gn.patch index 213a94a474e..b14f604560b 100644 --- a/patches/chrome-utility-BUILD.gn.patch +++ b/patches/chrome-utility-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn -index eaccd0678a3f4cec435807c61943a9324f70c2c6..014b206ca9ff986085ae8ccb7250a59fc7a50151 100644 +index 3161e65568aa2364625362654a0aa204ec811621..ced8b1a17bf77fc5e31cff063fefb18e1abbd6d6 100644 --- a/chrome/utility/BUILD.gn +++ b/chrome/utility/BUILD.gn -@@ -251,6 +251,7 @@ static_library("utility") { +@@ -254,6 +254,7 @@ static_library("utility") { if (enable_on_device_translation) { deps += [ "//components/on_device_translation/service:on_device_translation_service" ] } diff --git a/patches/components-autofill-core-browser-data_quality-addresses-profile_requirement_utils.cc.patch b/patches/components-autofill-core-browser-data_quality-addresses-profile_requirement_utils.cc.patch index 054812a0cce..d069b218e5b 100644 --- a/patches/components-autofill-core-browser-data_quality-addresses-profile_requirement_utils.cc.patch +++ b/patches/components-autofill-core-browser-data_quality-addresses-profile_requirement_utils.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/autofill/core/browser/data_quality/addresses/profile_requirement_utils.cc b/components/autofill/core/browser/data_quality/addresses/profile_requirement_utils.cc -index adbf9f322f352de1d03888507e58cdccc966385c..f51810c9f3346482cb19d3e77ad07171860717a4 100644 +index 0b4f316ac00a1a37d8ecc8f7b01726f82486eb00..66bee93a776d85ceadf9b7d351766aba5c922dd4 100644 --- a/components/autofill/core/browser/data_quality/addresses/profile_requirement_utils.cc +++ b/components/autofill/core/browser/data_quality/addresses/profile_requirement_utils.cc @@ -45,7 +45,7 @@ ValidateProfileImportRequirements(const AutofillProfile& profile, diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-ChosenObjectSettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-ChosenObjectSettings.java.patch index 8f4f15bf450..a8584254f02 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-ChosenObjectSettings.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-ChosenObjectSettings.java.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ChosenObjectSettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ChosenObjectSettings.java -index 2e15939fb7690785fc0a565cc9a37ed6e1c1b388..c75ad7fe290e5ebf556c2b99bab791843af39dcf 100644 +index 187cb1f056f2ebfdc605e7578dbcd087557e3e01..10c0a98229a025b0af3c735593d89fce16b1ba73 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ChosenObjectSettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/ChosenObjectSettings.java @@ -170,7 +170,7 @@ public class ChosenObjectSettings extends BaseSiteSettingsFragment diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch index 03d10df72d1..ca2d8f3298a 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SingleCategorySettings.java.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -index d6fdcc479de6c6535c3e74e611b81ded4d41b798..fa68d86c67dcb6f0e8ae50f2d612e277e1b91f39 100644 +index c158cb6b3d075f100d69fa4e72d957aa61613b35..7b62e58e9cf128cfc7f8a4d6310a1394dd6789b4 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SingleCategorySettings.java -@@ -631,7 +631,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -641,7 +641,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment if (queryHasChanged) getInfoForOrigins(); return true; } diff --git a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch index 06274fc86e4..5b65b89760d 100644 --- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch +++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml -index f8653221beed8b5fd73fff00abd5a55180c1f08a..a048eb90d2143ee74fcabcffb0645201d81eb005 100644 +index a2825980de53cfb0b8ab01f270604b949662e77e..e3d18a67f6fd4b88bdb58a2b0a6e60b021e35b4b 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml -@@ -91,7 +91,7 @@ found in the LICENSE file. +@@ -92,7 +92,7 @@ found in the LICENSE file. 48dp diff --git a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch index 85681e9062c..75d6f5304fe 100644 --- a/patches/components-content_settings-browser-page_specific_content_settings.cc.patch +++ b/patches/components-content_settings-browser-page_specific_content_settings.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/browser/page_specific_content_settings.cc b/components/content_settings/browser/page_specific_content_settings.cc -index 08997fce9881522790b9aefb30e5db3728af710f..d5525fb7fd591bb17a30d41756f2b5f28fca60c6 100644 +index e1ca435d57d1978373d17cd2d16f621840fd212b..7e33d6720f769e04fb57399b3c34f04a22577369 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc -@@ -875,6 +875,7 @@ bool PageSpecificContentSettings::IsContentBlocked( +@@ -874,6 +874,7 @@ bool PageSpecificContentSettings::IsContentBlocked( content_type == ContentSettingsType::ADS || content_type == ContentSettingsType::SOUND || content_type == ContentSettingsType::CLIPBOARD_READ_WRITE || @@ -10,7 +10,7 @@ index 08997fce9881522790b9aefb30e5db3728af710f..d5525fb7fd591bb17a30d41756f2b5f2 content_type == ContentSettingsType::SENSORS || content_type == ContentSettingsType::GEOLOCATION || content_type == ContentSettingsType::GEOLOCATION_WITH_OPTIONS || -@@ -905,6 +906,7 @@ bool PageSpecificContentSettings::IsContentAllowed( +@@ -904,6 +905,7 @@ bool PageSpecificContentSettings::IsContentAllowed( content_type != ContentSettingsType::MEDIASTREAM_CAMERA && content_type != ContentSettingsType::MIDI_SYSEX && content_type != ContentSettingsType::CLIPBOARD_READ_WRITE && diff --git a/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch b/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch index 26bd80f772b..abf69ffd42d 100644 --- a/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_default_provider.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_default_provider.cc b/components/content_settings/core/browser/content_settings_default_provider.cc -index eb69bd3c495b0f404858adb089646f27a61530cb..41c4ded550b62b4900e3f6b0f28e21b3e775c88e 100644 +index 0dd1396ad557eb9a4aea6abd9edfa00ac45aa341..a1f10844cf523dab1b9334b3b0ba81b6091d51a8 100644 --- a/components/content_settings/core/browser/content_settings_default_provider.cc +++ b/components/content_settings/core/browser/content_settings_default_provider.cc -@@ -423,6 +423,7 @@ void DefaultProvider::DiscardOrMigrateObsoletePreferences() { +@@ -427,6 +427,7 @@ void DefaultProvider::DiscardOrMigrateObsoletePreferences() { // TODO(https://crbug.com/367181093): clean this up. prefs_->ClearPref(kBug364820109AlreadyWorkedAroundPref); #endif // !BUILDFLAG(IS_IOS) diff --git a/patches/components-content_settings-core-browser-content_settings_policy_provider.cc.patch b/patches/components-content_settings-core-browser-content_settings_policy_provider.cc.patch index 22861c50605..5c828f6028c 100644 --- a/patches/components-content_settings-core-browser-content_settings_policy_provider.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_policy_provider.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_policy_provider.cc b/components/content_settings/core/browser/content_settings_policy_provider.cc -index 88b2a233596820607ae75f6f88c5445a227136f0..c5e9aafe3723f8b37939dfe8f438ba4c62fb09ac 100644 +index 06db486e228d3ebe39a641486c0e1196a093ff37..ed44906dffec7229a29ab9d9bfeb1c8b7ae67020 100644 --- a/components/content_settings/core/browser/content_settings_policy_provider.cc +++ b/components/content_settings/core/browser/content_settings_policy_provider.cc @@ -51,6 +51,7 @@ struct PrefsForManagedContentSettingsMapEntry { @@ -10,7 +10,7 @@ index 88b2a233596820607ae75f6f88c5445a227136f0..c5e9aafe3723f8b37939dfe8f438ba4c {prefs::kManagedAutomaticFullscreenAllowedForUrls, ContentSettingsType::AUTOMATIC_FULLSCREEN, CONTENT_SETTING_ALLOW}, {prefs::kManagedAutomaticFullscreenBlockedForUrls, -@@ -191,6 +192,7 @@ constexpr PrefsForManagedContentSettingsMapEntry +@@ -199,6 +200,7 @@ constexpr PrefsForManagedContentSettingsMapEntry }; constexpr const char* kManagedPrefs[] = { @@ -18,7 +18,7 @@ index 88b2a233596820607ae75f6f88c5445a227136f0..c5e9aafe3723f8b37939dfe8f438ba4c prefs::kManagedAutomaticFullscreenAllowedForUrls, prefs::kManagedAutomaticFullscreenBlockedForUrls, prefs::kManagedAutoSelectCertificateForUrls, -@@ -263,6 +265,7 @@ constexpr const char* kManagedPrefs[] = { +@@ -274,6 +276,7 @@ constexpr const char* kManagedPrefs[] = { // the preference default content settings. If a default content settings type // is managed any user defined exceptions (patterns) for this type are ignored. constexpr const char* kManagedDefaultPrefs[] = { @@ -26,7 +26,7 @@ index 88b2a233596820607ae75f6f88c5445a227136f0..c5e9aafe3723f8b37939dfe8f438ba4c prefs::kManagedDefaultAdsSetting, prefs::kManagedDefaultClipboardSetting, prefs::kManagedDefaultCookiesSetting, -@@ -359,6 +362,7 @@ struct PolicyProvider::PrefsForManagedDefaultMapEntry { +@@ -369,6 +372,7 @@ struct PolicyProvider::PrefsForManagedDefaultMapEntry { // static const PolicyProvider::PrefsForManagedDefaultMapEntry PolicyProvider::kPrefsForManagedDefault[] = { diff --git a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch index c94a6c9d894..de3863c64db 100644 --- a/patches/components-content_settings-core-browser-content_settings_pref.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_pref.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_pref.cc b/components/content_settings/core/browser/content_settings_pref.cc -index 50ff794c0b6043c8267d4b8a4dec0a82a7181c7e..2659dafbd78781dd41557ee688d73d7502620b1b 100644 +index 8e49b6e5977c7f5477e831cedf4b650fdb1c73a7..40a40dd0085baa7648693ca115b5acc257e46e9f 100644 --- a/components/content_settings/core/browser/content_settings_pref.cc +++ b/components/content_settings/core/browser/content_settings_pref.cc @@ -193,6 +193,7 @@ void ContentSettingsPref::SetWebsiteSetting( diff --git a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch index d5f8d3685e3..34ff71ae726 100644 --- a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index 8875cd85da2ed5b8e2382526b2ac2a71b6bb32df..1ac0a987db03727cf863083ea7196d2043981c79 100644 +index 164baa1e1de0d7ae61326cdfc85530c23e9eb537..7dff7fa1fdc3e7c7776ebfa82bc527813fe3a056 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc @@ -119,6 +119,7 @@ void ContentSettingsRegistry::Init() { @@ -10,7 +10,7 @@ index 8875cd85da2ed5b8e2382526b2ac2a71b6bb32df..1ac0a987db03727cf863083ea7196d20 #if BUILDFLAG(USE_BLINK) | WebsiteSettingsRegistry::PLATFORM_IOS #endif -@@ -869,6 +870,7 @@ void ContentSettingsRegistry::Init() { +@@ -841,6 +842,7 @@ void ContentSettingsRegistry::Init() { WebsiteSettingsRegistry::PLATFORM_CHROMEOS, ContentSettingsInfo::INHERIT_IN_INCOGNITO, PermissionSettingsInfo::EXCEPTIONS_ON_SECURE_ORIGINS_ONLY); diff --git a/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch b/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch index aa22807a4ce..c4c25e70494 100644 --- a/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_uma_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/browser/content_settings_uma_util.cc b/components/content_settings/core/browser/content_settings_uma_util.cc -index a8b7e6eb653d456f4b20ff553ef5e4814f7544a6..92e958e4ae182c70a80280d2e49bf4bcd31e7009 100644 +index 1bd6673a666edf8656f3787b429ba94d4ddd1bfc..429b692cde75bcc3ba8815660f82b5154291728c 100644 --- a/components/content_settings/core/browser/content_settings_uma_util.cc +++ b/components/content_settings/core/browser/content_settings_uma_util.cc @@ -168,6 +168,7 @@ constexpr auto kHistogramValue = base::MakeFixedFlatMap(choice)) { CHECK(is_third_party_request); CHECK(block_third_party_cookies); diff --git a/patches/components-content_settings-core-common-cookie_settings_base.h.patch b/patches/components-content_settings-core-common-cookie_settings_base.h.patch index 6206d0fd427..2102f4e33bd 100644 --- a/patches/components-content_settings-core-common-cookie_settings_base.h.patch +++ b/patches/components-content_settings-core-common-cookie_settings_base.h.patch @@ -1,5 +1,5 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.h b/components/content_settings/core/common/cookie_settings_base.h -index cdffb771a3702a9262cb2222f5d3ff5c11bf1b1a..5333c3b4837b3fcdd7e45a5edaf42a35a4ddabbc 100644 +index 947cb90f4726ac066da5c234f361bad75ed9d915..cbf06ee81faa04188e3aecf4158c905563a80cff 100644 --- a/components/content_settings/core/common/cookie_settings_base.h +++ b/components/content_settings/core/common/cookie_settings_base.h @@ -79,7 +79,7 @@ class CookieSettingsBase { diff --git a/patches/components-download-internal-common-download_item_impl.cc.patch b/patches/components-download-internal-common-download_item_impl.cc.patch index a89805ac401..cd468998743 100644 --- a/patches/components-download-internal-common-download_item_impl.cc.patch +++ b/patches/components-download-internal-common-download_item_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/download/internal/common/download_item_impl.cc b/components/download/internal/common/download_item_impl.cc -index 410fed2392f01c483e466d0d5529d4be6b2e49ab..7a4e31bf0025c14cfd360df96f173b57e7543ddd 100644 +index 8e2bcaa574ca59a23b7dbb0aa025deb8d959c6e0..9217355ca54fabbd92d7d08b61f7d4990c72faca 100644 --- a/components/download/internal/common/download_item_impl.cc +++ b/components/download/internal/common/download_item_impl.cc -@@ -1991,8 +1991,8 @@ void DownloadItemImpl::OnDownloadCompleting() { +@@ -1994,8 +1994,8 @@ void DownloadItemImpl::OnDownloadCompleting() { &DownloadFile::RenameAndAnnotate, base::Unretained(download_file_.get()), GetTargetFilePath(), delegate_->GetApplicationClientIdForFileScanning(), diff --git a/patches/components-embedder_support-user_agent_utils.cc.patch b/patches/components-embedder_support-user_agent_utils.cc.patch index b7c28f4076b..1a92bccd141 100644 --- a/patches/components-embedder_support-user_agent_utils.cc.patch +++ b/patches/components-embedder_support-user_agent_utils.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc -index e77a993b3c4673c8d8f1e2f9a93ea9ffc572e9ba..e198720101c142a12d0ab74a73898bd010f06123 100644 +index 557eadb18229e4adb2f0092593877254e2f1fe7c..585ca3071f3579506be7ab489a7876e15295ae8c 100644 --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc -@@ -189,10 +189,11 @@ const blink::UserAgentBrandList GetUserAgentBrandList( +@@ -166,10 +166,11 @@ const blink::UserAgentBrandList GetUserAgentBrandList( #if !BUILDFLAG(CHROMIUM_BRANDING) brand = version_info::GetProductName(); #endif @@ -15,7 +15,7 @@ index e77a993b3c4673c8d8f1e2f9a93ea9ffc572e9ba..e198720101c142a12d0ab74a73898bd0 : major_version; return GenerateBrandVersionList(major_version_number, brand, brand_version, -@@ -899,6 +900,7 @@ std::string GetAndroidOSInfo( +@@ -885,6 +886,7 @@ std::string GetAndroidOSInfo( // Send information about the device. bool semicolon_inserted = false; diff --git a/patches/components-feature_engagement-public-feature_list.h.patch b/patches/components-feature_engagement-public-feature_list.h.patch index 6f51c32364b..495406a45c0 100644 --- a/patches/components-feature_engagement-public-feature_list.h.patch +++ b/patches/components-feature_engagement-public-feature_list.h.patch @@ -1,8 +1,8 @@ diff --git a/components/feature_engagement/public/feature_list.h b/components/feature_engagement/public/feature_list.h -index 141a7c2c2ccaf94430c0dcf16fe8202a1218df1e..015cd76dc07f0bb53e6da1c9ae3b563e8df0c037 100644 +index 67c7f37d9466bc1583ad4aaed391670645ecc100..74ffa5cf623a396595a4266a1b456c635e34b051 100644 --- a/components/feature_engagement/public/feature_list.h +++ b/components/feature_engagement/public/feature_list.h -@@ -559,6 +559,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSLensPromoDesktopFeature, +@@ -562,6 +562,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSLensPromoDesktopFeature, DEFINE_VARIATION_PARAM(kIPHiOSEnhancedBrowsingDesktopFeature, "IPH_iOSEnhancedBrowsingDesktop"); #endif // !BUILDFLAG(IS_ANDROID) @@ -10,7 +10,7 @@ index 141a7c2c2ccaf94430c0dcf16fe8202a1218df1e..015cd76dc07f0bb53e6da1c9ae3b563e #if !BUILDFLAG(IS_IOS) DEFINE_VARIATION_PARAM(kIPHResumptionRailFeature, "IPH_ResumptionRail"); -@@ -569,6 +570,7 @@ DEFINE_VARIATION_PARAM(kIPHResumptionRailFeature, "IPH_ResumptionRail"); +@@ -572,6 +573,7 @@ DEFINE_VARIATION_PARAM(kIPHResumptionRailFeature, "IPH_ResumptionRail"); // are possible to enable on their own in demo mode. inline constexpr flags_ui::FeatureEntry::FeatureVariation kIPHDemoModeChoiceVariations[] = { diff --git a/patches/components-history-core-browser-history_types.h.patch b/patches/components-history-core-browser-history_types.h.patch index 8b16642922a..d76e9fa1581 100644 --- a/patches/components-history-core-browser-history_types.h.patch +++ b/patches/components-history-core-browser-history_types.h.patch @@ -1,5 +1,5 @@ diff --git a/components/history/core/browser/history_types.h b/components/history/core/browser/history_types.h -index 924200dec9703311a7c6ee21d5d0c501a0738c17..ebece9a49dc3287262531dd6194a7af289862bdd 100644 +index bdc18b898dc90b9523d9614fa369101977b99f72..3e3c3edda0b1faf8eaec0bbb5aff04a2b8f972ce 100644 --- a/components/history/core/browser/history_types.h +++ b/components/history/core/browser/history_types.h @@ -55,6 +55,8 @@ enum VisitSource { diff --git a/patches/components-metrics-BUILD.gn.patch b/patches/components-metrics-BUILD.gn.patch index 155cd659c27..4d4e26172e1 100644 --- a/patches/components-metrics-BUILD.gn.patch +++ b/patches/components-metrics-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn -index b7b391c1f166c3e67001413a1a0eea49fc530eb3..308bfdbc2118be0384f8246fe048bb98106398a1 100644 +index 0e35ba2dc5a680feabccfdbe1e41739e20992d7f..cf3bf58278bd2f82297aae3787ec7734fe53e308 100644 --- a/components/metrics/BUILD.gn +++ b/components/metrics/BUILD.gn -@@ -347,6 +347,7 @@ if (!is_cronet_build || is_ios) { +@@ -348,6 +348,7 @@ if (!is_cronet_build || is_ios) { "motherboard_metrics_provider.h", ] } diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index 48294ede2d8..f59ea8176bc 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index fcac2d737c3da9fe9b42996e040248164623a395..d74cf3e35c40ff02905b98ee4fb5875076b937a0 100644 +index 82fbe89ede3170e1d802704a77fcaff1bd70ed7b..ce255a500ee8dd87142d8a00c02c409d7aca35ab 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn @@ -379,6 +379,7 @@ static_library("browser") { @@ -10,7 +10,7 @@ index fcac2d737c3da9fe9b42996e040248164623a395..d74cf3e35c40ff02905b98ee4fb58750 configs += [ "//build/config/compiler:wexit_time_destructors" ] -@@ -998,6 +999,7 @@ fuzzer_test("search_suggestion_parser_fuzzer") { +@@ -1005,6 +1006,7 @@ fuzzer_test("search_suggestion_parser_fuzzer") { mojom("mojo_bindings") { sources = [ "omnibox.mojom" ] diff --git a/patches/components-omnibox-browser-autocomplete_controller.cc.patch b/patches/components-omnibox-browser-autocomplete_controller.cc.patch index ff4e036799e..01642bde2cf 100644 --- a/patches/components-omnibox-browser-autocomplete_controller.cc.patch +++ b/patches/components-omnibox-browser-autocomplete_controller.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc -index 71bbe73171a210c4a0266e0e6742a9c69e82706d..c840c477ccccf3255de9ee32cbb89e75cf4eab00 100644 +index 41fdea1f4fea7da1f7b71130490556731db8b531..2f83bde3b682a1740b753586f15f08ee399ae3eb 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc -@@ -1248,6 +1248,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) { +@@ -1267,6 +1267,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) { base::MakeRefCounted(provider_client_.get(), this); search_provider_ = search_provider.get(); providers_.push_back(std::move(search_provider)); @@ -10,7 +10,7 @@ index 71bbe73171a210c4a0266e0e6742a9c69e82706d..c840c477ccccf3255de9ee32cbb89e75 } // Providers run in the order they're added. Add `HistoryURLProvider` after // `SearchProvider` because: -@@ -1520,6 +1521,7 @@ void AutocompleteController::UpdateResult(UpdateType update_type, +@@ -1539,6 +1540,7 @@ void AutocompleteController::UpdateResult(UpdateType update_type, StartStopTimer(); } diff --git a/patches/components-omnibox-browser-autocomplete_match.h.patch b/patches/components-omnibox-browser-autocomplete_match.h.patch index 3a040b38324..df7755b7649 100644 --- a/patches/components-omnibox-browser-autocomplete_match.h.patch +++ b/patches/components-omnibox-browser-autocomplete_match.h.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/autocomplete_match.h b/components/omnibox/browser/autocomplete_match.h -index 2c577ee559f5cc83cefbc2648f5a6c8679a41fec..315cb2f855e9955979c11740a58f6ded7dc581cb 100644 +index 2e3eaab4bf4777dda81a1677a8e41351f2fce3db..df937cf2d8bf82419a18c64c1e6a83dc639ce504 100644 --- a/components/omnibox/browser/autocomplete_match.h +++ b/components/omnibox/browser/autocomplete_match.h -@@ -811,7 +811,7 @@ struct AutocompleteMatch { +@@ -814,7 +814,7 @@ struct AutocompleteMatch { // The provider of this match, used to remember which provider the user had // selected when the input changes. This may be NULL, in which case there is // no provider (or memory of the user's selection). diff --git a/patches/components-os_crypt-common-keychain_password_mac.mm.patch b/patches/components-os_crypt-common-keychain_password_mac.mm.patch index 6a3ece99fe8..48cedb33b93 100644 --- a/patches/components-os_crypt-common-keychain_password_mac.mm.patch +++ b/patches/components-os_crypt-common-keychain_password_mac.mm.patch @@ -1,8 +1,8 @@ diff --git a/components/os_crypt/common/keychain_password_mac.mm b/components/os_crypt/common/keychain_password_mac.mm -index caa0e420956a31be1bd744319a0e40a0e50b46cf..bec8afffa4ed8320c8e5040968268ad71dc952cd 100644 +index 66e0c5e9779959bcc45ef1f274f98a00de1c01e1..ea558247efc3a90b36613d4324f883239fb2fdd9 100644 --- a/components/os_crypt/common/keychain_password_mac.mm +++ b/components/os_crypt/common/keychain_password_mac.mm -@@ -73,12 +73,14 @@ std::string AddRandomPasswordToKeychain(const Keychain& keychain, +@@ -111,12 +111,14 @@ base::expected GetPasswordImpl( // static KeychainPassword::KeychainNameType& KeychainPassword::GetServiceName() { diff --git a/patches/components-os_crypt-sync-BUILD.gn.patch b/patches/components-os_crypt-sync-BUILD.gn.patch index 0984d9d5d57..edd256b180c 100644 --- a/patches/components-os_crypt-sync-BUILD.gn.patch +++ b/patches/components-os_crypt-sync-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/os_crypt/sync/BUILD.gn b/components/os_crypt/sync/BUILD.gn -index 2d155f49248a24b5551cb93e010ac1a0c0f94261..9368945296d061691e807790ee32226564b0600d 100644 +index 57b209f51ef1629f1201e4ba5d713c0ce32ebb24..9c480d585d1f7ef514941e3cac19a9702c0bd1a8 100644 --- a/components/os_crypt/sync/BUILD.gn +++ b/components/os_crypt/sync/BUILD.gn -@@ -101,6 +101,7 @@ component("sync") { +@@ -100,6 +100,7 @@ component("sync") { } else if (is_posix || is_fuchsia) { sources += [ "os_crypt_posix.cc" ] } diff --git a/patches/components-os_crypt-sync-key_storage_linux.cc.patch b/patches/components-os_crypt-sync-key_storage_linux.cc.patch index 723b9ad9dea..0b25d59af97 100644 --- a/patches/components-os_crypt-sync-key_storage_linux.cc.patch +++ b/patches/components-os_crypt-sync-key_storage_linux.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/os_crypt/sync/key_storage_linux.cc b/components/os_crypt/sync/key_storage_linux.cc -index 2eacbdcdf317e352c8e2e425a24dfc015f16d07e..ee7bc32dbc57bf653ebf8fb238935f4d5ecd7921 100644 +index d9e06d9b901c99a506d52d13d6da6173dbd58090..0ec39b3306a8d0a8c3795ee5612ef50f43f2ba40 100644 --- a/components/os_crypt/sync/key_storage_linux.cc +++ b/components/os_crypt/sync/key_storage_linux.cc @@ -29,8 +29,7 @@ diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index a37c004c3e9..61be52fa57a 100644 --- a/patches/components-page_info-page_info.cc.patch +++ b/patches/components-page_info-page_info.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/page_info/page_info.cc b/components/page_info/page_info.cc -index 16a512f4c7c392720414e5f37cb4661e6894a231..181b36b6872bc55fdf75f6a382bcba7d79100fbd 100644 +index 783bf0ba119a3b1dd6cbc264c4392fd963d300b6..f159e7c340690a06e1db7c8b17813204e3791ddb 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -1366,6 +1366,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, +@@ -1377,6 +1377,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, // via `HasContentSettingChangedViaPageInfo(type)`. bool PageInfo::ShouldShowPermission( const PageInfo::PermissionInfo& info) const { diff --git a/patches/components-password_manager-core-browser-password_form_filling.cc.patch b/patches/components-password_manager-core-browser-password_form_filling.cc.patch index 79cf8ba4a2e..4387313aba3 100644 --- a/patches/components-password_manager-core-browser-password_form_filling.cc.patch +++ b/patches/components-password_manager-core-browser-password_form_filling.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/password_manager/core/browser/password_form_filling.cc b/components/password_manager/core/browser/password_form_filling.cc -index de4f566feb1edbffb69b0f8d0249b1970dba8dff..b5697b36c07b0d91a43c2a5bcef8bec97df34fe5 100644 +index 70f0c2d49cc2683812700c395dac59931eabf0fd..2c38a0bb2e6f9945ac72ecc69b93cc42fc92ef50 100644 --- a/components/password_manager/core/browser/password_form_filling.cc +++ b/components/password_manager/core/browser/password_form_filling.cc -@@ -294,6 +294,7 @@ LikelyFormFilling SendFillInformationToRenderer( +@@ -271,6 +271,7 @@ LikelyFormFilling SendFillInformationToRenderer( bool wait_for_username = wait_for_username_reason != WaitForUsernameReason::kDontWait; diff --git a/patches/components-password_manager-core-common-password_manager_pref_names.h.patch b/patches/components-password_manager-core-common-password_manager_pref_names.h.patch index 4fb5f33be42..f8a31c88200 100644 --- a/patches/components-password_manager-core-common-password_manager_pref_names.h.patch +++ b/patches/components-password_manager-core-common-password_manager_pref_names.h.patch @@ -1,5 +1,5 @@ diff --git a/components/password_manager/core/common/password_manager_pref_names.h b/components/password_manager/core/common/password_manager_pref_names.h -index 35ae92638169e5194d8d8195653146de5523e503..113136f474ae085e0ae465fde6fba29d0d5b23c5 100644 +index e0d332e0c506eec106f08002b0bef4654fa76cb4..8d3ee151d15734ae6d0b86958b87e19b639e0a29 100644 --- a/components/password_manager/core/common/password_manager_pref_names.h +++ b/components/password_manager/core/common/password_manager_pref_names.h @@ -259,12 +259,10 @@ inline constexpr char kRelaunchChromeBubbleDismissedCounter[] = diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index 90b16110aaa..20669b179fb 100644 --- a/patches/components-permissions-BUILD.gn.patch +++ b/patches/components-permissions-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn -index a885babf07ef6c3f7d97269665ac0c60688fd328..d1ec740258afbb14e5685168c5c9b99c51c03c72 100644 +index 8ebad29a3ddd52e1c90a05fbd35e166bd03ee7ca..150ff70218b97d02b3dc44beacb5eda2f61d973a 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn @@ -6,7 +6,7 @@ import("//components/guest_view/buildflags/buildflags.gni") @@ -11,7 +11,7 @@ index a885babf07ef6c3f7d97269665ac0c60688fd328..d1ec740258afbb14e5685168c5c9b99c sources = [ "constants.cc", "constants.h", -@@ -181,6 +181,7 @@ source_set("permissions") { +@@ -182,6 +182,7 @@ source_set("permissions") { if (enable_guest_view) { deps += [ "//components/guest_view/browser" ] } diff --git a/patches/components-permissions-permission_request_manager.cc.patch b/patches/components-permissions-permission_request_manager.cc.patch index ccf757d6947..9fa1a31b30a 100644 --- a/patches/components-permissions-permission_request_manager.cc.patch +++ b/patches/components-permissions-permission_request_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc -index 0b2228b8b12275eb2a602609620790a017d17887..1588e8000748da0b41af2fd5cf557bdcc768ac2a 100644 +index 76a5facb99e6adf831b86b12c6122d645ced19d0..3aabe6ae296ffab2d73c89453c368019e476c549 100644 --- a/components/permissions/permission_request_manager.cc +++ b/components/permissions/permission_request_manager.cc -@@ -577,6 +577,7 @@ void PermissionRequestManager::OnVisibilityChanged( +@@ -601,6 +601,7 @@ void PermissionRequestManager::OnVisibilityChanged( } bool prior_tab_is_active_ = tab_is_active_; tab_is_active_ = visibility != content::Visibility::HIDDEN; @@ -10,7 +10,7 @@ index 0b2228b8b12275eb2a602609620790a017d17887..1588e8000748da0b41af2fd5cf557bdc if (prior_tab_is_active_ != tab_is_active_) { OnTabActiveChanged(); } -@@ -592,6 +593,7 @@ GURL PermissionRequestManager::GetRequestingOrigin() const { +@@ -616,6 +617,7 @@ GURL PermissionRequestManager::GetRequestingOrigin() const { GURL origin = requests_.front()->requesting_origin(); if (DCHECK_IS_ON()) { for (const auto& request : requests_) { @@ -18,7 +18,7 @@ index 0b2228b8b12275eb2a602609620790a017d17887..1588e8000748da0b41af2fd5cf557bdc DCHECK_EQ(origin, request->requesting_origin()); } } -@@ -934,7 +936,7 @@ void PermissionRequestManager::DequeueRequestIfNeeded() { +@@ -984,7 +986,7 @@ void PermissionRequestManager::DequeueRequestIfNeeded() { // only after the camera request is resolved. This is caused by code in // PermissionBubbleMediaAccessHandler and UserMediaClient. We probably don't // need two permission queues, so resolve the duplication. @@ -27,7 +27,7 @@ index 0b2228b8b12275eb2a602609620790a017d17887..1588e8000748da0b41af2fd5cf557bdc IsRequestInProgress()) { return; } -@@ -1032,7 +1034,7 @@ void PermissionRequestManager::ShowPrompt() { +@@ -1113,7 +1115,7 @@ void PermissionRequestManager::ShowPrompt() { return; } @@ -36,7 +36,7 @@ index 0b2228b8b12275eb2a602609620790a017d17887..1588e8000748da0b41af2fd5cf557bdc DCHECK(current_request_ui_to_use_); if (!tab_is_active_) { -@@ -1866,7 +1868,7 @@ void PermissionRequestManager::OnTabActiveChanged() { +@@ -1957,7 +1959,7 @@ void PermissionRequestManager::OnTabActiveChanged() { return; } diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index 650986deb66..b628cc606b0 100644 --- a/patches/components-permissions-permission_uma_util.cc.patch +++ b/patches/components-permissions-permission_uma_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc -index 75d98ddc10ab0050ee1943e666b22cf1d2cfed49..88370d3cec871b7da2a37fea23c609e60ed34f30 100644 +index 17b98cc80f8985953e1df9aa2eee9d4882619672..ff857e611f16a6df331f51adc4384d7241d44f61 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc -@@ -743,6 +743,7 @@ std::string GetPermissionStringForUma( +@@ -711,6 +711,7 @@ std::string GetPermissionStringForUma( case ContentSettingsType::LOOPBACK_NETWORK: return "LoopbackNetwork"; default: diff --git a/patches/components-permissions-permission_util.cc.patch b/patches/components-permissions-permission_util.cc.patch index ad565fde5b0..9c3fff969d3 100644 --- a/patches/components-permissions-permission_util.cc.patch +++ b/patches/components-permissions-permission_util.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc -index 350515ab09e16e82748fd0f97290baebea7fd23a..3163484aa3f9b797e66581c7efd3c430efc58684 100644 +index 1e0b4bfd8b31f9ccbd663e8bb7c3990a9fa9c879..0da4dd644f3ab1a254bfdc16abd60e5217257efa 100644 --- a/components/permissions/permission_util.cc +++ b/components/permissions/permission_util.cc -@@ -115,6 +115,7 @@ RequestTypeForUma PermissionUtil::GetUmaValueForRequests( +@@ -116,6 +116,7 @@ RequestTypeForUma PermissionUtil::GetUmaValueForRequests( if (requests.size() == 1) { return GetUmaValueForRequestType(request_type); } @@ -10,7 +10,7 @@ index 350515ab09e16e82748fd0f97290baebea7fd23a..3163484aa3f9b797e66581c7efd3c430 return permissions::GetUmaValueForRequests(request_type); } -@@ -214,6 +215,7 @@ RequestTypeForUma PermissionUtil::GetUmaValueForRequestType( +@@ -215,6 +216,7 @@ RequestTypeForUma PermissionUtil::GetUmaValueForRequestType( #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) case RequestType::kIdentityProvider: return RequestTypeForUma::PERMISSION_IDENTITY_PROVIDER; @@ -18,7 +18,7 @@ index 350515ab09e16e82748fd0f97290baebea7fd23a..3163484aa3f9b797e66581c7efd3c430 } } -@@ -555,6 +557,7 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( +@@ -554,6 +556,7 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( return ContentSettingsType::LOOPBACK_NETWORK; case PermissionType::NUM: break; diff --git a/patches/components-permissions-request_type.cc.patch b/patches/components-permissions-request_type.cc.patch index e3c5cef4394..7048e235214 100644 --- a/patches/components-permissions-request_type.cc.patch +++ b/patches/components-permissions-request_type.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/request_type.cc b/components/permissions/request_type.cc -index f7eea9fe1fbe4828e2b9b3a55d75948d5c3b6b65..5c798f12e4232a3d3417b3833f699417e496e059 100644 +index 39bad3ef7fc191ca8f1ce2a140a48f65b235ac22..4d107938e953420aceeb4cabbd32e0ab12c5323b 100644 --- a/components/permissions/request_type.cc +++ b/components/permissions/request_type.cc -@@ -501,6 +501,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { +@@ -497,6 +497,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { return "window_management"; case permissions::RequestType::kIdentityProvider: return "identity_provider"; diff --git a/patches/components-policy-resources-policy_templates.py.patch b/patches/components-policy-resources-policy_templates.py.patch index 4ba56964b06..086df69c39e 100644 --- a/patches/components-policy-resources-policy_templates.py.patch +++ b/patches/components-policy-resources-policy_templates.py.patch @@ -1,5 +1,5 @@ diff --git a/components/policy/resources/policy_templates.py b/components/policy/resources/policy_templates.py -index 1916e202522918a684af5c4e4c73288714df237c..f42c75470cec4e20c8016026909f86e16800e2e8 100755 +index 5ebad14f2cb7c6691074cead22c8d330c09f6065..099275487be938521bf4a3ecac2c6e55f347d96f 100755 --- a/components/policy/resources/policy_templates.py +++ b/components/policy/resources/policy_templates.py @@ -496,5 +496,6 @@ def main(): diff --git a/patches/components-policy-tools-generate_policy_source.py.patch b/patches/components-policy-tools-generate_policy_source.py.patch index 111e3e10605..3ca9936a40c 100644 --- a/patches/components-policy-tools-generate_policy_source.py.patch +++ b/patches/components-policy-tools-generate_policy_source.py.patch @@ -1,5 +1,5 @@ diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py -index cf36ecf5f4e61d71564cf17b7143cfe10d0a1dd8..e3dcc67bd661d9b86d98c120f4affd08794f33a1 100755 +index 328d9635e3dc1425190820334eee5930f58ac08a..b04d177e6288fbe51df11ca4a592744afcba5e23 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py @@ -1728,5 +1728,6 @@ def _WriteAppRestrictions(policies, policy_atomic_groups, target_platform, f, diff --git a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch index a48b9e53ff6..3f3cc1f049e 100644 --- a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch +++ b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc -index c4ebb7d3fd6e52756d0c841c06f4734022224791..a745461cc06bba241bbd5ff339aaacba9f2f03c5 100644 +index 3921d014f2065fa259f5382532772f7e79fcc50a..944bbacbc01b67394f434050718ed51b8c83eb7e 100644 --- a/components/safe_browsing/core/common/safe_browsing_prefs.cc +++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc @@ -167,6 +167,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) { diff --git a/patches/components-search_engines-BUILD.gn.patch b/patches/components-search_engines-BUILD.gn.patch index f206e7e8f47..3fc0186b511 100644 --- a/patches/components-search_engines-BUILD.gn.patch +++ b/patches/components-search_engines-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/search_engines/BUILD.gn b/components/search_engines/BUILD.gn -index a4e3a93c7cfcb8c21ad4660ec5ae438772ec8ced..9968216ec0da0fba48b41254e924499e42b1a487 100644 +index 1ac4232b1afb34ef8bda76c9e9cf3dd1330b2e61..b99ba0aec6f6b1f982c8965bdde734688ea25d9b 100644 --- a/components/search_engines/BUILD.gn +++ b/components/search_engines/BUILD.gn @@ -149,6 +149,7 @@ static_library("search_engines") { diff --git a/patches/components-search_engines-default_search_manager.cc.patch b/patches/components-search_engines-default_search_manager.cc.patch index c9e68c5a768..a5bf952b2ab 100644 --- a/patches/components-search_engines-default_search_manager.cc.patch +++ b/patches/components-search_engines-default_search_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc -index f358c84e594e228729b47b66d58075f02af7135a..a9154062e57d4243aacabd4645a4e45be0b7d60b 100644 +index 7dec2a6d91faf67fb4c5e95d0f7f0172197d6dbb..4331e6451ffc7d15f6a8c1cb7b76f544478f463b 100644 --- a/components/search_engines/default_search_manager.cc +++ b/components/search_engines/default_search_manager.cc @@ -352,6 +352,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { diff --git a/patches/components-signin-internal-identity_manager-BUILD.gn.patch b/patches/components-signin-internal-identity_manager-BUILD.gn.patch index ab841a40b56..935c331018d 100644 --- a/patches/components-signin-internal-identity_manager-BUILD.gn.patch +++ b/patches/components-signin-internal-identity_manager-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/signin/internal/identity_manager/BUILD.gn b/components/signin/internal/identity_manager/BUILD.gn -index 2057c470b967476ffdbbea54745d33da8688a6e5..8d8ab4508056439e9c8a3461e61dfc9c5e20ab97 100644 +index 46247d8976e4610af0d8ab544f7e277d5f76eba6..2c0d196027f408a28f79e25949762bf3dc4a54a1 100644 --- a/components/signin/internal/identity_manager/BUILD.gn +++ b/components/signin/internal/identity_manager/BUILD.gn -@@ -141,6 +141,7 @@ source_set("identity_manager") { +@@ -143,6 +143,7 @@ source_set("identity_manager") { "device_accounts_synchronizer_impl.h", ] } diff --git a/patches/components-sync-engine-sync_scheduler_impl.cc.patch b/patches/components-sync-engine-sync_scheduler_impl.cc.patch index e18a8d381d9..c2084fc5713 100644 --- a/patches/components-sync-engine-sync_scheduler_impl.cc.patch +++ b/patches/components-sync-engine-sync_scheduler_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/engine/sync_scheduler_impl.cc b/components/sync/engine/sync_scheduler_impl.cc -index 80b6650802b8e0cdb1c69ba69536266c1fa0162b..565d03beb22a7014646fc7266598dd54c6729737 100644 +index 7726a0d2c1e0e995ec08d8c03ae147e108663e6d..c9751d81dfee6cc0cd8605527ef5f45b9019455a 100644 --- a/components/sync/engine/sync_scheduler_impl.cc +++ b/components/sync/engine/sync_scheduler_impl.cc @@ -470,6 +470,7 @@ void SyncSchedulerImpl::HandleFailure( diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index 4f2d9f7d5d3..b8f8ac40b58 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,5 +1,5 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index 3c3d6a63a83ec11bc337239939e5d2c68078fb83..3fafcac9a465dacf30a4e5ebd1379d00756a343d 100644 +index 738d2ac9e8526c14714e01224ed75c5937568424..304bee6094fcfcdff5db8fad7665219fb896d6df 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h @@ -640,6 +640,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { diff --git a/patches/components-sync-protocol-protocol_sources.gni.patch b/patches/components-sync-protocol-protocol_sources.gni.patch index 15e46138fe3..0a706d461a5 100644 --- a/patches/components-sync-protocol-protocol_sources.gni.patch +++ b/patches/components-sync-protocol-protocol_sources.gni.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/protocol_sources.gni b/components/sync/protocol/protocol_sources.gni -index 355cb6c513bcea4d35d86cef433fbe24efc9708d..cf98d9fcd3fcf0654608c7bd30fa6d95301c56e3 100644 +index f2bda9c89283aff68f23d2ec05863062d237110a..5a6a02f1e3fce7a49d6fd3bd4581c49e6d139433 100644 --- a/components/sync/protocol/protocol_sources.gni +++ b/components/sync/protocol/protocol_sources.gni -@@ -91,3 +91,4 @@ sync_protocol_sources = [ +@@ -92,3 +92,4 @@ sync_protocol_sources = [ "wifi_configuration_specifics.proto", "workspace_desk_specifics.proto", ] diff --git a/patches/components-sync-service-BUILD.gn.patch b/patches/components-sync-service-BUILD.gn.patch index 29e1fa32105..f2418f419ca 100644 --- a/patches/components-sync-service-BUILD.gn.patch +++ b/patches/components-sync-service-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/service/BUILD.gn b/components/sync/service/BUILD.gn -index 30bd373703915456f978aec894593f07a1f853d4..d00aa1be7f32f8a148d009fcb7c217e7cf5fc9b0 100644 +index 88834a2ba5a768e7db3f20869464b4034c598cf5..1895e62b9da4a8d9fa8e662eaa0aae341bd9117e 100644 --- a/components/sync/service/BUILD.gn +++ b/components/sync/service/BUILD.gn -@@ -141,4 +141,5 @@ static_library("service") { +@@ -142,4 +142,5 @@ static_library("service") { } configs += [ "//build/config/compiler:wexit_time_destructors" ] diff --git a/patches/components-sync-service-sync_service_impl.h.patch b/patches/components-sync-service-sync_service_impl.h.patch index 3544a1426cf..683626f308b 100644 --- a/patches/components-sync-service-sync_service_impl.h.patch +++ b/patches/components-sync-service-sync_service_impl.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/service/sync_service_impl.h b/components/sync/service/sync_service_impl.h -index 6af479aaebc99691ce29662c1c8aea2a4c29afe6..15290326092146817e0e0f64d77a605fe6799088 100644 +index 712d33b8d334e22ffdadb7716258af5d819a3ddd..8a7c25daae369964dca55f5aa21771e49598a555 100644 --- a/components/sync/service/sync_service_impl.h +++ b/components/sync/service/sync_service_impl.h -@@ -287,6 +287,7 @@ class SyncServiceImpl : public SyncService, +@@ -298,6 +298,7 @@ class SyncServiceImpl : public SyncService, size_t GetQueuedLocalDataMigrationItemCountForTest() const; private: diff --git a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch index 6236c076afd..659461e35d2 100644 --- a/patches/components-sync_device_info-device_info_sync_bridge.cc.patch +++ b/patches/components-sync_device_info-device_info_sync_bridge.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/sync_device_info/device_info_sync_bridge.cc b/components/sync_device_info/device_info_sync_bridge.cc -index 92dd8f82c1505cdb20d425c8fedcc826e40f855d..59bb8733422c0ee05f4ea2360473e193bf3f67b9 100644 +index c3d74e39e6ad91faf7536f031a9a7cb4aab0602e..83c6d50e8b098d3198969ca7eadbe793792d50b2 100644 --- a/components/sync_device_info/device_info_sync_bridge.cc +++ b/components/sync_device_info/device_info_sync_bridge.cc @@ -290,6 +290,7 @@ std::unique_ptr MakeLocalDeviceSpecifics( @@ -10,7 +10,7 @@ index 92dd8f82c1505cdb20d425c8fedcc826e40f855d..59bb8733422c0ee05f4ea2360473e193 return specifics; } -@@ -477,6 +478,7 @@ std::optional DeviceInfoSyncBridge::ApplyIncrementalSyncChanges( +@@ -481,6 +482,7 @@ std::optional DeviceInfoSyncBridge::ApplyIncrementalSyncChanges( for (const std::unique_ptr& change : entity_changes) { const std::string guid = change->storage_key(); @@ -18,7 +18,7 @@ index 92dd8f82c1505cdb20d425c8fedcc826e40f855d..59bb8733422c0ee05f4ea2360473e193 // Reupload local device if it was deleted from the server. if (local_cache_guid_ == guid && change->type() == EntityChange::ACTION_DELETE) { -@@ -487,7 +489,7 @@ std::optional DeviceInfoSyncBridge::ApplyIncrementalSyncChanges( +@@ -491,7 +493,7 @@ std::optional DeviceInfoSyncBridge::ApplyIncrementalSyncChanges( // Ignore any remote changes that have a cache guid that is or was this // local device. if (device_info_prefs_->IsRecentLocalCacheGuid(guid)) { @@ -27,7 +27,7 @@ index 92dd8f82c1505cdb20d425c8fedcc826e40f855d..59bb8733422c0ee05f4ea2360473e193 } if (change->type() == EntityChange::ACTION_DELETE) { -@@ -838,6 +840,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata( +@@ -848,6 +850,7 @@ void DeviceInfoSyncBridge::OnReadAllMetadata( return; } @@ -35,7 +35,7 @@ index 92dd8f82c1505cdb20d425c8fedcc826e40f855d..59bb8733422c0ee05f4ea2360473e193 // In the regular case for sync being disabled, wait for MergeFullSyncData() // before initializing the LocalDeviceInfoProvider. if (!syncer::IsInitialSyncDone( -@@ -1068,6 +1071,7 @@ void DeviceInfoSyncBridge::ExpireOldEntries() { +@@ -1092,6 +1095,7 @@ void DeviceInfoSyncBridge::ExpireOldEntries() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); CHECK(store_); TRACE_EVENT0("sync", "DeviceInfoSyncBridge::ExpireOldEntries"); diff --git a/patches/components-update_client-pipeline.cc.patch b/patches/components-update_client-pipeline.cc.patch index 9735546cc1e..c941c2bc3a4 100644 --- a/patches/components-update_client-pipeline.cc.patch +++ b/patches/components-update_client-pipeline.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/update_client/pipeline.cc b/components/update_client/pipeline.cc -index 6fea3c9653e1eda2ad041630e1195325d4bd51a7..126a10a0b95eaeae5a8a30b3f0f8c97ab16e2fd7 100644 +index 8fc0aa57f455423a8c5c52b59dd6764f02ca70af..0abea80eaeac0b9b12a44c5822e40d952d1cc07b 100644 --- a/components/update_client/pipeline.cc +++ b/components/update_client/pipeline.cc @@ -78,9 +78,7 @@ constexpr CategorizedError kInvalidOperationAttributesError = CategorizedError( diff --git a/patches/components-webui-version-resources-about_version.css.patch b/patches/components-webui-version-resources-about_version.css.patch index fe02aa20c38..0470b153d5a 100644 --- a/patches/components-webui-version-resources-about_version.css.patch +++ b/patches/components-webui-version-resources-about_version.css.patch @@ -4,7 +4,7 @@ index 474768656bdae1d5c212bfd3034c8f8bfe718983..dcae794035dc71dc55e05ea3c58eff33 +++ b/components/webui/version/resources/about_version.css @@ -39,6 +39,7 @@ body { } - + #inner { + border-spacing: 0 5px; padding-top: 10px; diff --git a/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch b/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch index 22447318f17..ac34f4cb469 100644 --- a/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch +++ b/patches/content-app_shim_remote_cocoa-render_widget_host_view_cocoa.mm.patch @@ -1,8 +1,8 @@ diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm -index c464f0888f4e1e03be1837fedccd75a250f7ddbb..838202125a4867076be7db7d054b7e09e090749f 100644 +index 3077fba9f7fa7fb84adcac9ca6a9960385dfd2f5..b56d02174cfa9655777771083e26733c6a5d1ef9 100644 --- a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm +++ b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm -@@ -2084,6 +2084,7 @@ static NSWindow* __weak _deferredResignKeyWindow; +@@ -2083,6 +2083,7 @@ static NSWindow* __weak _deferredResignKeyWindow; } - (id)accessibilityParent { diff --git a/patches/content-browser-BUILD.gn.patch b/patches/content-browser-BUILD.gn.patch index a9cf9577193..27e7c785978 100644 --- a/patches/content-browser-BUILD.gn.patch +++ b/patches/content-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn -index c5dcbbc72d4a2b746d5aefe547658a51f251af37..602584808479f3fc1ae8ecf22bd87adaa2f8e2ec 100644 +index 2f57856179bffdc35ca14cc7b1419bee9d7bbf8e..dbcc1d8d7507e42107f84fcd66ccc8e8f91a9cea 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -3693,6 +3693,7 @@ source_set("browser") { +@@ -3711,6 +3711,7 @@ source_set("browser") { if (is_chromeos) { deps += [ "//ash/constants" ] } diff --git a/patches/content-browser-devtools-protocol_config.json.patch b/patches/content-browser-devtools-protocol_config.json.patch index 59bff1f12f6..df1d3024f28 100644 --- a/patches/content-browser-devtools-protocol_config.json.patch +++ b/patches/content-browser-devtools-protocol_config.json.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/devtools/protocol_config.json b/content/browser/devtools/protocol_config.json -index 8f15b6be44b7a35ee18fe51500bf0624358edc30..7bc52a960e2e4328daec388ec3d793f06a1cc946 100644 +index ffc0a2d8530607de99fe81943023d32cd6c0259a..985da36a723b42ec014be1922678127d4418533b 100644 --- a/content/browser/devtools/protocol_config.json +++ b/content/browser/devtools/protocol_config.json @@ -133,7 +133,7 @@ diff --git a/patches/content-browser-gpu-gpu_internals_ui.cc.patch b/patches/content-browser-gpu-gpu_internals_ui.cc.patch index a44d1961a54..e7cc085f714 100644 --- a/patches/content-browser-gpu-gpu_internals_ui.cc.patch +++ b/patches/content-browser-gpu-gpu_internals_ui.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc -index 391125fa7f01f4cf4262db0dde57d22a6c64d630..63b6ca02baf8bc9abc82b44e1c415af7538c56a1 100644 +index eb24f05c956bf825d8f0592329896d22899bc5e0..0fdc3471add81ff24d2e1ae4618c4699a4ab211c 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc -@@ -772,6 +772,7 @@ base::Value::Dict GpuMessageHandler::GetClientInfo() { +@@ -742,6 +742,7 @@ base::DictValue GpuMessageHandler::GetClientInfo() { std::string("Skia/" STRINGIZE(SK_MILESTONE) " " SKIA_COMMIT_HASH)); dict.Set("revision_identifier", GPU_LISTS_VERSION); diff --git a/patches/content-browser-renderer_host-clipboard_host_impl.cc.patch b/patches/content-browser-renderer_host-clipboard_host_impl.cc.patch index 7c55b9933bf..446f937083b 100644 --- a/patches/content-browser-renderer_host-clipboard_host_impl.cc.patch +++ b/patches/content-browser-renderer_host-clipboard_host_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/clipboard_host_impl.cc b/content/browser/renderer_host/clipboard_host_impl.cc -index cda88853d543e7298a5018b0bc9fe73af8507e8a..a87736c3c91cabf0dbf746958a4dc3b29a24f1dd 100644 +index 8a92a52eafc9d438d51347da3a9ef6bed63f35be..362966d3749066854b934426bc26eaa3675ac374 100644 --- a/content/browser/renderer_host/clipboard_host_impl.cc +++ b/content/browser/renderer_host/clipboard_host_impl.cc -@@ -493,6 +493,7 @@ void ClipboardHostImpl::WriteText(const std::u16string& text) { +@@ -540,6 +540,7 @@ void ClipboardHostImpl::WriteText(const std::u16string& text) { ClipboardPasteData data; data.text = text; ++pending_writes_; diff --git a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index b45c278afad..3240b7fa330 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index c4b8853161a810ef060fcec8c694224857913c98..d49cd38c1f1d81d1bf483001931009b5b177cb70 100644 +index ed4e4fe82902a072e99071c918f34b29ab407635..00a7f135a38097b755f1a7e64bbf8cbe1c861bb5 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc -@@ -4030,16 +4030,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( +@@ -4029,16 +4029,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( // Note: we intentionally leave the pending entry in place for renderer debug // URLs, unlike the cases below where we clear it if the navigation doesn't // proceed. diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 93b82aa2bf9..05305e9d8bb 100644 --- a/patches/content-browser-renderer_host-navigation_request.cc.patch +++ b/patches/content-browser-renderer_host-navigation_request.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc -index ce2a5092cea2172254a8787b0f06a667aa0c60a3..c79d50ff6cd5b5f7d5ba495aaaa05f8c7e4b2aa6 100644 +index 5b79df01e0a5ee81919ebed7d689e430fe7fe305..06c00683a37a35aadded6869c661a058bb0cfe74 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -3700,6 +3700,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -3732,6 +3732,7 @@ void NavigationRequest::OnRequestRedirected( common_params_->url = redirect_info.new_url; common_params_->method = redirect_info.new_method; common_params_->referrer->url = GURL(redirect_info.new_referrer); @@ -10,7 +10,7 @@ index ce2a5092cea2172254a8787b0f06a667aa0c60a3..c79d50ff6cd5b5f7d5ba495aaaa05f8c common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -5572,6 +5573,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -5637,6 +5638,7 @@ void NavigationRequest::OnStartChecksComplete( headers.MergeFrom(TakeModifiedRequestHeaders()); begin_params_->headers = headers.ToString(); diff --git a/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch b/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch index 7b936ac02ed..4252b8fa4c4 100644 --- a/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch +++ b/patches/content-browser-renderer_host-render_frame_host_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc -index b012b1cff358cb9e419666965dcb98392e64cb09..45f2b26e6a2d5df660f90f26f7c1a28d6ab9bf6d 100644 +index be7a71030dc5e30b3aa8945384c7a68ec7e49225..62e7a9502e007850b2bfb9772105623526ce6d60 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -5350,6 +5350,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( +@@ -5438,6 +5438,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( candidate_site_for_cookies = net::SiteForCookies(top_frame_site); } @@ -10,7 +10,7 @@ index b012b1cff358cb9e419666965dcb98392e64cb09..45f2b26e6a2d5df660f90f26f7c1a28d std::optional nonce = ComputeNonce(is_credentialless, fenced_frame_nonce_for_navigation); return net::IsolationInfo::Create( -@@ -5361,6 +5362,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( +@@ -5449,6 +5450,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( std::optional RenderFrameHostImpl::ComputeNonce( bool is_credentialless, std::optional fenced_frame_nonce_for_navigation) { @@ -18,7 +18,7 @@ index b012b1cff358cb9e419666965dcb98392e64cb09..45f2b26e6a2d5df660f90f26f7c1a28d // If it's a credentialless frame tree, use its nonce even if it's within a // fenced frame tree to maintain the guarantee that a credentialless frame // tree has a unique nonce. -@@ -9983,6 +9985,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -10038,6 +10040,7 @@ void RenderFrameHostImpl::CreateNewWindow( dom_storage_context, params->session_storage_namespace_id); } diff --git a/patches/content-browser-resources-gpu-info_view.ts.patch b/patches/content-browser-resources-gpu-info_view.ts.patch index 1b77ed8c16c..fdb4d3e61aa 100644 --- a/patches/content-browser-resources-gpu-info_view.ts.patch +++ b/patches/content-browser-resources-gpu-info_view.ts.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/resources/gpu/info_view.ts b/content/browser/resources/gpu/info_view.ts -index fa61fcfa1728d15f07348635e96eeb174cdf1c40..218f5cabcee90cb990d82f721eafa31e517e3dbe 100644 +index 3129874f01ae854a0d0f6b39c4f60612304e5ecb..44312f97f823f681a20b63469644632962458abb 100644 --- a/content/browser/resources/gpu/info_view.ts +++ b/content/browser/resources/gpu/info_view.ts @@ -529,6 +529,7 @@ export class InfoViewElement extends CustomElement { diff --git a/patches/content-browser-web_contents-web_contents_impl.cc.patch b/patches/content-browser-web_contents-web_contents_impl.cc.patch index 55b1c4c4998..aed1bea44f6 100644 --- a/patches/content-browser-web_contents-web_contents_impl.cc.patch +++ b/patches/content-browser-web_contents-web_contents_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc -index 395ba8bf66a026230094ccfd0420af12071d72d7..dd364f7d7d084492aea921722c2d7e27d3dc4a2e 100644 +index 345951d78dab34836dbb6d541f245cecaa2f1a67..1e403f217f77798587cabf23371fa226d3497e99 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -5320,6 +5320,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5328,6 +5328,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( // SiteInstance is created in a new BrowsingInstance. scoped_refptr site_instance; if (params.opener_suppressed) { @@ -10,7 +10,7 @@ index 395ba8bf66a026230094ccfd0420af12071d72d7..dd364f7d7d084492aea921722c2d7e27 if (is_guest) { // For guests, noopener windows can be created in a new BrowsingInstance // as long as they preserve the guest's StoragePartition. -@@ -5415,7 +5416,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5423,7 +5424,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( // Save the window for later if we're not suppressing the opener (since it // will be shown immediately). diff --git a/patches/content-browser-webui-web_ui_impl.cc.patch b/patches/content-browser-webui-web_ui_impl.cc.patch index a275b111e92..4eae2643e00 100644 --- a/patches/content-browser-webui-web_ui_impl.cc.patch +++ b/patches/content-browser-webui-web_ui_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc -index 4b1b9340ab33d0f3778c5775bdc0c533f4a20a2b..4d00a79ab6532c24de5a0dd7b49b2e6d5dbf68fe 100644 +index 80408dbad594078c0d25bad5683f71c68550abe7..0fe3557e102b9fc66fa29b8d85e261358cdecdc2 100644 --- a/content/browser/webui/web_ui_impl.cc +++ b/content/browser/webui/web_ui_impl.cc @@ -206,6 +206,7 @@ WebUIImpl::WebUIImpl(WebContents* web_contents) diff --git a/patches/content-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index 181f3ace0e9..b4d8a1d1865 100644 --- a/patches/content-common-BUILD.gn.patch +++ b/patches/content-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn -index 1df402ca32ab9774f9b130e9ab699557eff9aaef..5ad7f2c59aae0b39796a0fbf4a878090bc47c848 100644 +index 20b61c2dfc3433f02f5c6b8f25386b8a9a6011db..100ab767232b8a6ebb9afd7d4077ac48fdd2a6bf 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -62,6 +62,7 @@ source_set("common") { diff --git a/patches/content-common-frame.mojom.patch b/patches/content-common-frame.mojom.patch index 3901aab45b5..eb57279ee79 100644 --- a/patches/content-common-frame.mojom.patch +++ b/patches/content-common-frame.mojom.patch @@ -1,8 +1,8 @@ diff --git a/content/common/frame.mojom b/content/common/frame.mojom -index 4c55f0abf8df5a3408f3f90d444ceff3c23ee1bc..6e1cf93b976b773ecc859edfa0cff5d89cfa7f15 100644 +index ecfe129905639e9b7a5ed973017539cfaec9c2af..3016e1886750dcbb92e3a598831946fba622ddf3 100644 --- a/content/common/frame.mojom +++ b/content/common/frame.mojom -@@ -587,6 +587,7 @@ struct CreateNewWindowParams { +@@ -586,6 +586,7 @@ struct CreateNewWindowParams { // Whether the opener will be suppressed in the new window, in which case // scripting the new window is not allowed. bool opener_suppressed; diff --git a/patches/content-public-browser-BUILD.gn.patch b/patches/content-public-browser-BUILD.gn.patch index 94178ff8c4c..4b08cd31efc 100644 --- a/patches/content-public-browser-BUILD.gn.patch +++ b/patches/content-public-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn -index 126b81d81c49067bb06c0a347ca1ef7bcd11c192..018604fb82c173500bd9b64aa36c20d42395fe7a 100644 +index b9656de7a8fef51d329bd5d102ef0eb6260a58ec..25b4b6584b79dc12985fbcde67487050098698d5 100644 --- a/content/public/browser/BUILD.gn +++ b/content/public/browser/BUILD.gn -@@ -746,6 +746,7 @@ source_set("browser_sources") { +@@ -749,6 +749,7 @@ source_set("browser_sources") { if (use_clang_profiling_inside_sandbox) { sources += [ "profiling_utils.h" ] } diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index fc4c4295c35..acc8c128ed7 100644 --- a/patches/content-renderer-render_frame_impl.cc.patch +++ b/patches/content-renderer-render_frame_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc -index 76fea215163d0f7d0b5339fe2bcb97efe0218df7..af1fbee3b2e99c60da1c8e2d5d70b55f4e922c0d 100644 +index cd9a5bb5b14a00b555f86bee503fc3f8d51db80b..79caedb27a2aea01770fe0ef6c7091b5525b4181 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4786,6 +4786,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4804,6 +4804,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { // Temporarily return early and fix properly as part of // https://crbug.com/426555. if (web_view->MainFrame()->IsWebRemoteFrame()) diff --git a/patches/content-renderer-render_thread_impl.cc.patch b/patches/content-renderer-render_thread_impl.cc.patch index e967a6c53fc..e0525d18f84 100644 --- a/patches/content-renderer-render_thread_impl.cc.patch +++ b/patches/content-renderer-render_thread_impl.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc -index 16057c4a0ed0f700262c1c5835ca93a1db96bf6f..3807e7db49a4af8657cb2e848481bc8f6d01c82f 100644 +index 231e13b24a57984886b7220f2de4cf866c65a3a6..5fd08de17d0bc8602a9cdb1c44d5655098eee7ba 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -816,6 +816,7 @@ void RenderThreadImpl::InitializeRenderer( +@@ -813,6 +813,7 @@ void RenderThreadImpl::InitializeRenderer( } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/crypto-aead.cc.patch b/patches/crypto-aead.cc.patch index 9f60ea29d35..6c97f2ec162 100644 --- a/patches/crypto-aead.cc.patch +++ b/patches/crypto-aead.cc.patch @@ -1,8 +1,8 @@ diff --git a/crypto/aead.cc b/crypto/aead.cc -index 4dfbda365914505d1531aea91a54dc293305ec48..38d85456b8275bf7bc0bc0e190398592600a2ea5 100644 +index 286a7eeccf91a5cc6080afbba0e748e5fe7c29b4..2e16e63f6401f1142fba35d44f0be258b48ace25 100644 --- a/crypto/aead.cc +++ b/crypto/aead.cc -@@ -135,6 +135,7 @@ size_t Aead::KeyLength() const { +@@ -153,6 +153,7 @@ size_t Aead::KeyLength() const { } size_t Aead::NonceLength() const { diff --git a/patches/crypto-unexportable_key_metrics.cc.patch b/patches/crypto-unexportable_key_metrics.cc.patch index 3c372d973b4..dd5c1ea4604 100644 --- a/patches/crypto-unexportable_key_metrics.cc.patch +++ b/patches/crypto-unexportable_key_metrics.cc.patch @@ -1,5 +1,5 @@ diff --git a/crypto/unexportable_key_metrics.cc b/crypto/unexportable_key_metrics.cc -index 52bedd7c7c510f869e21352bab98ceb84b6f587d..46d078d09954e05115368e80059b92f6831b9a56 100644 +index 078fcfee33a467c3928803f60a3b5988f5a8e991..a7055c1ec8c2c74d0e70493d1b0b74dd685a9cd6 100644 --- a/crypto/unexportable_key_metrics.cc +++ b/crypto/unexportable_key_metrics.cc @@ -23,6 +23,7 @@ enum class KeyType { diff --git a/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch b/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch index aba253b46f2..3d126dc49da 100644 --- a/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch +++ b/patches/extensions-browser-api-web_request-extension_web_request_event_router.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/api/web_request/extension_web_request_event_router.cc b/extensions/browser/api/web_request/extension_web_request_event_router.cc -index 56eb018503d68181a0784f8c35d32e6dd68a3e53..ef65f267a3289c3efebf18470dd0dc3ab3206a6e 100644 +index 36a1cf7168aa74f5104eec68577fbc775e9628cf..cc06059c04f9e423acf23ab4d06cbfa6862388f8 100644 --- a/extensions/browser/api/web_request/extension_web_request_event_router.cc +++ b/extensions/browser/api/web_request/extension_web_request_event_router.cc -@@ -1462,6 +1462,7 @@ WebRequestEventRouter::OnAuthRequired(content::BrowserContext* browser_context, +@@ -1468,6 +1468,7 @@ WebRequestEventRouter::OnAuthRequired(content::BrowserContext* browser_context, *request)) { return AuthRequiredResponse::AUTH_REQUIRED_RESPONSE_NO_ACTION; } diff --git a/patches/extensions-renderer-native_extension_bindings_system.h.patch b/patches/extensions-renderer-native_extension_bindings_system.h.patch index 0243ef15603..9a75faa17b6 100644 --- a/patches/extensions-renderer-native_extension_bindings_system.h.patch +++ b/patches/extensions-renderer-native_extension_bindings_system.h.patch @@ -1,5 +1,5 @@ diff --git a/extensions/renderer/native_extension_bindings_system.h b/extensions/renderer/native_extension_bindings_system.h -index a45fd3b2541eafe848ca45450e10f761581881e9..c6577b71f2105e57fd11162136b4bb2ef72c8737 100644 +index 92766a9503349379fc9de474da5b486b23109e4f..92d8b533781e24a94a336b6d45c91b3a2f409b56 100644 --- a/extensions/renderer/native_extension_bindings_system.h +++ b/extensions/renderer/native_extension_bindings_system.h @@ -51,6 +51,7 @@ class NativeExtensionBindingsSystem { diff --git a/patches/ios-chrome-app-BUILD.gn.patch b/patches/ios-chrome-app-BUILD.gn.patch index 732c6c50800..5d061113981 100644 --- a/patches/ios-chrome-app-BUILD.gn.patch +++ b/patches/ios-chrome-app-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/app/BUILD.gn b/ios/chrome/app/BUILD.gn -index 1b4937d098bc506de22f8b1b065ff0a3abd64266..65a1f78acc7354081486342e627ea5b30eb3cde7 100644 +index eba81ac589cb58124d22f0da9ac9cb42a501be1c..36806f85804fe2859e132a4687e1c08e41ebe8b5 100644 --- a/ios/chrome/app/BUILD.gn +++ b/ios/chrome/app/BUILD.gn -@@ -810,8 +810,7 @@ chrome_app("chrome") { +@@ -829,8 +829,7 @@ chrome_app("chrome") { # (see https://crbug.com/1394553 for details of the build failure). This # is a stop-gap solution. if (target_environment == "catalyst" || diff --git a/patches/ios-chrome-browser-flags-BUILD.gn.patch b/patches/ios-chrome-browser-flags-BUILD.gn.patch index 88bc116b676..4b7e383027f 100644 --- a/patches/ios-chrome-browser-flags-BUILD.gn.patch +++ b/patches/ios-chrome-browser-flags-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/flags/BUILD.gn b/ios/chrome/browser/flags/BUILD.gn -index b3e3ccd48cd5798047cf160025d3dd9898e10849..589e2b0868745254383db49f7e6e866f2b103576 100644 +index 6e357700dcb3ff115eedaa52c53715dfbe39bc09..73d0529c8a69e21ca1922dba23f0448230535374 100644 --- a/ios/chrome/browser/flags/BUILD.gn +++ b/ios/chrome/browser/flags/BUILD.gn -@@ -118,6 +118,7 @@ source_set("flags") { +@@ -120,6 +120,7 @@ source_set("flags") { "//ios/web/common:web_view_creation_util", "//ios/web/public", ] diff --git a/patches/ios-chrome-browser-flags-about_flags.mm.patch b/patches/ios-chrome-browser-flags-about_flags.mm.patch index 1fc877430ea..fbe3163ee9d 100644 --- a/patches/ios-chrome-browser-flags-about_flags.mm.patch +++ b/patches/ios-chrome-browser-flags-about_flags.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/flags/about_flags.mm b/ios/chrome/browser/flags/about_flags.mm -index 26a622974de714167c816e961c919119e3320682..f97ac0ef96771bfc9605c6d2db6fa19f13f947c8 100644 +index a8bf6c7212a8072082a02c1cefb9cf537ea98d26..5eaf9e2b16c771c1b8e865fb81abc6550528d39c 100644 --- a/ios/chrome/browser/flags/about_flags.mm +++ b/ios/chrome/browser/flags/about_flags.mm -@@ -1449,6 +1449,7 @@ const FeatureEntry::FeatureVariation kPersistTabContextVariations[] = { +@@ -1402,6 +1402,7 @@ const FeatureEntry::FeatureVariation kPageActionMenuIconVariations[] = { // // When adding a new choice, add it to the end of the list. constexpr auto kFeatureEntries = std::to_array({ diff --git a/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch b/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch index 2ec3f2acf7b..66c56311fab 100644 --- a/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch +++ b/patches/ios-chrome-browser-shared-model-prefs-browser_prefs.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm -index 31f6d09c679aebf6ae7fc8a1ff59c7c0d8355f4a..e445447e6f25432c04df70159305f6002f88a503 100644 +index e8e3964d4ec7ea11cb2c9d0aed356d432df2a4c0..d75893d31fd2617856694dca7b7bbf674097835d 100644 --- a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm +++ b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm -@@ -647,6 +647,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { +@@ -649,6 +649,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) { // Deprecated 01/2026. registry->RegisterListPref(kMagicStackSafetyCheckNotificationsShown); registry->RegisterListPref(kBottomOmniboxByDefault); @@ -10,7 +10,7 @@ index 31f6d09c679aebf6ae7fc8a1ff59c7c0d8355f4a..e445447e6f25432c04df70159305f600 } void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { -@@ -1123,6 +1124,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { +@@ -1126,6 +1127,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) { // Deprecated 12/2025. registry->RegisterStringPref(kAutofillStatesDataDir, std::string()); registry->RegisterBooleanPref(prefs::kIosMiniMapShowNativeMap, true); diff --git a/patches/ios-web-webui-url_data_manager_ios_backend.mm.patch b/patches/ios-web-webui-url_data_manager_ios_backend.mm.patch index d26a137e830..732dcce013a 100644 --- a/patches/ios-web-webui-url_data_manager_ios_backend.mm.patch +++ b/patches/ios-web-webui-url_data_manager_ios_backend.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/web/webui/url_data_manager_ios_backend.mm b/ios/web/webui/url_data_manager_ios_backend.mm -index 48b83c9a1bc1c11db14efaf143f44fb9a25a1cce..72a2f2a595dc7e8436261131a70f5146275bf01e 100644 +index f2745e229903abe72236e6e8cc1b1d3ffc16966e..6577c56db9477a47b98343fc470aa92e130dc0b2 100644 --- a/ios/web/webui/url_data_manager_ios_backend.mm +++ b/ios/web/webui/url_data_manager_ios_backend.mm -@@ -347,7 +347,7 @@ void URLRequestChromeJob::GetResponseInfo(net::HttpResponseInfo* info) { +@@ -348,7 +348,7 @@ void URLRequestChromeJob::GetResponseInfo(net::HttpResponseInfo* info) { // that is compatible with a given WebUI URL, and append it to the existing // response headers. if (add_content_security_policy_) { diff --git a/patches/mojo-public-tools-bindings-checks-mojom_attributes_check.py.patch b/patches/mojo-public-tools-bindings-checks-mojom_attributes_check.py.patch index 9b2284b10ba..086a3866790 100644 --- a/patches/mojo-public-tools-bindings-checks-mojom_attributes_check.py.patch +++ b/patches/mojo-public-tools-bindings-checks-mojom_attributes_check.py.patch @@ -1,5 +1,5 @@ diff --git a/mojo/public/tools/bindings/checks/mojom_attributes_check.py b/mojo/public/tools/bindings/checks/mojom_attributes_check.py -index 49a792cbdf1db2d7e97d5982ccb47bda89ec7064..be8c9fd2e0e1f95744d4d765b821093ed9363c31 100644 +index 9b3618b9f8f2d296733658828598d9341a4db1b9..1451c399ef51af9b349efc3b004722480bc7feac 100644 --- a/mojo/public/tools/bindings/checks/mojom_attributes_check.py +++ b/mojo/public/tools/bindings/checks/mojom_attributes_check.py @@ -7,6 +7,7 @@ import mojom.generate.check as check @@ -10,7 +10,7 @@ index 49a792cbdf1db2d7e97d5982ccb47bda89ec7064..be8c9fd2e0e1f95744d4d765b821093e 'EnableIf', 'EnableIfNot', 'VendorSpecified', -@@ -186,6 +187,7 @@ _NATIVE_ALLOWLIST = { +@@ -177,6 +178,7 @@ _NATIVE_ALLOWLIST = { 'search.mojom.OmniboxFocusState', 'ui.mojom.EventPointerType', 'ui.mojom.ScrollGranularity', diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 7e1dacf51ce..049c00f00b1 100644 --- a/patches/net-BUILD.gn.patch +++ b/patches/net-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/net/BUILD.gn b/net/BUILD.gn -index c44865e2b78c17006bfa70370f8e7c41bfc0121b..2d0b184839a874c1c9b5f19726887622658313e4 100644 +index 6ea3f02025d04480826a2ed542dbbb39eeb65369..d9f2697e0a6fd3658f63e9d3c04fe005a8155d99 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1269,6 +1269,7 @@ component("net") { +@@ -1273,6 +1273,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/net-base-proxy_server.cc.patch b/patches/net-base-proxy_server.cc.patch index 398d996e339..5d027610ee3 100644 --- a/patches/net-base-proxy_server.cc.patch +++ b/patches/net-base-proxy_server.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/base/proxy_server.cc b/net/base/proxy_server.cc -index 5a7f32bda80d6270e87659df928d77597495429b..3bb6a11641ee972f52f8cd17218d731b878ce239 100644 +index 42554e13328632066469b9385214e3130abb7991..8fe037a417b31bf5d44e0fdd0ea411721ff30879 100644 --- a/net/base/proxy_server.cc +++ b/net/base/proxy_server.cc -@@ -77,6 +77,7 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(Scheme scheme, +@@ -76,6 +76,7 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(Scheme scheme, ProxyServer ProxyServer::FromSchemeHostAndPort(Scheme scheme, std::string_view host, std::optional port) { @@ -10,7 +10,7 @@ index 5a7f32bda80d6270e87659df928d77597495429b..3bb6a11641ee972f52f8cd17218d731b // Create INVALID proxies directly using `ProxyServer()`. DCHECK_NE(scheme, SCHEME_INVALID); -@@ -115,6 +116,7 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(Scheme scheme, +@@ -114,6 +115,7 @@ ProxyServer ProxyServer::FromSchemeHostAndPort(Scheme scheme, // A uint16_t port is always valid and canonicalized. uint16_t fixed_port = port.value_or(GetDefaultPortForScheme(scheme)); diff --git a/patches/net-cookies-canonical_cookie.cc.patch b/patches/net-cookies-canonical_cookie.cc.patch index 25a9deac817..46bad733ea6 100644 --- a/patches/net-cookies-canonical_cookie.cc.patch +++ b/patches/net-cookies-canonical_cookie.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/cookies/canonical_cookie.cc b/net/cookies/canonical_cookie.cc -index 8c50aacf9b0b9d4d668eb4c3ebe5038288a51da8..102b2e43f5ba2564e20a350c1d2c9c76fc4d6ca8 100644 +index acd8a08369d4213a61929963379f53aa43779b97..ce4293bbf7d76dc82759f38a74a1866d37bec638 100644 --- a/net/cookies/canonical_cookie.cc +++ b/net/cookies/canonical_cookie.cc @@ -324,6 +324,7 @@ base::Time CanonicalCookie::ValidateAndAdjustExpiryDate( diff --git a/patches/net-dns-BUILD.gn.patch b/patches/net-dns-BUILD.gn.patch index 6b6734dfce5..7a8d8bdd067 100644 --- a/patches/net-dns-BUILD.gn.patch +++ b/patches/net-dns-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/net/dns/BUILD.gn b/net/dns/BUILD.gn -index 5ed1605df7339b504838dfd949772b47ed72a89f..98300ec0e360df7ee785b648fb9cd0ba8f10bf37 100644 +index c83337113e00bea81e6e79070ffd94b79a1d3162..e4b573648eb01250d26933fe732cf88d07d89cd5 100644 --- a/net/dns/BUILD.gn +++ b/net/dns/BUILD.gn @@ -112,6 +112,7 @@ source_set("dns") { diff --git a/patches/net-dns-host_cache.cc.patch b/patches/net-dns-host_cache.cc.patch index 2bb4e007c1c..0e7f164d106 100644 --- a/patches/net-dns-host_cache.cc.patch +++ b/patches/net-dns-host_cache.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/dns/host_cache.cc b/net/dns/host_cache.cc -index 27d379df459ea25f93cf72d842eecdb841679814..c7fbd13c5ebb75517c91d1c1707f386d63ca0bfe 100644 +index db5a8351aa1a814978965d154d01e06cfdf18820..24c70f4df59a4d1cc4ca66c66097afa6ad4bc443 100644 --- a/net/dns/host_cache.cc +++ b/net/dns/host_cache.cc @@ -502,6 +502,7 @@ HostCache::Entry HostCache::Entry::CopyWithDefaultPort(uint16_t port) const { diff --git a/patches/net-dns-host_resolver_manager_job.cc.patch b/patches/net-dns-host_resolver_manager_job.cc.patch index e03ad368ecb..5e1bc9e7d43 100644 --- a/patches/net-dns-host_resolver_manager_job.cc.patch +++ b/patches/net-dns-host_resolver_manager_job.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/dns/host_resolver_manager_job.cc b/net/dns/host_resolver_manager_job.cc -index 88ec198499b819a0548e95251523e0b384d0694d..daa0d8a56197d44c489fa454f65e15b557e2956c 100644 +index 3d7eda059c34b74b637e2e3dba2c74883c03239a..6b8adaadb71f45a3e0b55e5e3d5ae04d0062ac30 100644 --- a/net/dns/host_resolver_manager_job.cc +++ b/net/dns/host_resolver_manager_job.cc -@@ -1097,6 +1097,7 @@ void HostResolverManager::Job::CompleteRequests( +@@ -1098,6 +1098,7 @@ void HostResolverManager::Job::CompleteRequests( } RecordJobHistograms(results, task_type); diff --git a/patches/net-http-transport_security_state.cc.patch b/patches/net-http-transport_security_state.cc.patch index 0767a454088..88e45563ded 100644 --- a/patches/net-http-transport_security_state.cc.patch +++ b/patches/net-http-transport_security_state.cc.patch @@ -1,5 +1,5 @@ diff --git a/net/http/transport_security_state.cc b/net/http/transport_security_state.cc -index 73b325ddaead5190847fa40241bdd637c1babf1d..49a433f903a704fe0f0ceb317cfbbe000ed9c4a1 100644 +index 6366d90fc4748c72d15b4273c16f39c1f518915f..f8c5b1abe8a680db8b68810945965a211f302d4c 100644 --- a/net/http/transport_security_state.cc +++ b/net/http/transport_security_state.cc @@ -237,6 +237,7 @@ TransportSecurityState::TransportSecurityState( diff --git a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch index 4c7c73dfde0..40df1164990 100644 --- a/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch +++ b/patches/net-proxy_resolution-configured_proxy_resolution_service.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/proxy_resolution/configured_proxy_resolution_service.cc b/net/proxy_resolution/configured_proxy_resolution_service.cc -index 5febe93426dc147285c47e6aa7ccc0058c2e4c29..6c2a7de95c90bf887e016a795a689edebaa13ee3 100644 +index d79c6b342d6badf36fc820bd66b6c2d54e906b14..20ee310689c876cf6907d6c6c3f523e4ebbd5dbe 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc -@@ -1005,6 +1005,7 @@ int ConfiguredProxyResolutionService::ResolveProxy( +@@ -1004,6 +1004,7 @@ int ConfiguredProxyResolutionService::ResolveProxy( // using a direct connection for example). int rv = TryToCompleteSynchronously(url, /*bypass_override_rules=*/false, net_log, result); diff --git a/patches/remoting-host-installer-linux-installer.include.patch b/patches/remoting-host-installer-linux-installer.include.patch index 0a480652bf0..1616965dffd 100644 --- a/patches/remoting-host-installer-linux-installer.include.patch +++ b/patches/remoting-host-installer-linux-installer.include.patch @@ -1,8 +1,8 @@ diff --git a/remoting/host/installer/linux/installer.include b/remoting/host/installer/linux/installer.include -index 1659892790b5844697fe5968628d4790325c3661..96b1c729ad6c4bfd81668f1f5222658431d7680f 100644 +index 6c74d865ee58d6eba547874cdebea5145c080418..2072e258efa6aa3f6ce96af4de18a91b4ec0b6e6 100644 --- a/remoting/host/installer/linux/installer.include +++ b/remoting/host/installer/linux/installer.include -@@ -145,6 +145,8 @@ stage_install_common() { +@@ -147,6 +147,8 @@ stage_install_common() { install -m 644 "${OUTPUTDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/" fi @@ -11,7 +11,7 @@ index 1659892790b5844697fe5968628d4790325c3661..96b1c729ad6c4bfd81668f1f52226584 # ICU data file; Necessary when the GN icu_use_data_file flag is true. install -m 644 "${OUTPUTDIR}/icudtl.dat" "${STAGEDIR}/${INSTALLDIR}/" -@@ -283,13 +285,15 @@ stage_install_common() { +@@ -285,13 +287,15 @@ stage_install_common() { # app icons local icon_suffix="" diff --git a/patches/sandbox-policy-win-sandbox_win.cc.patch b/patches/sandbox-policy-win-sandbox_win.cc.patch index ed0c293d436..b3684a889a6 100644 --- a/patches/sandbox-policy-win-sandbox_win.cc.patch +++ b/patches/sandbox-policy-win-sandbox_win.cc.patch @@ -1,8 +1,8 @@ diff --git a/sandbox/policy/win/sandbox_win.cc b/sandbox/policy/win/sandbox_win.cc -index 0055cd94889eb5b3219a94f7d853f093a1501329..bee6096a9cfb79a6fe60a089c06dfabad8344bff 100644 +index 2266ec1424b23841e0215ffefa4506f108368bc2..07494bfeab466205817d893b8069a04fb61fdbd4 100644 --- a/sandbox/policy/win/sandbox_win.cc +++ b/sandbox/policy/win/sandbox_win.cc -@@ -612,6 +612,7 @@ ResultCode LaunchWithoutSandbox( +@@ -623,6 +623,7 @@ ResultCode LaunchWithoutSandbox( base::LaunchOptions options; options.handles_to_inherit = handles_to_inherit; options.feedback_cursor_off = true; diff --git a/patches/services-network-cors-cors_url_loader.cc.patch b/patches/services-network-cors-cors_url_loader.cc.patch index 6337cb9a671..09ac8374955 100644 --- a/patches/services-network-cors-cors_url_loader.cc.patch +++ b/patches/services-network-cors-cors_url_loader.cc.patch @@ -1,8 +1,8 @@ diff --git a/services/network/cors/cors_url_loader.cc b/services/network/cors/cors_url_loader.cc -index ff38ea97f8007136bb6a75aeab1d3a2464ac89a0..f638fbf52cb821d6af4d0492ad1e171a047d42d3 100644 +index ad7380b048d56356e1ec9f5481444cc7f26bf6e1..d220466cf6aa7f263e3622740323498079f2b62c 100644 --- a/services/network/cors/cors_url_loader.cc +++ b/services/network/cors/cors_url_loader.cc -@@ -886,6 +886,7 @@ void CorsURLLoader::StartRequest() { +@@ -877,6 +877,7 @@ void CorsURLLoader::StartRequest() { }; if (should_include_origin_header()) { diff --git a/patches/services-network-public-cpp-BUILD.gn.patch b/patches/services-network-public-cpp-BUILD.gn.patch index 3795f86ff11..8134bbc4188 100644 --- a/patches/services-network-public-cpp-BUILD.gn.patch +++ b/patches/services-network-public-cpp-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/services/network/public/cpp/BUILD.gn b/services/network/public/cpp/BUILD.gn -index b48bdf27cd97142ceebc1f0b769b502bf037ce36..fe310b4973c7d346ace1347d6e039efbcc6c7be3 100644 +index fe41eb9197024cf6a2d10171d113d2273eb3a082..c6fb2a028c7a185c8d0849747960c4c442c3d6bc 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn -@@ -195,6 +195,7 @@ component("cpp") { +@@ -204,6 +204,7 @@ component("cpp") { "//services/proxy_resolver/public/mojom", ] diff --git a/patches/services-network-public-cpp-permissions_policy-permissions_policy_features.json5.patch b/patches/services-network-public-cpp-permissions_policy-permissions_policy_features.json5.patch index d4bdf4dd08f..5a58ea642e7 100644 --- a/patches/services-network-public-cpp-permissions_policy-permissions_policy_features.json5.patch +++ b/patches/services-network-public-cpp-permissions_policy-permissions_policy_features.json5.patch @@ -1,8 +1,8 @@ diff --git a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 -index 30d7177263d6fbbf466c49666f9d08a21817178d..81d5804cdb7f0d67feb3ba18e8d0d876b2c74f11 100644 +index 9068fa91e75da9f9a91641eaadff3c68be90d618..81d6b74b627c103f5f22e0446588d67be076adc8 100644 --- a/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 +++ b/services/network/public/cpp/permissions_policy/permissions_policy_features.json5 -@@ -639,6 +639,18 @@ +@@ -669,6 +669,18 @@ permissions_policy_name: "writer", depends_on: ["AIWriterAPI"], }, diff --git a/patches/third_party-blink-common-BUILD.gn.patch b/patches/third_party-blink-common-BUILD.gn.patch index 1dd552fa2e0..0301bd6f0bf 100644 --- a/patches/third_party-blink-common-BUILD.gn.patch +++ b/patches/third_party-blink-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/common/BUILD.gn b/third_party/blink/common/BUILD.gn -index 4a8b8a1202bda8b9f134986ac5a5c008206fb11e..21a88bde76c48c59aa7871b133cd5a803002562e 100644 +index f56621d3f7602c4d002b2ce406099e09ddb6a4c5..4f0554fe0dc981687acb35bfe1fbeea9034a4360 100644 --- a/third_party/blink/common/BUILD.gn +++ b/third_party/blink/common/BUILD.gn @@ -353,6 +353,7 @@ source_set("common") { diff --git a/patches/third_party-blink-common-permissions-permission_utils.cc.patch b/patches/third_party-blink-common-permissions-permission_utils.cc.patch index 4dfecbfd3bd..4087a86da51 100644 --- a/patches/third_party-blink-common-permissions-permission_utils.cc.patch +++ b/patches/third_party-blink-common-permissions-permission_utils.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/common/permissions/permission_utils.cc b/third_party/blink/common/permissions/permission_utils.cc -index 47e020ed0e706dee01fbee90a2af2fe6c521cd9b..9c0dc6954d2c9386a2abeb8fcb14a2f7ac041d3f 100644 +index 0d873c13f1463d37e0fcdeacf68a84817b6524ca..104a4bec1d4cf76cd9af9065cfe3ad4786821ede 100644 --- a/third_party/blink/common/permissions/permission_utils.cc +++ b/third_party/blink/common/permissions/permission_utils.cc @@ -28,6 +28,7 @@ mojom::PermissionStatus ToPermissionStatus(const std::string& status) { diff --git a/patches/third_party-blink-public-common-BUILD.gn.patch b/patches/third_party-blink-public-common-BUILD.gn.patch index cb6d91c0cad..02012dc183c 100644 --- a/patches/third_party-blink-public-common-BUILD.gn.patch +++ b/patches/third_party-blink-public-common-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/public/common/BUILD.gn b/third_party/blink/public/common/BUILD.gn -index b99ad29cdafac25111c578f3e3d5789b3f4035ca..0561467368a1e7d900b0cfaa28c77aae22139939 100644 +index 5c9ec078225e7b038ea5da4ed6dc23e3d23f13d4..15931ba7d1646123d194e6c58e44ce9e6eb09754 100644 --- a/third_party/blink/public/common/BUILD.gn +++ b/third_party/blink/public/common/BUILD.gn @@ -390,6 +390,7 @@ source_set("headers") { diff --git a/patches/third_party-blink-public-mojom-BUILD.gn.patch b/patches/third_party-blink-public-mojom-BUILD.gn.patch index 55b39cba552..71c1ebf8a10 100644 --- a/patches/third_party-blink-public-mojom-BUILD.gn.patch +++ b/patches/third_party-blink-public-mojom-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/public/mojom/BUILD.gn b/third_party/blink/public/mojom/BUILD.gn -index 22ffc2699e5b909bf323f5bf53906acf6208a9e1..b55608c3017636d5691d476a4634167cdac6d297 100644 +index a59bb1960b98796790f624b9d7571dc64eea5cf7..3be8729ae34a3e77525b47fbaeded301918a4fe7 100644 --- a/third_party/blink/public/mojom/BUILD.gn +++ b/third_party/blink/public/mojom/BUILD.gn -@@ -1131,6 +1131,7 @@ mojom("mojom_platform") { +@@ -1129,6 +1129,7 @@ mojom("mojom_platform") { ] cpp_typemaps += shared_cpp_typemaps blink_cpp_typemaps += shared_cpp_typemaps diff --git a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch index 73c2d6588be..f9b9184a271 100644 --- a/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-generated_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/generated_in_modules.gni b/third_party/blink/renderer/bindings/generated_in_modules.gni -index 33e1d702850b08077a3471d73c7f53999b1d3f2d..36b24e7a81f5fb9751c4b2d517b6601497209ede 100644 +index ca5996cfa12f9cb6792a50af5e28d50a1c91d312..cd13916431be8ee76ebdbbde24051c9a624aa050 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -3225,6 +3225,7 @@ generated_interface_sources_in_modules = [ +@@ -3231,6 +3231,7 @@ generated_interface_sources_in_modules = [ "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.cc", "$root_gen_dir/third_party/blink/renderer/bindings/modules/v8/v8_xr_webgl_sub_image.h", ] diff --git a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch index 79ad0b7b4c9..e7e812918b9 100644 --- a/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch +++ b/patches/third_party-blink-renderer-bindings-idl_in_modules.gni.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/idl_in_modules.gni b/third_party/blink/renderer/bindings/idl_in_modules.gni -index 8af8798485bb6827fd21c2e705976defbebf7678..a55cf31a87faeb62dbd9dd8464bb000a9109f26f 100644 +index ce95bf431cd9be464d39025f1d81f144ad2d664f..ed77ca02f92ee83197cf01aa62d2802cc8128655 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1275,6 +1275,7 @@ static_idl_files_in_modules = [ +@@ -1274,6 +1274,7 @@ static_idl_files_in_modules = [ "//third_party/blink/renderer/modules/xr/xr_webgl_layer_init.idl", "//third_party/blink/renderer/modules/xr/xr_webgl_sub_image.idl", ] diff --git a/patches/third_party-blink-renderer-core-BUILD.gn.patch b/patches/third_party-blink-renderer-core-BUILD.gn.patch index d941da17ca1..9ca9eb4080c 100644 --- a/patches/third_party-blink-renderer-core-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-core-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/BUILD.gn b/third_party/blink/renderer/core/BUILD.gn -index 4dabfb153a0ef874b22ac958c39114fc78fbf009..048d5bbc726b6cf8726f56602c98e658dd41e42f 100644 +index c8135570f00e9bd737bd775478ea5a8642507d7a..a35565dcf5c9ca046593d16519bd645d1b4b205a 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn -@@ -470,6 +470,7 @@ component("core") { +@@ -471,6 +471,7 @@ component("core") { "Carbon.framework", ] } diff --git a/patches/third_party-blink-renderer-core-frame-cached_permission_status.cc.patch b/patches/third_party-blink-renderer-core-frame-cached_permission_status.cc.patch index 2ffc69b3873..96f51aef9ac 100644 --- a/patches/third_party-blink-renderer-core-frame-cached_permission_status.cc.patch +++ b/patches/third_party-blink-renderer-core-frame-cached_permission_status.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/frame/cached_permission_status.cc b/third_party/blink/renderer/core/frame/cached_permission_status.cc -index e97c3689b5cad543afc37206e49fb57ef57ecf2f..139101bac73f36b5a14756fa0584e2071959a685 100644 +index 5db79ee31a48167a1c2d082dbb3527888fab580c..dc6cb707e3702ec857a016a8e273d552ab7c1c4f 100644 --- a/third_party/blink/renderer/core/frame/cached_permission_status.cc +++ b/third_party/blink/renderer/core/frame/cached_permission_status.cc @@ -15,7 +15,6 @@ using mojom::blink::PermissionDescriptorPtr; @@ -10,7 +10,7 @@ index e97c3689b5cad543afc37206e49fb57ef57ecf2f..139101bac73f36b5a14756fa0584e207 // static const char CachedPermissionStatus::kSupplementName[] = "CachedPermissionStatus"; -@@ -52,7 +51,7 @@ void CachedPermissionStatus::Trace(Visitor* visitor) const { +@@ -53,7 +52,7 @@ void CachedPermissionStatus::Trace(Visitor* visitor) const { void CachedPermissionStatus::RegisterClient( Client* client, const Vector& permissions) { diff --git a/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch b/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch index 3927e586d16..ee85b4323ee 100644 --- a/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch +++ b/patches/third_party-blink-renderer-core-frame-local_dom_window.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/frame/local_dom_window.cc b/third_party/blink/renderer/core/frame/local_dom_window.cc -index 9253fb513782b7a3c785bfd5e50bc4fca382b201..afc61c47783bfd636aa9103bc40f373252d4bc48 100644 +index c425735d53a8a79c9ce20c049506659c17b51be3..5dfb4c08d67deec585dfd4fa1af3b7ffb0e7713d 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc @@ -501,6 +501,7 @@ bool LocalDOMWindow::CanExecuteScripts( diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch index 3cc0dff9549..81ebc8891d2 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -index 7206de7c662730f969b03084aaa4665e25380c56..07ed1fcca9813a89d2f1a6e33c7c15072d0d9eb8 100644 +index f95a360b8daf4cb11608e794dae4bcedd9fe0e5f..5267428179a10b492e435a0093b6536af5cc4c1f 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.cc -@@ -1310,6 +1310,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -1318,6 +1318,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch b/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch index 47d4956295d..dd2efe57325 100644 --- a/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch +++ b/patches/third_party-blink-renderer-core-loader-frame_fetch_context.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/loader/frame_fetch_context.cc b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -index e3fd223698677c2bda9076477db30db78225e63e..bc8dde7c9c20da4efbedd7962ef0d42eb94e9e3c 100644 +index 8c3d711bc424967b5dc9940dcb89d6d0d7c99e48..17d8912b3c6c943403dcbc8a69b6ca3c6ef80ef9 100644 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -636,6 +636,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( +@@ -642,6 +642,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( // Check if |url| is allowed to run JavaScript. If not, client hints are not // attached to the requests that initiate on the render side. diff --git a/patches/third_party-blink-renderer-core-loader-mixed_content_checker.cc.patch b/patches/third_party-blink-renderer-core-loader-mixed_content_checker.cc.patch index e720c5f70b4..a40a3fc7222 100644 --- a/patches/third_party-blink-renderer-core-loader-mixed_content_checker.cc.patch +++ b/patches/third_party-blink-renderer-core-loader-mixed_content_checker.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/loader/mixed_content_checker.cc b/third_party/blink/renderer/core/loader/mixed_content_checker.cc -index 38e7a2fbb7603d6dcec3c712ea94e987b3521a4d..e8adce02e80697f524574e89f40ecd228bc32d45 100644 +index d26ea92df9c007814412af78de5f651ad4a103fd..d2561fd8a20d334c639c416f293b6903c6cc48de 100644 --- a/third_party/blink/renderer/core/loader/mixed_content_checker.cc +++ b/third_party/blink/renderer/core/loader/mixed_content_checker.cc -@@ -290,6 +290,7 @@ bool RequestIsSubframeSubresource(Frame* frame) { +@@ -299,6 +299,7 @@ bool RequestIsSubframeSubresource(Frame* frame) { // static bool MixedContentChecker::IsMixedContent(const SecurityOrigin* security_origin, const KURL& url) { @@ -10,7 +10,7 @@ index 38e7a2fbb7603d6dcec3c712ea94e987b3521a4d..e8adce02e80697f524574e89f40ecd22 return IsMixedContent( security_origin->GetOriginOrPrecursorOriginIfOpaque()->Protocol(), url); } -@@ -339,6 +340,7 @@ bool MixedContentChecker::IsMixedContentRestrictedInFrameContext( +@@ -348,6 +349,7 @@ bool MixedContentChecker::IsMixedContentRestrictedInFrameContext( ->Protocol())) { return true; } diff --git a/patches/third_party-blink-renderer-core-script-html_parser_script_runner.cc.patch b/patches/third_party-blink-renderer-core-script-html_parser_script_runner.cc.patch index 50630c6612c..f23a02c334e 100644 --- a/patches/third_party-blink-renderer-core-script-html_parser_script_runner.cc.patch +++ b/patches/third_party-blink-renderer-core-script-html_parser_script_runner.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/script/html_parser_script_runner.cc b/third_party/blink/renderer/core/script/html_parser_script_runner.cc -index 1c8ade0011eb77938de288baa89d1213acb27bf0..dfe2a09c554e93e4582e100693bba41139c4f657 100644 +index 457a9b5aa545301b37be273f8fa4d517d8ead5d6..1587a2596e0340693cb7d0530a0faf7d17b5b8fd 100644 --- a/third_party/blink/renderer/core/script/html_parser_script_runner.cc +++ b/third_party/blink/renderer/core/script/html_parser_script_runner.cc -@@ -262,6 +262,12 @@ void HTMLParserScriptRunner::PendingScriptFinished( +@@ -270,6 +270,12 @@ void HTMLParserScriptRunner::PendingScriptFinished( return; } diff --git a/patches/third_party-blink-renderer-core-script-script_loader.cc.patch b/patches/third_party-blink-renderer-core-script-script_loader.cc.patch index 899cf0bc54e..2c2d4625103 100644 --- a/patches/third_party-blink-renderer-core-script-script_loader.cc.patch +++ b/patches/third_party-blink-renderer-core-script-script_loader.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/script/script_loader.cc b/third_party/blink/renderer/core/script/script_loader.cc -index d19b7c08c4b83d9be6fc7cbdabd623e566b6dde9..dba7e932bbdcc7799c298f49eb43f3d77274ad34 100644 +index bf8e41ae992da9c8e79d0eed2e7a7d8567f05e23..179a144a26ef04da6be1f0f847b5e9f33d958020 100644 --- a/third_party/blink/renderer/core/script/script_loader.cc +++ b/third_party/blink/renderer/core/script/script_loader.cc @@ -734,6 +734,7 @@ PendingScript* ScriptLoader::PrepareScript( diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index c4cd885ff24..a502b705d37 100644 --- a/patches/third_party-blink-renderer-modules-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-modules-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/BUILD.gn b/third_party/blink/renderer/modules/BUILD.gn -index c8af01a3a7644b442446a517695fb535f4dc0c07..c5655aa86f7db70260de011d437483e10eb06f13 100644 +index be2298f158fba48fdc2c80623c65873addbc8af4..5e5f998ecbd93840d4b822c55f99b93ab499199f 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -20,6 +20,7 @@ if (is_ios) { @@ -10,7 +10,7 @@ index c8af01a3a7644b442446a517695fb535f4dc0c07..c5655aa86f7db70260de011d437483e1 config("modules_implementation") { defines = [ "BLINK_MODULES_IMPLEMENTATION=1" ] -@@ -172,6 +173,7 @@ component("modules") { +@@ -171,6 +172,7 @@ component("modules") { # generating the snapshot for android, blink is compiled with # current_os="linux" and target_os="android". Using target_os is necessary as # we need to compile in the same way as would happen when current_os="android". diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch index be6e264f1d6..efa42548cd6 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -index de1f06bb713336587fbc16f2582831d2cfdfab60..4110bf94744b28889ad63577d37ab7334db8e277 100644 +index 07df84ea525b7cbfbeb393303678729ec325921b..a479e62dcc3732a2d13b47b34024a0d7ebfa6db0 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -364,6 +364,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -363,6 +363,7 @@ ImageData* BaseRenderingContext2D::getImageData( perfetto::EventContext GetEventContext(); ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index de1f06bb713336587fbc16f2582831d2cfdfab60..4110bf94744b28889ad63577d37ab733 int sx, int sy, int sw, -@@ -525,6 +526,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -524,6 +525,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } @@ -18,7 +18,7 @@ index de1f06bb713336587fbc16f2582831d2cfdfab60..4110bf94744b28889ad63577d37ab733 return image_data; } -@@ -1158,6 +1160,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { +@@ -1152,6 +1154,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { return MakeGarbageCollected(); } diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index 6e2565ca340..09423a42a0d 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832ada08fc37 100644 +index 469fc4dd30580f0fbbe89ad9bef52e2c694377a7..6e4f73cd411b2c9b315c6b2bb5e964f79c5d029b 100644 --- a/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -3426,6 +3426,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -3425,6 +3425,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -3457,6 +3458,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -3456,6 +3457,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -3487,6 +3489,7 @@ std::optional>> +@@ -3486,6 +3488,7 @@ std::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return std::nullopt; @@ -26,7 +26,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -3501,6 +3504,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3500,6 +3503,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3534,6 +3538,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3535,6 +3539,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a switch (pname) { case GL_BUFFER_USAGE: { -@@ -3673,6 +3678,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3674,6 +3679,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( return ScriptValue::CreateNull(script_state->GetIsolate()); } @@ -50,7 +50,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, kFunctionName, "no framebuffer bound"); -@@ -3975,6 +3981,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3976,6 +3982,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, OES_standard_derivatives not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedRendererWebgl: @@ -58,7 +58,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { return WebGLAny(script_state, String(ContextGL()->GetString(GL_RENDERER))); -@@ -3984,6 +3991,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3985,6 +3992,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, "invalid parameter name, WEBGL_debug_renderer_info not enabled"); return ScriptValue::CreateNull(script_state->GetIsolate()); case WebGLDebugRendererInfo::kUnmaskedVendorWebgl: @@ -66,7 +66,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { return WebGLAny(script_state, String(ContextGL()->GetString(GL_VENDOR))); -@@ -4113,6 +4121,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -4114,6 +4122,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -74,7 +74,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -4168,6 +4177,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -4169,6 +4178,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -4178,6 +4188,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -4179,6 +4189,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -4225,6 +4236,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -4226,6 +4237,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( // intended to prevent applications from entering an infinite polling loop. if (isContextLost() && pname == GL_COMPLETION_STATUS_KHR) return WebGLAny(script_state, true); @@ -98,7 +98,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -4256,6 +4268,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -4257,6 +4269,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -4286,6 +4299,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -4287,6 +4300,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a return MakeGarbageCollected(range[0], range[1], precision); } -@@ -4293,6 +4307,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -4294,6 +4308,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a return EnsureNotNull(shader->Source()); } -@@ -4318,6 +4333,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -4319,6 +4334,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -4352,6 +4368,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -4353,6 +4369,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a DCHECK(uniform_location); if (!ValidateUniformLocation("getUniform", uniform_location, program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); -@@ -4604,6 +4621,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4605,6 +4622,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4628,6 +4646,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4629,6 +4647,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4702,6 +4721,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4703,6 +4722,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 72a80ba576711a65ea945664d89d17a422565357..00295490c2dbb73acbb3364ca304832a GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -5064,6 +5084,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -5065,6 +5085,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, int64_t offset) { if (isContextLost()) return; diff --git a/patches/third_party-blink-renderer-platform-BUILD.gn.patch b/patches/third_party-blink-renderer-platform-BUILD.gn.patch index 9f438fb00f9..39668d1a47b 100644 --- a/patches/third_party-blink-renderer-platform-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-platform-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/BUILD.gn b/third_party/blink/renderer/platform/BUILD.gn -index d0a36746a94ee1839b696f7d0bb25effdea69dc9..be25dad358586b9ec88bcd0625de2721b69c2bf6 100644 +index 83ebf4a21a9d42b307a8a2108e118174d6d62f0e..26fb47930852fb1e7501ed5469895e3e67770af2 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1978,6 +1978,7 @@ component("platform") { +@@ -1981,6 +1981,7 @@ component("platform") { configs -= [ "//build/config/compiler:default_symbols" ] configs += blink_symbols_config diff --git a/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch b/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch index 14e6ca141ab..5a3199a8781 100644 --- a/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch +++ b/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -index fc3eb84197366d770d97163641113d19991d5c89..8295a4ed68bffaa1244963dae1a6f8f092ac748c 100644 +index d6016c8fda4ce7df4875f57dcd2e0321dddcb0fa..c070288a02e04faa1640037e3c093dff91c3d4b2 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -806,6 +806,11 @@ +@@ -833,6 +833,11 @@ public: true, status: "stable", }, @@ -14,7 +14,7 @@ index fc3eb84197366d770d97163641113d19991d5c89..8295a4ed68bffaa1244963dae1a6f8f0 { name: "BrowserInitiatedAutomaticPictureInPicture", public: true, -@@ -2454,6 +2459,7 @@ +@@ -2517,6 +2522,7 @@ // In-development features for the File System Access API. name: "FileSystemAccessAPIExperimental", status: "experimental", @@ -22,7 +22,7 @@ index fc3eb84197366d770d97163641113d19991d5c89..8295a4ed68bffaa1244963dae1a6f8f0 }, { // The FileSystemHandle.getCloudIdentifiers() method (see -@@ -2468,6 +2474,7 @@ +@@ -2531,6 +2537,7 @@ // Non-OPFS File System Access API. name: "FileSystemAccessLocal", status: {"default": "stable"}, @@ -30,7 +30,7 @@ index fc3eb84197366d770d97163641113d19991d5c89..8295a4ed68bffaa1244963dae1a6f8f0 }, { name: "FileSystemAccessLockingScheme", -@@ -3466,6 +3473,7 @@ +@@ -3589,6 +3596,7 @@ { name: "MiddleClickAutoscroll", status: "test", diff --git a/patches/third_party-lit-v3_0-BUILD.gn.patch b/patches/third_party-lit-v3_0-BUILD.gn.patch index fbc50e49730..d175cd40cfd 100644 --- a/patches/third_party-lit-v3_0-BUILD.gn.patch +++ b/patches/third_party-lit-v3_0-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/lit/v3_0/BUILD.gn b/third_party/lit/v3_0/BUILD.gn -index 56f453213fe8e3cdc77be2a46b0587f86f8492fe..39b850e3773fbf7c921a760f6347f5051c78a9d4 100644 +index 9c16ef2655992d0e40731311bc681e4d2fce0004..d5a1e50d3b137b0aca3dd0dbf98050de869b43a3 100644 --- a/third_party/lit/v3_0/BUILD.gn +++ b/third_party/lit/v3_0/BUILD.gn -@@ -141,6 +141,7 @@ ts_library("build_ts") { +@@ -145,6 +145,7 @@ ts_library("build_ts") { "//ui/webui/resources/cr_components/searchbox:build_ts", "//ui/webui/resources/cr_components/theme_color_picker:build_ts", "//ui/webui/resources/cr_elements:build_ts", @@ -10,7 +10,7 @@ index 56f453213fe8e3cdc77be2a46b0587f86f8492fe..39b850e3773fbf7c921a760f6347f505 ] tsconfig_base = "tsconfig_base.json" composite = true -@@ -225,6 +226,7 @@ ts_library("build_ts") { +@@ -229,6 +230,7 @@ ts_library("build_ts") { "${node_modules}/@lit/reactive-element/reactive-element.d.ts", target_gen_dir), ] diff --git a/patches/third_party-polymer-v3_0-BUILD.gn.patch b/patches/third_party-polymer-v3_0-BUILD.gn.patch index 9cb2a69e8b4..4d3437ee555 100644 --- a/patches/third_party-polymer-v3_0-BUILD.gn.patch +++ b/patches/third_party-polymer-v3_0-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/polymer/v3_0/BUILD.gn b/third_party/polymer/v3_0/BUILD.gn -index f3a996ac0a501543c22315344bba170d27166d79..8ef89f1ce40deaee0efce49ce52c3992d2d3ed00 100644 +index 69030552006f843d40455aac8f9e1a4d112936ed..44f26be718ddb06062d8bebcda233e2c27d62c73 100644 --- a/third_party/polymer/v3_0/BUILD.gn +++ b/third_party/polymer/v3_0/BUILD.gn @@ -19,6 +19,7 @@ js_files = [ @@ -10,7 +10,7 @@ index f3a996ac0a501543c22315344bba170d27166d79..8ef89f1ce40deaee0efce49ce52c3992 js_files += [ "iron-a11y-announcer/iron-a11y-announcer.js", "iron-a11y-keys/iron-a11y-keys.js", -@@ -229,11 +230,13 @@ ts_library("library") { +@@ -226,11 +227,13 @@ ts_library("library") { # Also needed on LaCros for Print Preview. Remove once CrOS Print Preview # launches. if (is_chromeos) { @@ -24,7 +24,7 @@ index f3a996ac0a501543c22315344bba170d27166d79..8ef89f1ce40deaee0efce49ce52c3992 definitions += [ "components-chromium/iron-a11y-announcer/iron-a11y-announcer.d.ts", "components-chromium/iron-a11y-keys/iron-a11y-keys.d.ts", -@@ -276,4 +279,5 @@ ts_library("library") { +@@ -273,4 +276,5 @@ ts_library("library") { "components-chromium/paper-tooltip/paper-tooltip.d.ts", ] } diff --git a/patches/third_party/devtools-frontend/src/config-gni-devtools_grd_files.gni.patch b/patches/third_party/devtools-frontend/src/config-gni-devtools_grd_files.gni.patch index c05156f7a6c..44e5d35cdc8 100644 --- a/patches/third_party/devtools-frontend/src/config-gni-devtools_grd_files.gni.patch +++ b/patches/third_party/devtools-frontend/src/config-gni-devtools_grd_files.gni.patch @@ -1,8 +1,8 @@ diff --git a/config/gni/devtools_grd_files.gni b/config/gni/devtools_grd_files.gni -index ca103ddd15cb6fa75fa38c5d2d8a50047784ac7d..90678f1543b72625051eb2491cb3beac895cdcf6 100644 +index dd18097fd82f179598ef556ce05a5c7a51861d4b..6ad03e667f532599c1c1d84fd77fa551fb123322 100644 --- a/config/gni/devtools_grd_files.gni +++ b/config/gni/devtools_grd_files.gni -@@ -2733,6 +2733,7 @@ grd_files_unbundled_sources = [ +@@ -2737,6 +2737,7 @@ grd_files_unbundled_sources = [ "front_end/ui/visual_logging/LoggingState.js", "front_end/ui/visual_logging/NonDomState.js", ] diff --git a/patches/third_party/devtools-frontend/src/front_end-core-sdk-NetworkManager.ts.patch b/patches/third_party/devtools-frontend/src/front_end-core-sdk-NetworkManager.ts.patch index 3ee88919fd6..26004c9e129 100644 --- a/patches/third_party/devtools-frontend/src/front_end-core-sdk-NetworkManager.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-core-sdk-NetworkManager.ts.patch @@ -1,8 +1,8 @@ diff --git a/front_end/core/sdk/NetworkManager.ts b/front_end/core/sdk/NetworkManager.ts -index 79cca855bf475603ae829be27c53daa1f4ec2f9e..0486214231e3ddfd14588606aa9be7bca66f32d7 100644 +index b27b6d20ba7ca9a938fba69b82fd4eab4ea71db8..ffe276ac5fa1ec9f143a827813206a7d125f1444 100644 --- a/front_end/core/sdk/NetworkManager.ts +++ b/front_end/core/sdk/NetworkManager.ts -@@ -1594,6 +1594,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher { +@@ -1561,6 +1561,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher { return `${host}:${port}`; } } diff --git a/patches/third_party/devtools-frontend/src/front_end-panels-network-BUILD.gn.patch b/patches/third_party/devtools-frontend/src/front_end-panels-network-BUILD.gn.patch index d770c99b7f4..e4b3e429074 100644 --- a/patches/third_party/devtools-frontend/src/front_end-panels-network-BUILD.gn.patch +++ b/patches/third_party/devtools-frontend/src/front_end-panels-network-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/front_end/panels/network/BUILD.gn b/front_end/panels/network/BUILD.gn -index 0a1fe05978f8c92bfa8952b3d7648fa623c3fdb6..3a8e9af60369ba443b5753e6ffd7f18a60044e3d 100644 +index e1164aae996c84a3db93a539b9a943e7be907aea..2e647a7d30a0ee32ea707b0ced93616c677c54b6 100644 --- a/front_end/panels/network/BUILD.gn +++ b/front_end/panels/network/BUILD.gn -@@ -104,6 +104,7 @@ devtools_ui_module("network") { +@@ -115,6 +115,7 @@ devtools_ui_module("network") { "./components:bundle", "./forward:bundle", ] diff --git a/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkDataGridNode.ts.patch b/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkDataGridNode.ts.patch index e0dbb78b02d..e80a1b12e07 100644 --- a/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkDataGridNode.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkDataGridNode.ts.patch @@ -1,8 +1,8 @@ diff --git a/front_end/panels/network/NetworkDataGridNode.ts b/front_end/panels/network/NetworkDataGridNode.ts -index 1038ceccdbfab71fe7e06b65b18c9b6b63efde22..4fdfd53e13e9a548c2935f754aefc77a58e8c7eb 100644 +index 09737d82657b1127df70b8a8081aeab3786532af..633b611c7cf3278935e8b32eedbefa8bfbd71bf8 100644 --- a/front_end/panels/network/NetworkDataGridNode.ts +++ b/front_end/panels/network/NetworkDataGridNode.ts -@@ -1636,6 +1636,7 @@ export class NetworkRequestNode extends NetworkNode { +@@ -1638,6 +1638,7 @@ export class NetworkRequestNode extends NetworkNode { } } diff --git a/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkItemView.ts.patch b/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkItemView.ts.patch index a1465d76139..fe7119198f7 100644 --- a/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkItemView.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-panels-network-NetworkItemView.ts.patch @@ -1,8 +1,8 @@ diff --git a/front_end/panels/network/NetworkItemView.ts b/front_end/panels/network/NetworkItemView.ts -index 112f7f191ddee1ae530ed8dee5c4d21d34c9f7ce..2418b4524ee63a99c9bcac292055eb72b52cba70 100644 +index 2a39217331b887b09e81497078bfdc4ee175cf05..bc5670aabe271bc66f8dee667a5080486a604949 100644 --- a/front_end/panels/network/NetworkItemView.ts +++ b/front_end/panels/network/NetworkItemView.ts -@@ -400,3 +400,4 @@ export class NetworkItemView extends UI.TabbedPane.TabbedPane { +@@ -430,3 +430,4 @@ export class NetworkItemView extends UI.TabbedPane.TabbedPane { return this.#headersViewComponent; } } diff --git a/patches/third_party/devtools-frontend/src/front_end-panels-timeline-components-LiveMetricsView.ts.patch b/patches/third_party/devtools-frontend/src/front_end-panels-timeline-components-LiveMetricsView.ts.patch index df728116499..16488ebdff6 100644 --- a/patches/third_party/devtools-frontend/src/front_end-panels-timeline-components-LiveMetricsView.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-panels-timeline-components-LiveMetricsView.ts.patch @@ -1,8 +1,8 @@ diff --git a/front_end/panels/timeline/components/LiveMetricsView.ts b/front_end/panels/timeline/components/LiveMetricsView.ts -index 166fd8fb0eb97a25e0e862fd7e9eb952b9d9055a..e66bb92787978e344ce51bbd9de137e90d568a51 100644 +index 35ef2855567e6d62a6d1704b3f6950674ce7f7ae..8b66f983019c5437e3d05dfd2d9f4d250d0c348e 100644 --- a/front_end/panels/timeline/components/LiveMetricsView.ts +++ b/front_end/panels/timeline/components/LiveMetricsView.ts -@@ -1183,7 +1183,7 @@ export class LiveMetricsView extends LegacyWrapper.LegacyWrapper.WrappableCompon +@@ -1187,7 +1187,7 @@ export class LiveMetricsView extends LegacyWrapper.LegacyWrapper.WrappableCompon