From b7a76dc560919d487579502026edf55f29ac33b7 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 5 Feb 2025 23:09:28 +0000 Subject: [PATCH 001/139] Update from Chromium 134.0.6998.4 to Chromium 135.0.7000.1. --- .../transport_security_state_generator/input_file_parsers.cc | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index c114bac70151..75bb97b5b175 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -552,9 +552,9 @@ bool ParseCertificatesFile(std::string_view certs_input, Pinsets* pinsets, base::Time* timestamp) { constexpr std::string_view brave_certs = R"brave_certs( -# Last updated: Wed Feb 26 14:59:55 2025 +# Last updated: Wed Feb 05 23:09:28 2025 PinsListTimestamp -1740581995 +1738796968 # =====BEGIN BRAVE ROOTS ASC===== #From https://www.amazontrust.com/repository/ diff --git a/package.json b/package.json index 2e58c1b62cd8..becf3684bf67 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "134.0.6998.39", + "tag": "135.0.7000.1", "repository": { "url": "https://github.com/brave/chromium" } From c93a3ab17a97f7c0bbaa81f9519c46d6177c4a84 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Wed, 5 Feb 2025 23:26:19 +0000 Subject: [PATCH 002/139] Conflict-resolved patches from Chromium 134.0.6998.4 to Chromium 135.0.7000.1. --- ...developer_private-extension_info_generator.cc.patch | 8 ++++---- ...e-common-extensions-api-developer_private.idl.patch | 6 +++--- ..._settings-core-common-cookie_settings_base.cc.patch | 10 +++++----- patches/extensions-browser-user_script_manager.h.patch | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) 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 d2bd55bb83f8..bb8ffa1534c8 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,12 +1,12 @@ 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 20e7578e086aabd7c389191e69438f03b7ae3222..a99acbd109733032c0ff12f19481e9051ea01713 100644 +index e330cb71631eb2b0b816d1fd87f98c49556ba047..f4454124c38c720858e34b4c7e7063e2dee41248 100644 --- a/chrome/browser/extensions/api/developer_private/extension_info_generator.cc +++ b/chrome/browser/extensions/api/developer_private/extension_info_generator.cc -@@ -706,6 +706,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper( +@@ -725,6 +725,7 @@ void ExtensionInfoGenerator::CreateExtensionInfoHelper( info->incognito_access.is_enabled = util::CanBeIncognitoEnabled(&extension); info->incognito_access.is_active = util::IsIncognitoEnabled(extension.id(), browser_context_); + BRAVE_CREATE_EXTENSION_INFO_HELPER - // Install warnings, but only if unpacked, the error console isn't enabled - // (otherwise it shows these), and we're in developer mode (normal users don't + // User Scripts toggle. + info->user_scripts_access.is_enabled = CanRunOrRequestUserScripts(extension); diff --git a/patches/chrome-common-extensions-api-developer_private.idl.patch b/patches/chrome-common-extensions-api-developer_private.idl.patch index 96f9ecfa2aef..24bfd80b6498 100644 --- a/patches/chrome-common-extensions-api-developer_private.idl.patch +++ b/patches/chrome-common-extensions-api-developer_private.idl.patch @@ -1,11 +1,11 @@ diff --git a/chrome/common/extensions/api/developer_private.idl b/chrome/common/extensions/api/developer_private.idl -index d65deafb7913578b1955013ba8bfa8d8b02957df..8536ed9bcdebd3f38e1b40fd3ab9e60075a33e18 100644 +index 8b09424e0c4cd409f1693ba06eb69d800f948473..7341c79c9647c07320733829314638d7b7c6c799 100644 --- a/chrome/common/extensions/api/developer_private.idl +++ b/chrome/common/extensions/api/developer_private.idl -@@ -256,6 +256,7 @@ namespace developerPrivate { - DOMString iconUrl; +@@ -257,6 +257,7 @@ namespace developerPrivate { DOMString id; AccessModifier incognitoAccess; + AccessModifier userScriptsAccess; + boolean isSplitMode; DOMString[] installWarnings; boolean isCommandRegistrationHandledExternally; diff --git a/patches/components-content_settings-core-common-cookie_settings_base.cc.patch b/patches/components-content_settings-core-common-cookie_settings_base.cc.patch index aec5f8bc73d5..0bd6d288c296 100644 --- a/patches/components-content_settings-core-common-cookie_settings_base.cc.patch +++ b/patches/components-content_settings-core-common-cookie_settings_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/common/cookie_settings_base.cc b/components/content_settings/core/common/cookie_settings_base.cc -index edfab3eb9a79abecf2b184b33d3c0731bd85d75e..cfc1d50015428eb67a4f38924a6ebab52b855779 100644 +index 6cacad19cc3b30fc22b972aa65c6fb9c26beb373..e8ccc91db0e1963b0fdf0cc1851f36d1a2ceaaae 100644 --- a/components/content_settings/core/common/cookie_settings_base.cc +++ b/components/content_settings/core/common/cookie_settings_base.cc -@@ -572,6 +572,7 @@ CookieSettingsBase::DecideAccess( +@@ -573,6 +573,7 @@ CookieSettingsBase::DecideAccess(const GURL& url, return BlockAllCookies{}; } @@ -10,10 +10,10 @@ index edfab3eb9a79abecf2b184b33d3c0731bd85d75e..cfc1d50015428eb67a4f38924a6ebab5 if (!is_third_party_request) { return AllowAllCookies{ThirdPartyCookieAllowMechanism::kNone}; } -@@ -758,6 +759,7 @@ CookieSettingsBase::GetCookieSettingInternal( +@@ -752,6 +753,7 @@ CookieSettingsBase::GetCookieSettingInternal( + if (absl::holds_alternative(choice)) { CHECK(is_third_party_request, base::NotFatalUntil::M128); - CHECK(global_setting_or_embedder_blocks_third_party_cookies, - base::NotFatalUntil::M128); + CHECK(block_third_party_cookies, base::NotFatalUntil::M128); + BRAVE_COOKIE_SETTINGS_BASE_GET_COOKIES_SETTINGS_INTERNAL_IS_EXPLICIT_SETTING CHECK(!is_explicit_setting, base::NotFatalUntil::M128); diff --git a/patches/extensions-browser-user_script_manager.h.patch b/patches/extensions-browser-user_script_manager.h.patch index f5130f4f9311..1cc9b1bd2e47 100644 --- a/patches/extensions-browser-user_script_manager.h.patch +++ b/patches/extensions-browser-user_script_manager.h.patch @@ -1,5 +1,5 @@ diff --git a/extensions/browser/user_script_manager.h b/extensions/browser/user_script_manager.h -index faaf3db52b3e6795764dcc5cc5569e850ac09669..e59c71cfeff766dd38dd41ac2b158bd6bf6836dd 100644 +index 4b4d25e68c06835c1f7d84daa43080606527b297..b030c08839ba70144b5810019889708a501dc0ca 100644 --- a/extensions/browser/user_script_manager.h +++ b/extensions/browser/user_script_manager.h @@ -25,7 +25,7 @@ @@ -11,8 +11,8 @@ index faaf3db52b3e6795764dcc5cc5569e850ac09669..e59c71cfeff766dd38dd41ac2b158bd6 namespace extensions { class UserScriptLoader; -@@ -55,6 +55,7 @@ class UserScriptManager : public ExtensionRegistryObserver { - bool enabled); +@@ -61,6 +61,7 @@ class UserScriptManager : public ExtensionRegistryObserver { + void SetUserScriptPrefEnabled(const ExtensionId& extension, bool enabled); private: + friend class ::EthereumRemoteClientService; From 41c6560de6c1428bb843dd8f7b2a797a7c1f892c Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 6 Feb 2025 03:02:34 +0000 Subject: [PATCH 003/139] [cr135] `output_all_resource_defines` removed from grds This attribute has been deleted from grit, and isn't recognised anymore. Chromium change: https://chromium.googlesource.com/chromium/src/+/96c98d3ae26486007669c1cd00e4da58c85659b3 commit 96c98d3ae26486007669c1cd00e4da58c85659b3 Author: dpapad Date: Tue Feb 4 16:23:24 2025 -0800 Grit: Remove output_all_resource_defines from list of valid attributes. All references to this attribute have been removed in previous CLs, both from public and internal repositories. Fixed: 389466679 --- app/brave_generated_resources.grd | 2 +- app/theme/brave_theme_resources.grd | 2 +- app/theme/brave_unscaled_resources.grd | 2 +- common/extensions/api/brave_api_resources.grd | 2 +- components/brave_ads/resources/bat_ads_resources.grd | 2 +- components/brave_extension/extension/resources.grd | 2 +- .../brave_rewards/resources/brave_rewards_static_resources.grd | 2 +- components/brave_webtorrent/resources.grd | 2 +- components/resources/brave_components_resources.grd | 2 +- components/resources/brave_components_strings.grd | 2 +- components/tor/resources/tor_static_resources.grd | 2 +- components/webpack/gen-webpack-grd.js | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/app/brave_generated_resources.grd b/app/brave_generated_resources.grd index 1409a536baa1..db424229affd 100644 --- a/app/brave_generated_resources.grd +++ b/app/brave_generated_resources.grd @@ -1,6 +1,6 @@ + source_lang_id="en" enc_check="möl"> diff --git a/app/theme/brave_theme_resources.grd b/app/theme/brave_theme_resources.grd index c90f08fb9c26..0721ca4ec6ff 100644 --- a/app/theme/brave_theme_resources.grd +++ b/app/theme/brave_theme_resources.grd @@ -1,5 +1,5 @@ - + diff --git a/app/theme/brave_unscaled_resources.grd b/app/theme/brave_unscaled_resources.grd index 37c6ded3256b..fc3e061f1c06 100644 --- a/app/theme/brave_unscaled_resources.grd +++ b/app/theme/brave_unscaled_resources.grd @@ -1,5 +1,5 @@ - + diff --git a/common/extensions/api/brave_api_resources.grd b/common/extensions/api/brave_api_resources.grd index c1ef5c7ff833..4ab91706e822 100644 --- a/common/extensions/api/brave_api_resources.grd +++ b/common/extensions/api/brave_api_resources.grd @@ -1,5 +1,5 @@ - + diff --git a/components/brave_ads/resources/bat_ads_resources.grd b/components/brave_ads/resources/bat_ads_resources.grd index 9ea6acaf3f26..94e9b96ff688 100644 --- a/components/brave_ads/resources/bat_ads_resources.grd +++ b/components/brave_ads/resources/bat_ads_resources.grd @@ -1,5 +1,5 @@ - + diff --git a/components/brave_extension/extension/resources.grd b/components/brave_extension/extension/resources.grd index f92c5cef9823..7812abc76254 100644 --- a/components/brave_extension/extension/resources.grd +++ b/components/brave_extension/extension/resources.grd @@ -1,5 +1,5 @@ - + diff --git a/components/brave_rewards/resources/brave_rewards_static_resources.grd b/components/brave_rewards/resources/brave_rewards_static_resources.grd index 9b79369022e8..1185921a9612 100644 --- a/components/brave_rewards/resources/brave_rewards_static_resources.grd +++ b/components/brave_rewards/resources/brave_rewards_static_resources.grd @@ -1,5 +1,5 @@ - + diff --git a/components/brave_webtorrent/resources.grd b/components/brave_webtorrent/resources.grd index d1926438e4fa..75caa49ccc27 100644 --- a/components/brave_webtorrent/resources.grd +++ b/components/brave_webtorrent/resources.grd @@ -1,5 +1,5 @@ - + diff --git a/components/resources/brave_components_resources.grd b/components/resources/brave_components_resources.grd index 68ef155a012a..754d0ba9959b 100644 --- a/components/resources/brave_components_resources.grd +++ b/components/resources/brave_components_resources.grd @@ -1,5 +1,5 @@ - + diff --git a/components/resources/brave_components_strings.grd b/components/resources/brave_components_strings.grd index 1e34a348ec9d..cab932cd901c 100644 --- a/components/resources/brave_components_strings.grd +++ b/components/resources/brave_components_strings.grd @@ -1,5 +1,5 @@ - + diff --git a/components/tor/resources/tor_static_resources.grd b/components/tor/resources/tor_static_resources.grd index 87f5d7bbad39..80ab8d735595 100644 --- a/components/tor/resources/tor_static_resources.grd +++ b/components/tor/resources/tor_static_resources.grd @@ -1,5 +1,5 @@ - + diff --git a/components/webpack/gen-webpack-grd.js b/components/webpack/gen-webpack-grd.js index f756751c5503..a8242d592eae 100644 --- a/components/webpack/gen-webpack-grd.js +++ b/components/webpack/gen-webpack-grd.js @@ -29,7 +29,7 @@ function getIncludesString (fileList) { */ function getGrdString (name, fileList) { return ` - + From fbfdb0d7df8f9ce4841b5de19e038f2feba477b5 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 6 Feb 2025 03:03:36 +0000 Subject: [PATCH 004/139] [cr135] `ShouldBlockThirdPartyCookies` take 3pc args One of the existing overrides using `ShouldBlockThirdPartyCookies` had to be updated to pass the origin/overrides args into this function. Chromium change: https://chromium.googlesource.com/chromium/src/+/a6b7e38f7f4b1112263986c1fca59078139f046b commit a6b7e38f7f4b1112263986c1fca59078139f046b Author: Chris Fredrickson Date: Wed Feb 5 05:25:50 2025 -0800 Consolidate 3PC restrictions and ShouldBlockThirdPartyCookies methods This simplifies the CookieSettingsBase logic, since it no longer has to treat various ways of blocking 3PC differently. It also makes the CookieSettings API more honest, as shown in the CookieSettingsBase unittests: sometimes the CallbackCookieSettings class blocked 3PC somehow, even though its ShouldBlockThirdPartyCookies override always returned false. (It was blocking cookies because CookieSettingsBase didn't fully rely on the result of ShouldBlockThirdPartyCookies, and did some of the logic on its own.) Finally, this refactor avoids a redundant call to network::CookieSettings::IsThirdPartyPhaseoutEnabled in some cases. Change-Id: I24e45f9bb423b143f8092c5769daadd4a7fd257b --- .../content_settings/core/common/cookie_settings_base.cc | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc index 7e4c1993dceb..1ce9c89c7179 100644 --- a/chromium_src/components/content_settings/core/common/cookie_settings_base.cc +++ b/chromium_src/components/content_settings/core/common/cookie_settings_base.cc @@ -243,11 +243,14 @@ bool CookieSettingsBase::ShouldBlockThirdPartyIfSettingIsExplicit( #define BRAVE_COOKIE_SETTINGS_BASE_DECIDE_ACCESS \ const bool block_third = \ IsAllowed(setting) && !is_explicit_setting && is_third_party_request && \ - ShouldBlockThirdPartyCookies() && \ + ShouldBlockThirdPartyCookies(url::Origin::Create(first_party_url), \ + overrides) && \ !IsThirdPartyCookiesAllowedScheme(first_party_url.scheme()); \ if (!block_third && is_third_party_request && \ ShouldBlockThirdPartyIfSettingIsExplicit( \ - ShouldBlockThirdPartyCookies(), setting, is_explicit_setting, \ + ShouldBlockThirdPartyCookies(url::Origin::Create(first_party_url), \ + overrides), \ + setting, is_explicit_setting, \ IsThirdPartyCookiesAllowedScheme(first_party_url.scheme()))) { \ return AllowPartitionedCookies{}; \ } From 3479dc85d77abd02b55fc0f7cff87160325e4642 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 6 Feb 2025 03:05:18 +0000 Subject: [PATCH 005/139] [cr135] Update `CreateFetchParameters` arg list An extra argument, `FeatureContext*`, has been added to this function, and this affects the shadow override in brave, which is expected to pass this argument along. Chromium change: https://chromium.googlesource.com/chromium/src/+/8a24e7e4bde6bd24e11c07c6219b674eed3de0ba commit 8a24e7e4bde6bd24e11c07c6219b674eed3de0ba Author: Mike West Date: Wed Feb 5 02:10:38 2025 -0800 [SRI Message Signatures] Support origin trials in Blink. In order to support origin trials for SRI Message Signatures, this CL does twoish things, one of which is trivial, one of which is also trivial, but (very, very) verbosely so. 1. We will begin enforcing signature validation on incoming responses iff the request contained signature expectations. We'll rely on the renderer not sending signature expressions unless the feature flag is enabled, either through command-line flags or an origin trial. 2. We'll add an origin trial name to the Blink-side feature, and then pipe a `FeatureContext` everywhere it's needed. This ductwork is ~90% of the CL. Bug: 393924693 --- .../renderer/platform/loader/fetch/script_fetch_options.cc | 6 ++++-- .../renderer/platform/loader/fetch/script_fetch_options.h | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/chromium_src/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.cc b/chromium_src/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.cc index de63b412f855..fbb4fca37eb3 100644 --- a/chromium_src/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.cc +++ b/chromium_src/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.cc @@ -24,9 +24,11 @@ FetchParameters ScriptFetchOptions::CreateFetchParameters( const DOMWrapperWorld* world_for_csp, CrossOriginAttributeValue cross_origin, const WTF::TextEncoding& encoding, - FetchParameters::DeferOption defer) const { + FetchParameters::DeferOption defer, + const FeatureContext* feature_context) const { auto params = CreateFetchParameters_ChromiumImpl( - url, security_origin, world_for_csp, cross_origin, encoding, defer); + url, security_origin, world_for_csp, cross_origin, encoding, defer, + feature_context); params.MutableOptions().initiator_info.dom_node_id = dom_node_id_; params.MutableOptions().initiator_info.parent_script_id = parent_script_id_; return params; diff --git a/chromium_src/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h b/chromium_src/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h index e80eca152df9..ef626fb34cac 100644 --- a/chromium_src/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h +++ b/chromium_src/third_party/blink/renderer/platform/loader/fetch/script_fetch_options.h @@ -14,7 +14,7 @@ CreateFetchParameters_ChromiumImpl( \ const KURL&, const SecurityOrigin*, const DOMWrapperWorld* world, \ CrossOriginAttributeValue, const WTF::TextEncoding&, \ - FetchParameters::DeferOption) const; \ + FetchParameters::DeferOption, const FeatureContext*) const; \ void SetDOMNodeId(DOMNodeId dom_node_id); \ DOMNodeId GetDOMNodeId() const; \ void SetParentScriptId(int parent_script_id); \ From 6c3021b2cea9a74dc866dbe10ac5b5c9c69a0bd8 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 6 Feb 2025 12:06:30 +0000 Subject: [PATCH 006/139] [cr135][iOS] Adding GoogleOne provider This provider is required to fixing linking failures on ios. Chromium change: https://chromium.googlesource.com/chromium/src/+/6059ed27ff883f446e12a9d4b4a4373662d62884 commit 6059ed27ff883f446e12a9d4b4a4373662d62884 Author: Olivier ROBIN Date: Wed Jan 29 13:31:48 2025 -0800 Create GoogleOne provider Create the provider API for GoogleOne. This is part of a 4 CL change => crrev.com/c/6187393 : Create the new API - cl/716205930 : create the internal class - crrev.com/i/7971741 : implement the new provider - crrev.com/c/6197979 : use the new provider Change-Id: Idd1194d9e06903bc5550f18daefe57af9df048e8 --- ios/browser/providers/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/ios/browser/providers/BUILD.gn b/ios/browser/providers/BUILD.gn index 7c4c4ecb4e7a..ac6f183cce38 100644 --- a/ios/browser/providers/BUILD.gn +++ b/ios/browser/providers/BUILD.gn @@ -23,6 +23,7 @@ group("brave_providers") { "//ios/chrome/browser/providers/follow:chromium_follow", "//ios/chrome/browser/providers/font:chromium_font", "//ios/chrome/browser/providers/fullscreen:chromium_fullscreen", + "//ios/chrome/browser/providers/google_one:chromium_google_one", "//ios/chrome/browser/providers/keyboard:chromium_keyboard", "//ios/chrome/browser/providers/lens:chromium_lens", "//ios/chrome/browser/providers/mailto_handler:chromium_mailto_handler", From eb870c70441c1543fc7d3d72680d4a713742da64 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 6 Feb 2025 14:07:56 +0000 Subject: [PATCH 007/139] Update from Chromium 134.0.6998.4 to Chromium 135.0.7001.1. --- .../transport_security_state_generator/input_file_parsers.cc | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index 75bb97b5b175..f80ed72b4faf 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -552,9 +552,9 @@ bool ParseCertificatesFile(std::string_view certs_input, Pinsets* pinsets, base::Time* timestamp) { constexpr std::string_view brave_certs = R"brave_certs( -# Last updated: Wed Feb 05 23:09:28 2025 +# Last updated: Thu Feb 06 14:07:56 2025 PinsListTimestamp -1738796968 +1738850876 # =====BEGIN BRAVE ROOTS ASC===== #From https://www.amazontrust.com/repository/ diff --git a/package.json b/package.json index becf3684bf67..c529ed1c4cd4 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "135.0.7000.1", + "tag": "135.0.7001.1", "repository": { "url": "https://github.com/brave/chromium" } From 1e5f0f548fb2c64a09040a26a70ce966a7b0de83 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Thu, 6 Feb 2025 14:17:51 +0000 Subject: [PATCH 008/139] [cr135] `flags_ui` moved under `//components/webui/` This affects several gn inclusion paths, header files, and shadow files to this component. Chromium change: https://chromium.googlesource.com/chromium/src/+/422d5eb80c1ee199aaf98f07707e71449fb42d86 commit 422d5eb80c1ee199aaf98f07707e71449fb42d86 Author: rbpotter Date: Wed Feb 5 08:42:48 2025 -0800 WebUI: Refactor components/flags_ui into components/webui/flags Followup from refactoring recommended by components/ OWNER in https://chromium-review.googlesource.com/c/chromium/src/+/6178599 no other changes Bug: 379889249 --- browser/about_flags.cc | 6 +++--- browser/android/BUILD.gn | 2 +- browser/android/brave_feature_util.cc | 4 ++-- browser/ui/BUILD.gn | 2 +- .../views/brave_vpn/brave_vpn_fallback_dialog_view.cc | 2 +- .../webui/settings/brave_default_extensions_handler.cc | 4 ++-- .../components/{flags_ui => webui/flags}/BUILD.gn | 4 ++-- .../{flags_ui => webui/flags}/flags_state.cc | 4 ++-- .../components/{flags_ui => webui/flags}/flags_state.h | 10 +++++----- .../{flags_ui => webui/flags}/flags_state_unittest.cc | 2 +- ios/browser/flags/about_flags.mm | 4 ++-- ios/browser/flags/sources.gni | 2 +- test/BUILD.gn | 2 +- 13 files changed, 24 insertions(+), 24 deletions(-) rename chromium_src/components/{flags_ui => webui/flags}/BUILD.gn (87%) rename chromium_src/components/{flags_ui => webui/flags}/flags_state.cc (96%) rename chromium_src/components/{flags_ui => webui/flags}/flags_state.h (63%) rename chromium_src/components/{flags_ui => webui/flags}/flags_state_unittest.cc (97%) diff --git a/browser/about_flags.cc b/browser/about_flags.cc index 06e4dff3521c..c081862268ee 100644 --- a/browser/about_flags.cc +++ b/browser/about_flags.cc @@ -41,12 +41,12 @@ #include "build/build_config.h" #include "chrome/browser/ui/ui_features.h" #include "components/content_settings/core/common/features.h" -#include "components/flags_ui/feature_entry.h" -#include "components/flags_ui/feature_entry_macros.h" -#include "components/flags_ui/flags_state.h" #include "components/history/core/browser/features.h" #include "components/omnibox/common/omnibox_features.h" #include "components/translate/core/browser/translate_prefs.h" +#include "components/webui/flags/feature_entry.h" +#include "components/webui/flags/feature_entry_macros.h" +#include "components/webui/flags/flags_state.h" #include "net/base/features.h" #include "third_party/blink/public/common/features.h" diff --git a/browser/android/BUILD.gn b/browser/android/BUILD.gn index c96d1f713352..91a6109ed96e 100644 --- a/browser/android/BUILD.gn +++ b/browser/android/BUILD.gn @@ -41,11 +41,11 @@ source_set("android_browser_process") { "//chrome/common", "//components/content_settings/core/browser", "//components/content_settings/core/browser:cookie_settings", - "//components/flags_ui", "//components/ntp_tiles", "//components/sync", "//components/translate/core/browser", "//components/unified_consent", + "//components/webui/flags", "//url", ] } diff --git a/browser/android/brave_feature_util.cc b/browser/android/brave_feature_util.cc index ce1bcaf02ceb..7afb32a97025 100644 --- a/browser/android/brave_feature_util.cc +++ b/browser/android/brave_feature_util.cc @@ -10,8 +10,8 @@ #include "brave/build/android/jni_headers/BraveFeatureUtil_jni.h" #include "chrome/browser/about_flags.h" #include "chrome/browser/browser_process.h" -#include "components/flags_ui/feature_entry.h" -#include "components/flags_ui/pref_service_flags_storage.h" +#include "components/webui/flags/feature_entry.h" +#include "components/webui/flags/pref_service_flags_storage.h" namespace chrome { namespace android { diff --git a/browser/ui/BUILD.gn b/browser/ui/BUILD.gn index 17b310c91679..e3f361193d3a 100644 --- a/browser/ui/BUILD.gn +++ b/browser/ui/BUILD.gn @@ -889,7 +889,6 @@ source_set("ui") { "//components/country_codes", "//components/favicon/content", "//components/favicon/core", - "//components/flags_ui", "//components/gcm_driver:gcm_buildflags", "//components/image_fetcher/core", "//components/infobars/content", @@ -906,6 +905,7 @@ source_set("ui") { "//components/tab_groups", "//components/update_client", "//components/user_prefs", + "//components/webui/flags", "//content/public/browser", "//content/public/common", "//mojo/public/cpp/bindings", diff --git a/browser/ui/views/brave_vpn/brave_vpn_fallback_dialog_view.cc b/browser/ui/views/brave_vpn/brave_vpn_fallback_dialog_view.cc index defa379b51a1..6e65bce9cffe 100644 --- a/browser/ui/views/brave_vpn/brave_vpn_fallback_dialog_view.cc +++ b/browser/ui/views/brave_vpn/brave_vpn_fallback_dialog_view.cc @@ -17,8 +17,8 @@ #include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/views/frame/browser_view.h" #include "components/constrained_window/constrained_window_views.h" -#include "components/flags_ui/pref_service_flags_storage.h" #include "components/grit/brave_components_strings.h" +#include "components/webui/flags/pref_service_flags_storage.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/metadata/metadata_impl_macros.h" #include "ui/base/mojom/dialog_button.mojom.h" diff --git a/browser/ui/webui/settings/brave_default_extensions_handler.cc b/browser/ui/webui/settings/brave_default_extensions_handler.cc index ddf8c64ea1f1..7bb7793b3ae0 100644 --- a/browser/ui/webui/settings/brave_default_extensions_handler.cc +++ b/browser/ui/webui/settings/brave_default_extensions_handler.cc @@ -36,10 +36,10 @@ #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "components/flags_ui/flags_ui_constants.h" -#include "components/flags_ui/pref_service_flags_storage.h" #include "components/grit/brave_components_strings.h" #include "components/prefs/pref_service.h" +#include "components/webui/flags/flags_ui_constants.h" +#include "components/webui/flags/pref_service_flags_storage.h" #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" diff --git a/chromium_src/components/flags_ui/BUILD.gn b/chromium_src/components/webui/flags/BUILD.gn similarity index 87% rename from chromium_src/components/flags_ui/BUILD.gn rename to chromium_src/components/webui/flags/BUILD.gn index 72d8ceac5cca..ac9b79498e3c 100644 --- a/chromium_src/components/flags_ui/BUILD.gn +++ b/chromium_src/components/webui/flags/BUILD.gn @@ -10,11 +10,11 @@ source_set("unit_tests") { deps = [ "//base", "//base/test:test_support", - "//components/flags_ui", - "//components/flags_ui:switches", "//components/prefs:test_support", "//components/strings", "//components/variations", + "//components/webui/flags", + "//components/webui/flags:switches", "//testing/gtest", ] } diff --git a/chromium_src/components/flags_ui/flags_state.cc b/chromium_src/components/webui/flags/flags_state.cc similarity index 96% rename from chromium_src/components/flags_ui/flags_state.cc rename to chromium_src/components/webui/flags/flags_state.cc index f994ef3f0a0a..53630ffd2c31 100644 --- a/chromium_src/components/flags_ui/flags_state.cc +++ b/chromium_src/components/webui/flags/flags_state.cc @@ -3,14 +3,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "components/flags_ui/flags_state.h" +#include "components/webui/flags/flags_state.h" #include #include #include "base/strings/strcat.h" -#include "src/components/flags_ui/flags_state.cc" +#include "src/components/webui/flags/flags_state.cc" namespace flags_ui { namespace { diff --git a/chromium_src/components/flags_ui/flags_state.h b/chromium_src/components/webui/flags/flags_state.h similarity index 63% rename from chromium_src/components/flags_ui/flags_state.h rename to chromium_src/components/webui/flags/flags_state.h index 042991150dae..836af90b32d9 100644 --- a/chromium_src/components/flags_ui/flags_state.h +++ b/chromium_src/components/webui/flags/flags_state.h @@ -1,10 +1,10 @@ /* Copyright (c) 2020 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ + * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_FLAGS_UI_FLAGS_STATE_H_ -#define BRAVE_CHROMIUM_SRC_COMPONENTS_FLAGS_UI_FLAGS_STATE_H_ +#ifndef BRAVE_CHROMIUM_SRC_COMPONENTS_WEBUI_FLAGS_FLAGS_STATE_H_ +#define BRAVE_CHROMIUM_SRC_COMPONENTS_WEBUI_FLAGS_FLAGS_STATE_H_ #define GetFlagFeatureEntries(...) \ GetFlagFeatureEntries(__VA_ARGS__); \ @@ -12,8 +12,8 @@ const FeatureEntry& entry, const std::set& enabled_entries) \ const -#include "src/components/flags_ui/flags_state.h" // IWYU pragma: export +#include "src/components/webui/flags/flags_state.h" // IWYU pragma: export #undef GetFlagFeatureEntries -#endif // BRAVE_CHROMIUM_SRC_COMPONENTS_FLAGS_UI_FLAGS_STATE_H_ +#endif // BRAVE_CHROMIUM_SRC_COMPONENTS_WEBUI_FLAGS_FLAGS_STATE_H_ diff --git a/chromium_src/components/flags_ui/flags_state_unittest.cc b/chromium_src/components/webui/flags/flags_state_unittest.cc similarity index 97% rename from chromium_src/components/flags_ui/flags_state_unittest.cc rename to chromium_src/components/webui/flags/flags_state_unittest.cc index 0ea90cdacc96..04a9b5d8b867 100644 --- a/chromium_src/components/flags_ui/flags_state_unittest.cc +++ b/chromium_src/components/webui/flags/flags_state_unittest.cc @@ -3,7 +3,7 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at https://mozilla.org/MPL/2.0/. */ -#include "src/components/flags_ui/flags_state_unittest.cc" +#include "src/components/webui/flags/flags_state_unittest.cc" #include #include diff --git a/ios/browser/flags/about_flags.mm b/ios/browser/flags/about_flags.mm index 858282a040f6..3912dc2caeca 100644 --- a/ios/browser/flags/about_flags.mm +++ b/ios/browser/flags/about_flags.mm @@ -19,8 +19,8 @@ #include "brave/ios/browser/playlist/features.h" #include "brave/ios/browser/ui/browser_menu/features.h" #include "build/build_config.h" -#include "components/flags_ui/feature_entry_macros.h" -#include "components/flags_ui/flags_state.h" +#include "components/webui/flags/feature_entry_macros.h" +#include "components/webui/flags/flags_state.h" #include "net/base/features.h" #define EXPAND_FEATURE_ENTRIES(...) __VA_ARGS__, diff --git a/ios/browser/flags/sources.gni b/ios/browser/flags/sources.gni index 800bf90eb08a..58d356775505 100644 --- a/ios/browser/flags/sources.gni +++ b/ios/browser/flags/sources.gni @@ -17,6 +17,6 @@ brave_flags_deps = [ "//brave/components/skus/common", "//brave/ios/browser/playlist", "//brave/ios/browser/ui/browser_menu:features", - "//components/flags_ui", + "//components/webui/flags", "//net", ] diff --git a/test/BUILD.gn b/test/BUILD.gn index c60e391e7556..dab5cb78facc 100644 --- a/test/BUILD.gn +++ b/test/BUILD.gn @@ -185,8 +185,8 @@ test("brave_unit_tests") { "//brave/browser/ui/brave_tooltips", "//brave/browser/user_education:unit_tests", "//brave/browser/web_discovery:unit_tests", - "//brave/chromium_src/components/flags_ui:unit_tests", "//brave/chromium_src/components/privacy_sandbox:unit_tests", + "//brave/chromium_src/components/webui/flags:unit_tests", "//brave/chromium_src/net/base:unit_tests", "//brave/components/ai_chat/core/browser:unit_tests", "//brave/components/ai_chat/core/common:unit_tests", From 1be0e9e2b537d2bea03d7b0e65d724347703259b Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 7 Feb 2025 13:34:27 +0000 Subject: [PATCH 009/139] Update from Chromium 134.0.6998.4 to Chromium 135.0.7003.2. --- .../transport_security_state_generator/input_file_parsers.cc | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index f80ed72b4faf..ea515e2f8619 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -552,9 +552,9 @@ bool ParseCertificatesFile(std::string_view certs_input, Pinsets* pinsets, base::Time* timestamp) { constexpr std::string_view brave_certs = R"brave_certs( -# Last updated: Thu Feb 06 14:07:56 2025 +# Last updated: Fri Feb 07 13:34:27 2025 PinsListTimestamp -1738850876 +1738935267 # =====BEGIN BRAVE ROOTS ASC===== #From https://www.amazontrust.com/repository/ diff --git a/package.json b/package.json index c529ed1c4cd4..ef0def679983 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "135.0.7001.1", + "tag": "135.0.7003.2", "repository": { "url": "https://github.com/brave/chromium" } From 75c83e2a4b777d51ba5eaf8012d1bc25c5dac77d Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 7 Feb 2025 13:38:04 +0000 Subject: [PATCH 010/139] [cr135] Revert patches for `base::test::ParseJson` These patches are now part of M135. Chromium change: https://chromium.googlesource.com/chromium/src/+/473d1315f86445a38b622f3114cdd04ae2ad0068 commit 473d1315f86445a38b622f3114cdd04ae2ad0068 Author: Claudio DeSouza Date: Thu Feb 6 08:01:12 2025 -0800 Expose `JSONReader` options on test utils The use of `ParseJson` and friends in tests simplifies checks around code parsing, however making use of such utils runs into issues in cases where the test wants to support certain parsing options. This CL adds a default value that can be overriden by the caller, similar to how `JSONReader` works. Bug: 40172729 --- patches/base-test-values_test_util.cc.patch | 45 ----------------- patches/base-test-values_test_util.h.patch | 55 --------------------- 2 files changed, 100 deletions(-) delete mode 100644 patches/base-test-values_test_util.cc.patch delete mode 100644 patches/base-test-values_test_util.h.patch diff --git a/patches/base-test-values_test_util.cc.patch b/patches/base-test-values_test_util.cc.patch deleted file mode 100644 index 0cf4f899a26e..000000000000 --- a/patches/base-test-values_test_util.cc.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/base/test/values_test_util.cc b/base/test/values_test_util.cc -index a37b90d42083058013a38cbb7c62c408cfce8d37..45c27c59522dfa3ad7407c628f6dc2c6b0026a41 100644 ---- a/base/test/values_test_util.cc -+++ b/base/test/values_test_util.cc -@@ -168,9 +168,9 @@ class DictionaryHasValuesMatcher - // provided, treats `json` parsing as a Value of a different type as a failure. - // - std::optional ParseJsonHelper(std::string_view json, -- std::optional expected_type) { -- auto result = JSONReader::ReadAndReturnValueWithError( -- json, JSON_PARSE_CHROMIUM_EXTENSIONS | JSON_ALLOW_TRAILING_COMMAS); -+ std::optional expected_type, -+ int options) { -+ auto result = JSONReader::ReadAndReturnValueWithError(json, options); - if (!result.has_value()) { - ADD_FAILURE() << "Failed to parse \"" << json - << "\": " << result.error().message; -@@ -259,21 +259,21 @@ void IsJsonMatcher::DescribeNegationTo(std::ostream* os) const { - *os << "is not the JSON value " << expected_value_; - } - --Value ParseJson(std::string_view json) { -+Value ParseJson(std::string_view json, int options) { - std::optional result = -- ParseJsonHelper(json, /*expected_type=*/std::nullopt); -+ ParseJsonHelper(json, /*expected_type=*/std::nullopt, options); - return result.has_value() ? std::move(*result) : Value(); - } - --Value::Dict ParseJsonDict(std::string_view json) { -+Value::Dict ParseJsonDict(std::string_view json, int options) { - std::optional result = -- ParseJsonHelper(json, /*expected_type=*/Value::Type::DICT); -+ ParseJsonHelper(json, /*expected_type=*/Value::Type::DICT, options); - return result.has_value() ? std::move(*result).TakeDict() : Value::Dict(); - } - --Value::List ParseJsonList(std::string_view json) { -+Value::List ParseJsonList(std::string_view json, int options) { - std::optional result = -- ParseJsonHelper(json, /*expected_type=*/Value::Type::LIST); -+ ParseJsonHelper(json, /*expected_type=*/Value::Type::LIST, options); - return result.has_value() ? std::move(*result).TakeList() : Value::List(); - } - diff --git a/patches/base-test-values_test_util.h.patch b/patches/base-test-values_test_util.h.patch deleted file mode 100644 index 55fd1a460880..000000000000 --- a/patches/base-test-values_test_util.h.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/base/test/values_test_util.h b/base/test/values_test_util.h -index 692f673b7dab3e263dd4e339bc8eb5a84f00375f..fa86904e8a0ec5c4b509323d829d84e34944755b 100644 ---- a/base/test/values_test_util.h -+++ b/base/test/values_test_util.h -@@ -11,6 +11,7 @@ - #include - - #include "base/files/file_path.h" -+#include "base/json/json_reader.h" - #include "base/types/expected.h" - #include "base/values.h" - #include "testing/gmock/include/gmock/gmock-matchers.h" -@@ -44,6 +45,16 @@ void ExpectStringValue(const std::string& expected_str, const Value& actual); - - namespace test { - -+namespace internal { -+ -+// Default parsing options for the json util functions. By default, the content -+// will be parsed with the default set of Chromium-specific behaviours -+// implemented in `JSONReader`, and additionally allowing trailing commas. -+inline constexpr int kDefaultJsonParseOptions = -+ JSON_PARSE_CHROMIUM_EXTENSIONS | JSON_ALLOW_TRAILING_COMMAS; -+ -+} // namespace internal -+ - // A custom GMock matcher which matches if a base::Value::Dict has a key |key| - // that is equal to |value|. - testing::Matcher DictionaryHasValue( -@@ -97,16 +108,19 @@ inline testing::PolymorphicMatcher IsJson(const T& value) { - return testing::MakePolymorphicMatcher(IsJsonMatcher(value)); - } - --// Parses `json` as JSON, allowing trailing commas, and returns the resulting --// value. If `json` fails to parse, causes an EXPECT failure and returns the --// Null Value. --Value ParseJson(std::string_view json); -+// Parses `json` as JSON, using the provided `options`, and returns the -+// resulting value. If `json` fails to parse, causes an EXPECT failure and -+// returns the Null Value. -+Value ParseJson(std::string_view json, -+ int options = internal::kDefaultJsonParseOptions); - - // Just like ParseJson(), except returns Dicts/Lists. If `json` fails to parse - // or is not of the expected type, causes an EXPECT failure and returns an empty - // container. --Value::Dict ParseJsonDict(std::string_view json); --Value::List ParseJsonList(std::string_view json); -+Value::Dict ParseJsonDict(std::string_view json, -+ int options = internal::kDefaultJsonParseOptions); -+Value::List ParseJsonList(std::string_view json, -+ int options = internal::kDefaultJsonParseOptions); - - // Similar to `ParseJsonDict`, however it loads its contents from a file. - // Returns the parsed `Value::Dict` when successful. Otherwise, it causes an From c723f293c9e1355d120084e87b607dfaf130003c Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 7 Feb 2025 13:40:23 +0000 Subject: [PATCH 011/139] Conflict-resolved patches from Chromium 134.0.6998.4 to Chromium 135.0.7003.2. --- ...rowser-download-download_target_determiner.cc.patch | 10 +++++----- patches/v8/BUILD.gn.patch | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches/chrome-browser-download-download_target_determiner.cc.patch b/patches/chrome-browser-download-download_target_determiner.cc.patch index ffa8eb72e762..68eaa89c3e27 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 8ac82dc70ee78a7db876ba195efd62532cc81b8a..66d5eaf018dbe02ae7bb2246b6ad4141f4d80895 100644 +index 440666d4c72c3bf6c80c0ccfb291379e911e4e8e..9cf8bdf551ba55ff8e46264f3ab7e0f39305f4e2 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc -@@ -1316,6 +1316,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1325,6 +1325,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( download_->GetDownloadSource() != download::DownloadSource::DRAG_AND_DROP; if (HasPromptedForPath() || confirmation_reason_ != DownloadConfirmationReason::NONE || @@ -10,11 +10,11 @@ index 8ac82dc70ee78a7db876ba195efd62532cc81b8a..66d5eaf018dbe02ae7bb2246b6ad4141 user_approved_path) { // If the "DownloadRestrictions" enterprise policy explicitly disallows the // download, don't let the user gesture bypass the dangerous verdict. -@@ -1351,6 +1352,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( +@@ -1365,6 +1366,7 @@ DownloadFileType::DangerLevel DownloadTargetDeterminer::GetDangerLevel( ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 || (download_->HasUserGesture() && visits == VISITED_REFERRER))) return DownloadFileType::NOT_DANGEROUS; + BRAVE_DOWNLOAD_TARGET_DETERMINER_GET_DANGER_LEVEL2 return danger_level; - } - + #else + return DownloadFileType::NOT_DANGEROUS; diff --git a/patches/v8/BUILD.gn.patch b/patches/v8/BUILD.gn.patch index 67adb100e5a7..94a678eadb46 100644 --- a/patches/v8/BUILD.gn.patch +++ b/patches/v8/BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/BUILD.gn b/BUILD.gn -index 3fd37aa586b0cd8c02628bf6a5c58ba64f6002dd..c313da6bdf4c2e92dbcfc1652ebd1538ca418614 100644 +index ef1d419a4895f83b850757b0b066efed677fea0d..45b9bbd4d5061647af3cd647455adc70708a69a8 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -814,6 +814,7 @@ config("internal_config_base") { @@ -10,8 +10,8 @@ index 3fd37aa586b0cd8c02628bf6a5c58ba64f6002dd..c313da6bdf4c2e92dbcfc1652ebd1538 } config("internal_config") { -@@ -3168,6 +3169,7 @@ v8_header_set("v8_headers") { - ":cppgc_headers", +@@ -3170,6 +3171,7 @@ v8_header_set("v8_headers") { + ":v8_tracing", ":v8_version", ] + import("//brave/v8/sources.gni") sources += brave_v8_headers_sources public_deps += brave_v8_headers_public_deps From 4db8b9de715838fcc809b63432f0909d6cd76862 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 7 Feb 2025 15:05:15 +0000 Subject: [PATCH 012/139] [cr135] Preempt inclusions to unwated substitutions These occur sporadically due to transient dependencies changing. --- chromium_src/components/sync/service/sync_service_impl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/chromium_src/components/sync/service/sync_service_impl.h b/chromium_src/components/sync/service/sync_service_impl.h index a2119c7e01ba..82ab64873d20 100644 --- a/chromium_src/components/sync/service/sync_service_impl.h +++ b/chromium_src/components/sync/service/sync_service_impl.h @@ -8,6 +8,7 @@ #include "base/gtest_prod_util.h" #include "components/signin/public/identity_manager/identity_manager.h" +#include "components/sync/engine/sync_engine_host.h" #define BRAVE_SYNC_SERVICE_IMPL_H_ \ private: \ From f4303959a382494f45542c20a483609c9b6e98c7 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Fri, 7 Feb 2025 15:06:20 +0000 Subject: [PATCH 013/139] [cr135] `FilePath::StringPieceType` renamed This alias has been renamed to better reflect the use of `string_view`. Chromium change: https://chromium.googlesource.com/chromium/src/+/534a26b46b5d5315def1d0760b52191710e1b368 commit 534a26b46b5d5315def1d0760b52191710e1b368 Author: Lei Zhang Date: Thu Jan 30 17:35:09 2025 -0800 Add base::FilePath::StringViewType Add a replacement alias for StringPieceType, now that base::StringPiece is gone. Use this replacement in base::FilePath and its unit tests. Modernize modified files to use `using` instead of `typedef` as well. Change-Id: Ib87150f54b6b7de3696a57b14bd12d92a82239ef --- .../ai_chat/core/browser/ai_chat_service.cc | 2 +- components/ipfs/ipfs_common.h | 10 ++++---- components/playlist/browser/mime_util.cc | 6 ++--- components/playlist/browser/mime_util.h | 2 +- .../playlist/browser/playlist_service.cc | 4 ++-- components/tor/constants.cc | 2 +- tools/redirect_cc/redirect_cc.cc | 24 +++++++++---------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/components/ai_chat/core/browser/ai_chat_service.cc b/components/ai_chat/core/browser/ai_chat_service.cc index 9e4dba658433..60e079b407e5 100644 --- a/components/ai_chat/core/browser/ai_chat_service.cc +++ b/components/ai_chat/core/browser/ai_chat_service.cc @@ -56,7 +56,7 @@ namespace ai_chat { namespace { -constexpr base::FilePath::StringPieceType kDBFileName = +constexpr base::FilePath::StringViewType kDBFileName = FILE_PATH_LITERAL("AIChat"); std::vector FilterVisibleConversations( diff --git a/components/ipfs/ipfs_common.h b/components/ipfs/ipfs_common.h index 7676568e571e..fa7dce5f251f 100644 --- a/components/ipfs/ipfs_common.h +++ b/components/ipfs/ipfs_common.h @@ -10,22 +10,22 @@ #include "build/build_config.h" #if BUILDFLAG(IS_WIN) -static const base::FilePath::StringPieceType kIpfsClientComponentId = +static const base::FilePath::StringViewType kIpfsClientComponentId = FILE_PATH_LITERAL("lnbclahgobmjphilkalbhebakmblnbij"); #elif BUILDFLAG(IS_MAC) #if defined(ARCH_CPU_ARM64) -static const base::FilePath::StringPieceType kIpfsClientComponentId = +static const base::FilePath::StringViewType kIpfsClientComponentId = FILE_PATH_LITERAL("lejaflgbgglfaomemffoaappaihfligf"); #else -static const base::FilePath::StringPieceType kIpfsClientComponentId = +static const base::FilePath::StringViewType kIpfsClientComponentId = FILE_PATH_LITERAL("nljcddpbnaianmglkpkneakjaapinabi"); #endif #elif BUILDFLAG(IS_LINUX) #if defined(ARCH_CPU_ARM64) -static const base::FilePath::StringPieceType kIpfsClientComponentId = +static const base::FilePath::StringViewType kIpfsClientComponentId = FILE_PATH_LITERAL("fmmldihckdnognaabhligdpckkeancng"); #else -static const base::FilePath::StringPieceType kIpfsClientComponentId = +static const base::FilePath::StringViewType kIpfsClientComponentId = FILE_PATH_LITERAL("oecghfpdmkjlhnfpmmjegjacfimiafjp"); #endif #endif diff --git a/components/playlist/browser/mime_util.cc b/components/playlist/browser/mime_util.cc index 7efc96de4df3..61705bd7c11c 100644 --- a/components/playlist/browser/mime_util.cc +++ b/components/playlist/browser/mime_util.cc @@ -26,7 +26,7 @@ namespace { // * https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types // constexpr inline auto kMimeToExtensionMap = - base::MakeFixedFlatMap( + base::MakeFixedFlatMap( {/*m3u8*/ {"application/x-mpegurl", FILE_PATH_LITERAL("m3u8")}, {"application/vnd.apple.mpegurl", FILE_PATH_LITERAL("m3u8")}, @@ -65,7 +65,7 @@ constexpr inline auto kMimeToExtensionMap = {"video/x-m4v", FILE_PATH_LITERAL("m4v")}}); constexpr inline auto kExtensionToMimeMap = - base::MakeFixedFlatMap( + base::MakeFixedFlatMap( {{FILE_PATH_LITERAL("m3u8"), "application/x-mpegurl"}, {FILE_PATH_LITERAL("aac"), "audio/aac"}, {FILE_PATH_LITERAL("flac"), "audio/flac"}, @@ -99,7 +99,7 @@ std::optional GetFileExtensionForMimetype( } std::optional GetMimeTypeForFileExtension( - base::FilePath::StringPieceType file_extension) { + base::FilePath::StringViewType file_extension) { if (decltype(kExtensionToMimeMap)::const_iterator iter = kExtensionToMimeMap.find(file_extension); iter != kExtensionToMimeMap.end()) { diff --git a/components/playlist/browser/mime_util.h b/components/playlist/browser/mime_util.h index fa9a0487f65d..d50a6937002c 100644 --- a/components/playlist/browser/mime_util.h +++ b/components/playlist/browser/mime_util.h @@ -21,7 +21,7 @@ std::optional GetFileExtensionForMimetype( std::string_view mime_type); std::optional GetMimeTypeForFileExtension( - base::FilePath::StringPieceType file_extension); + base::FilePath::StringViewType file_extension); std::vector GetSupportedMimetypes(); diff --git a/components/playlist/browser/playlist_service.cc b/components/playlist/browser/playlist_service.cc index 4e4d468cb57f..19d80b4ea331 100644 --- a/components/playlist/browser/playlist_service.cc +++ b/components/playlist/browser/playlist_service.cc @@ -37,10 +37,10 @@ namespace playlist { namespace { -constexpr base::FilePath::StringPieceType kBaseDirName = +constexpr base::FilePath::StringViewType kBaseDirName = FILE_PATH_LITERAL("playlist"); -constexpr base::FilePath::StringPieceType kThumbnailFileName = +constexpr base::FilePath::StringViewType kThumbnailFileName = FILE_PATH_LITERAL("thumbnail"); std::vector GetOrphanedPaths( diff --git a/components/tor/constants.cc b/components/tor/constants.cc index 697078215bda..dd2f06f01914 100644 --- a/components/tor/constants.cc +++ b/components/tor/constants.cc @@ -19,7 +19,7 @@ namespace tor { namespace { // The filename for the tor client config file. -constexpr base::FilePath::StringPieceType kTorRcFilename = +constexpr base::FilePath::StringViewType kTorRcFilename = FILE_PATH_LITERAL("tor-torrc"); base::FilePath GetUserDataDir() { diff --git a/tools/redirect_cc/redirect_cc.cc b/tools/redirect_cc/redirect_cc.cc index 040aa27b506f..7cf472ced22b 100644 --- a/tools/redirect_cc/redirect_cc.cc +++ b/tools/redirect_cc/redirect_cc.cc @@ -27,15 +27,15 @@ #include "base/environment.h" #endif // defined(REDIRECT_CC_AS_REWRAPPER) -const base::FilePath::StringPieceType kIncludeFlag = FILE_PATH_LITERAL("-I"); -const base::FilePath::StringPieceType kBraveChromiumSrc = +const base::FilePath::StringViewType kIncludeFlag = FILE_PATH_LITERAL("-I"); +const base::FilePath::StringViewType kBraveChromiumSrc = FILE_PATH_LITERAL("brave/chromium_src"); -const base::FilePath::StringPieceType kGen = FILE_PATH_LITERAL("gen"); -const base::FilePath::StringPieceType kCompileFileFlags[] = { +const base::FilePath::StringViewType kGen = FILE_PATH_LITERAL("gen"); +const base::FilePath::StringViewType kCompileFileFlags[] = { FILE_PATH_LITERAL("-c"), FILE_PATH_LITERAL("/c"), }; -const base::FilePath::StringPieceType kShowIncludesFlag = +const base::FilePath::StringViewType kShowIncludesFlag = FILE_PATH_LITERAL("/showIncludes"); class RedirectCC { @@ -95,7 +95,7 @@ class RedirectCC { // Find directories to work with first. for (const auto* arg : args_.subspan(first_compiler_arg_idx)) { - base::FilePath::StringPieceType arg_piece(arg); + base::FilePath::StringViewType arg_piece(arg); if (arg_piece.starts_with(kIncludeFlag) && arg_piece.ends_with(kBraveChromiumSrc)) { arg_piece.remove_prefix(kIncludeFlag.size()); @@ -125,7 +125,7 @@ class RedirectCC { for (size_t arg_idx = first_compiler_arg_idx; arg_idx < args_.size(); ++arg_idx) { - const base::FilePath::StringPieceType arg_piece = args_[arg_idx]; + const base::FilePath::StringViewType arg_piece = args_[arg_idx]; if (!compile_file_found && base::Contains(kCompileFileFlags, arg_piece)) { compile_file_found = true; if (arg_idx + 1 >= args_.size()) { @@ -135,12 +135,12 @@ class RedirectCC { // Trim a file path to look for a similar file in // brave/chromium_src. - base::FilePath::StringPieceType path_cc = args_[arg_idx + 1]; + base::FilePath::StringViewType path_cc = args_[arg_idx + 1]; if (!path_cc.empty() && path_cc[0] == arg_piece[0]) { // That's not a file path, but another compiler parameter. This syntax // is used by asm compiler. We can safely ignore this, becaused we // don't redirect asm files. - path_cc = base::FilePath::StringPieceType(); + path_cc = base::FilePath::StringViewType(); } else if (path_cc.starts_with(chromium_src_dir_with_slash)) { // Most common case - a file is located directly in src/... path_cc.remove_prefix(chromium_src_dir_with_slash.size()); @@ -162,7 +162,7 @@ class RedirectCC { path_cc.remove_prefix(path_cc_parts[1].size() + 1); } else { LOG(WARNING) << "unhandled path: " << path_cc; - path_cc = base::FilePath::StringPieceType(); + path_cc = base::FilePath::StringViewType(); } } @@ -284,8 +284,8 @@ class RedirectCC { for (const auto& arg : argv) { const auto& space_separator = cmd_line.empty() - ? base::FilePath::StringPieceType() - : base::FilePath::StringPieceType(FILE_PATH_LITERAL(" ")); + ? base::FilePath::StringViewType() + : base::FilePath::StringViewType(FILE_PATH_LITERAL(" ")); const auto& arg_to_append = QuoteForCommandLineToArgvW(arg, "ted_arg) ? quotted_arg : arg; base::StrAppend(&cmd_line, {space_separator, arg_to_append}); From 90d9aa842ef6e9fd87453d63ead6c9f93d348d37 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 10 Feb 2025 09:05:03 +0000 Subject: [PATCH 014/139] [cr135] `TabGroupedStateChanged` passing old/new group This is just the addition of an extra arg, however in our codebase that args is of no concern. Chromium change: https://chromium.googlesource.com/chromium/src/+/72171b42926d36e600dca37eb99268a5c24a229a commit 72171b42926d36e600dca37eb99268a5c24a229a Author: Shibalik Mohapatra Date: Wed Feb 5 13:08:06 2025 -0800 [SxS] Update the observer signature for TabGroupedStateChanged. The TabGroupedStateChanged observer will replace clients of ChangeTabGroupContents. Inorder to do so, some additional information is needed by the clients. Change-Id: I71dfc9705d115a272fa53437808fe219808a11b0 --- .../split_view_tab_strip_model_adapter.cc | 28 ++++++++++--------- .../tabs/split_view_tab_strip_model_adapter.h | 4 ++- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/browser/ui/tabs/split_view_tab_strip_model_adapter.cc b/browser/ui/tabs/split_view_tab_strip_model_adapter.cc index edd2020bdf58..310bb7b87ba8 100644 --- a/browser/ui/tabs/split_view_tab_strip_model_adapter.cc +++ b/browser/ui/tabs/split_view_tab_strip_model_adapter.cc @@ -277,7 +277,9 @@ void SplitViewTabStripModelAdapter::TabPinnedStateChanged( } void SplitViewTabStripModelAdapter::TabGroupedStateChanged( - std::optional group, + TabStripModel* tab_strip_model, + std::optional old_group, + std::optional new_group, tabs::TabInterface* tab, int index) { if (!model_->ContainsIndex(index)) { @@ -297,18 +299,18 @@ void SplitViewTabStripModelAdapter::TabGroupedStateChanged( } base::SequencedTaskRunner::GetCurrentDefault()->PostTask( - FROM_HERE, - base::BindOnce( - [](base::WeakPtr adapter, TabTile tile, - const tabs::TabHandle& source, - std::optional group) { - if (!adapter) { - return; - } - - adapter->SynchronizeGroupedState(tile, source, group); - }, - weak_ptr_factory_.GetWeakPtr(), *tile, changed_tab_handle, group)); + FROM_HERE, base::BindOnce( + [](base::WeakPtr adapter, + TabTile tile, const tabs::TabHandle& source, + std::optional group) { + if (!adapter) { + return; + } + + adapter->SynchronizeGroupedState(tile, source, group); + }, + weak_ptr_factory_.GetWeakPtr(), *tile, changed_tab_handle, + new_group)); } void SplitViewTabStripModelAdapter::OnTabRemoved( diff --git a/browser/ui/tabs/split_view_tab_strip_model_adapter.h b/browser/ui/tabs/split_view_tab_strip_model_adapter.h index 982d5aeae84a..14e55eb733b6 100644 --- a/browser/ui/tabs/split_view_tab_strip_model_adapter.h +++ b/browser/ui/tabs/split_view_tab_strip_model_adapter.h @@ -45,7 +45,9 @@ class SplitViewTabStripModelAdapter : public TabStripModelObserver { void TabPinnedStateChanged(TabStripModel* tab_strip_model, content::WebContents* contents, int index) override; - void TabGroupedStateChanged(std::optional group, + void TabGroupedStateChanged(TabStripModel* tab_strip_model, + std::optional old_group, + std::optional new_group, tabs::TabInterface* tab, int index) override; From 8e503c0ac82a2917615213673a36f9ec1e5a076e Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 10 Feb 2025 09:06:41 +0000 Subject: [PATCH 015/139] [cr135] `SkiaImage` to `ImageModel` explicit conversion It is now required to explicitly use `ui::ImageModel::FromImageSkia` to convert a `SkiaImage` to `ImageModel`. Chromium change: https://chromium.googlesource.com/chromium/src/+/ec4049b44dd5d74660b85ced077c6268fa305e77 commit ec4049b44dd5d74660b85ced077c6268fa305e77 Author: Sangwoo Ko Date: Thu Feb 6 06:28:33 2025 -0800 Remove ImageView::SetImage() with ImageSkia param In favor of ui::ImageModel, this version of SetImage should be deprecated. This patch doesn't have any intended behavioral change. Bug: 40137576 --- .../views/brave_ads/notification_ad_control_buttons_view.cc | 2 +- browser/ui/views/brave_tooltips/brave_tooltip_view.cc | 4 ++-- .../brave_search_conversion/promotion_button_view.cc | 4 ++-- .../ui/views/sidebar/sidebar_item_added_feedback_bubble.cc | 4 ++-- browser/ui/views/tabs/brave_tab_container.cc | 6 ++++-- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/browser/ui/views/brave_ads/notification_ad_control_buttons_view.cc b/browser/ui/views/brave_ads/notification_ad_control_buttons_view.cc index 2088aaa104ea..e61cbc207c59 100644 --- a/browser/ui/views/brave_ads/notification_ad_control_buttons_view.cc +++ b/browser/ui/views/brave_ads/notification_ad_control_buttons_view.cc @@ -88,7 +88,7 @@ void NotificationAdControlButtonsView::UpdateInfoButton() { should_use_dark_colors ? kBraveAdsDarkModeInfoButtonIcon : kBraveAdsLightModeInfoButtonIcon, kInfoButtonIconDipSize, SK_ColorTRANSPARENT); - info_button_->SetImage(image_skia); + info_button_->SetImage(ui::ImageModel::FromImageSkia(image_skia)); } void NotificationAdControlButtonsView::CreateCloseButton() { diff --git a/browser/ui/views/brave_tooltips/brave_tooltip_view.cc b/browser/ui/views/brave_tooltips/brave_tooltip_view.cc index 9c06bb4ea7ea..25d93a719af9 100644 --- a/browser/ui/views/brave_tooltips/brave_tooltip_view.cc +++ b/browser/ui/views/brave_tooltips/brave_tooltip_view.cc @@ -220,8 +220,8 @@ views::View* BraveTooltipView::CreateHeaderView() { views::ImageView* BraveTooltipView::CreateIconView() { views::ImageView* view = new views::ImageView(); - view->SetImage( - gfx::CreateVectorIcon(kBraveTooltipsStopwatchIcon, kIconColor)); + view->SetImage(ui::ImageModel::FromImageSkia( + gfx::CreateVectorIcon(kBraveTooltipsStopwatchIcon, kIconColor))); return view; } diff --git a/browser/ui/views/location_bar/brave_search_conversion/promotion_button_view.cc b/browser/ui/views/location_bar/brave_search_conversion/promotion_button_view.cc index b888313d7ebc..972b73037c85 100644 --- a/browser/ui/views/location_bar/brave_search_conversion/promotion_button_view.cc +++ b/browser/ui/views/location_bar/brave_search_conversion/promotion_button_view.cc @@ -97,8 +97,8 @@ PromotionButtonView::PromotionButtonView() { PromotionButtonView::~PromotionButtonView() = default; void PromotionButtonView::UpdateTargetProviderImage(const gfx::Image& image) { - target_provider_image_->SetImage( - gfx::ResizedImage(image, {kIconSize, kIconSize}).AsImageSkia()); + target_provider_image_->SetImage(ui::ImageModel::FromImageSkia( + gfx::ResizedImage(image, {kIconSize, kIconSize}).AsImageSkia())); } void PromotionButtonView::AnimateExpand() { diff --git a/browser/ui/views/sidebar/sidebar_item_added_feedback_bubble.cc b/browser/ui/views/sidebar/sidebar_item_added_feedback_bubble.cc index 3dc34f33f68b..678b19d43cc4 100644 --- a/browser/ui/views/sidebar/sidebar_item_added_feedback_bubble.cc +++ b/browser/ui/views/sidebar/sidebar_item_added_feedback_bubble.cc @@ -115,8 +115,8 @@ void SidebarItemAddedFeedbackBubble::AddChildViews() { views::BoxLayout::Orientation::kHorizontal, gfx::Insets(), kChildSpacing)); auto* image = first_row->AddChildView(std::make_unique()); - image->SetImage( - gfx::CreateVectorIcon(kSidebarItemAddedCheckIcon, SK_ColorWHITE)); + image->SetImage(ui::ImageModel::FromImageSkia( + gfx::CreateVectorIcon(kSidebarItemAddedCheckIcon, SK_ColorWHITE))); // Use 12pt and 600 weight. auto* label = first_row->AddChildView(std::make_unique( brave_l10n::GetLocalizedResourceUTF16String( diff --git a/browser/ui/views/tabs/brave_tab_container.cc b/browser/ui/views/tabs/brave_tab_container.cc index d81bf5045c97..f94fac0cb811 100644 --- a/browser/ui/views/tabs/brave_tab_container.cc +++ b/browser/ui/views/tabs/brave_tab_container.cc @@ -550,7 +550,8 @@ BraveTabContainer::DropArrow::DropArrow(const BrowserRootView::DropIndex& index, arrow_window_->Init(std::move(params)); arrow_view_ = arrow_window_->SetContentsView(std::make_unique()); - arrow_view_->SetImage(GetDropArrowImage(position_, beneath_)); + arrow_view_->SetImage( + ui::ImageModel::FromImageSkia(*GetDropArrowImage(position_, beneath_))); scoped_observation_.Observe(arrow_window_.get()); arrow_window_->Show(); @@ -569,7 +570,8 @@ void BraveTabContainer::DropArrow::SetBeneath(bool beneath) { } beneath_ = beneath; - arrow_view_->SetImage(GetDropArrowImage(position_, beneath)); + arrow_view_->SetImage( + ui::ImageModel::FromImageSkia(*GetDropArrowImage(position_, beneath))); } void BraveTabContainer::DropArrow::SetWindowBounds(const gfx::Rect& bounds) { From dc53b81ad5eaf18e30193206507f918132fd046f Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 10 Feb 2025 09:09:41 +0000 Subject: [PATCH 016/139] [cr135] `NotifyAccessibilityEvent` deprecated This function call is not necessary anymore, as previous ViewsAX work had already moved away from the hooks this event was triggering. Chromium change: https://chromium.googlesource.com/chromium/src/+/6d3f70993e0bbb5acdb20f5981bb5b9fa9dd7116 commit 6d3f70993e0bbb5acdb20f5981bb5b9fa9dd7116 Author: Javier Contreras Tenorio (from Dev Box) Date: Wed Feb 5 12:34:22 2025 -0800 [views-ax] Deprecate `View::NotifyAccessibilityEvent` This CL adds "deprecated" to `View::NotifyAccessibilityEvent`. TLDR: This CL just renames. In most situations, this function should not be called directly. There are a lot of events that are already sent automatically by the setters from ViewAccessibility. Soon, events will be generated automatically by the AXEventGenerator, using the AXNodeData cached in the View's ViewAccessibility. Some specific scenarios currently do require manual event generation, for example if its an event not being fired by the ViewAccessibility setters. In essence, for a lot of the events to be sent, Views authors should just need to keep the accessibility cache in ViewAccessibility updated by using the setters found in that class. There are some others that are not being sent through there currently, and firing them manually is still allowed. Once ViewsAX is completed though, most events will be generated through the AXEventGenerator, which just requires Views authors to keep the accessibility cache up to date. Bug: 325137417 --- browser/ui/views/brave_ads/notification_ad_header_view.cc | 3 --- browser/ui/views/brave_ads/notification_ad_popup.cc | 2 -- browser/ui/views/brave_ads/notification_ad_view.cc | 2 -- browser/ui/views/brave_tooltips/brave_tooltip_popup.cc | 2 -- 4 files changed, 9 deletions(-) diff --git a/browser/ui/views/brave_ads/notification_ad_header_view.cc b/browser/ui/views/brave_ads/notification_ad_header_view.cc index c77f8a83525e..c231971c545b 100644 --- a/browser/ui/views/brave_ads/notification_ad_header_view.cc +++ b/browser/ui/views/brave_ads/notification_ad_header_view.cc @@ -56,9 +56,6 @@ NotificationAdHeaderView::~NotificationAdHeaderView() = default; void NotificationAdHeaderView::SetTitle(const std::u16string& text) { CHECK(title_label_); title_label_->SetText(text); - - NotifyAccessibilityEvent(ax::mojom::Event::kTextChanged, true); - UpdateAccessibleName(); } diff --git a/browser/ui/views/brave_ads/notification_ad_popup.cc b/browser/ui/views/brave_ads/notification_ad_popup.cc index 6395291d1fd4..834780ebf383 100644 --- a/browser/ui/views/brave_ads/notification_ad_popup.cc +++ b/browser/ui/views/brave_ads/notification_ad_popup.cc @@ -94,8 +94,6 @@ NotificationAdPopup::NotificationAdPopup( animation_(std::make_unique(this)) { CreatePopup(browser_native_window, browser_native_view); - NotifyAccessibilityEvent(ax::mojom::Event::kAlert, true); - display::Screen* screen = display::Screen::GetScreen(); if (screen) { screen_observation_.Observe(screen); diff --git a/browser/ui/views/brave_ads/notification_ad_view.cc b/browser/ui/views/brave_ads/notification_ad_view.cc index d2e44efb97a5..3d588ecf72d0 100644 --- a/browser/ui/views/brave_ads/notification_ad_view.cc +++ b/browser/ui/views/brave_ads/notification_ad_view.cc @@ -71,8 +71,6 @@ void NotificationAdView::MaybeNotifyAccessibilityEvent() { } accessible_name_ = accessible_name; - - NotifyAccessibilityEvent(ax::mojom::Event::kTextChanged, true); UpdateAccessibleName(); } diff --git a/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc b/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc index b27f58106cc7..cf7aba5bde5e 100644 --- a/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc +++ b/browser/ui/views/brave_tooltips/brave_tooltip_popup.cc @@ -69,8 +69,6 @@ BraveTooltipPopup::BraveTooltipPopup(std::unique_ptr tooltip) GetViewAccessibility().SetRoleDescription(l10n_util::GetStringUTF8( IDS_BRAVE_TOOLTIPS_BRAVE_TOOLTIP_ACCESSIBLE_NAME)); - NotifyAccessibilityEvent(ax::mojom::Event::kAlert, true); - display::Screen* screen = display::Screen::GetScreen(); if (screen) { screen->AddObserver(this); From cc1ef76033a22afcdaaf0b99754e9bd054088cdb Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 10 Feb 2025 09:16:26 +0000 Subject: [PATCH 017/139] [cr135] `BubbleBorder` ctor dropped colour arg This is a migration to use `ui::ColorVariant`, and for the case we have it doesn't seem to be that important. Chromium change: https://chromium.googlesource.com/chromium/src/+/0d20027475eb1e4024318d9d20454357cbab070f commit 0d20027475eb1e4024318d9d20454357cbab070f Author: Zoraiz Naeem Date: Thu Feb 6 15:30:33 2025 -0800 Migrate BubbleBorder to use `ui::ColorVariant` This is required to support ColorId for `BubbleDialogDelegate` and its related classes. Bug: b:261653838 --- .../brave_help_bubble/brave_help_bubble_delegate_view.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/browser/ui/views/brave_help_bubble/brave_help_bubble_delegate_view.cc b/browser/ui/views/brave_help_bubble/brave_help_bubble_delegate_view.cc index 5e678ff1e851..93e0c560a154 100644 --- a/browser/ui/views/brave_help_bubble/brave_help_bubble_delegate_view.cc +++ b/browser/ui/views/brave_help_bubble/brave_help_bubble_delegate_view.cc @@ -37,9 +37,8 @@ class BorderWithArrow : public views::BubbleBorder { enum BubbleArrowPart { kFill, kBorder }; explicit BorderWithArrow(Arrow arrow, ui::ColorId color_id) - : views::BubbleBorder(arrow, - BubbleBorder::Shadow::STANDARD_SHADOW, - color_id) { + : views::BubbleBorder(arrow, BubbleBorder::Shadow::STANDARD_SHADOW) { + SetColor(color_id); set_visible_arrow(true); } From 3d189f42a545afde149d1b24b0037196a31332db Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 10 Feb 2025 09:22:26 +0000 Subject: [PATCH 018/139] [cr135][WIP] `IDS_PROFILES_CLOSE_X_WINDOWS_BUTTON` deleted Chromium change: https://chromium.googlesource.com/chromium/src/+/b72b8e2467302a0901da5227140b8443fb2ceb88 commit b72b8e2467302a0901da5227140b8443fb2ceb88 Author: David Roger Date: Thu Feb 6 00:52:13 2025 -0800 [Uno-D] Cleanup kExplicitBrowserSigninUIOnDesktop in profile menu Bug: 344531408 --- browser/ui/views/profiles/brave_profile_menu_view.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/ui/views/profiles/brave_profile_menu_view.cc b/browser/ui/views/profiles/brave_profile_menu_view.cc index 7c3a6aa20077..8775de4f33b2 100644 --- a/browser/ui/views/profiles/brave_profile_menu_view.cc +++ b/browser/ui/views/profiles/brave_profile_menu_view.cc @@ -85,8 +85,8 @@ void BraveProfileMenuView::BuildFeatureButtons() { } else { if (window_count > 1) { AddFeatureButton( - l10n_util::GetPluralStringFUTF16(IDS_PROFILES_CLOSE_X_WINDOWS_BUTTON, - window_count), + l10n_util::GetPluralStringFUTF16( + IDS_PROFILE_MENU_CLOSE_PROFILE_X_WINDOWS_BUTTON, window_count), base::BindRepeating(&ProfileMenuView::OnExitProfileButtonClicked, base::Unretained(this)), vector_icons::kCloseIcon); From e4b1c02186ee5050da3a9fc7c514913c329c549b Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Fri, 7 Feb 2025 15:36:12 -0500 Subject: [PATCH 019/139] [Android] Remove `output_all_resource_defines` tag --- browser/ui/android/strings/android_brave_strings.grd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd index 7bc4b4210d69..ccabb78ff707 100644 --- a/browser/ui/android/strings/android_brave_strings.grd +++ b/browser/ui/android/strings/android_brave_strings.grd @@ -2,7 +2,7 @@ - + From 5e001eec3719989863f4026c62765c5c49b4c3a2 Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Fri, 7 Feb 2025 15:36:35 -0500 Subject: [PATCH 020/139] [Android] Add a cold start metric for NTP Chromium change: https://chromium.googlesource.com/chromium/src/+/4cefe9fea9bfad8d1f4066460a5da16019812b32 [NTP Startup] Add a cold start metric for NTP loads on Clank Current start metrics work with webpage or FDT launches. With Clank Home Frequency being increased, the current startup guardian metric's volume has been diluted. This CL adds a cold start metric to capture load times for NTP launches. The metric is recorded when FeedSurfaceProvider's view (root NTP view) calls onDraw. Specifically, the metric measures the time from activity creation to the time when the first draw pass occurs on the root view. This is similar to a previous NTP startup metric (NewTabPage.TimeToFirstDraw2) that has been deprecated, but utilizing new cold-start heuristics and recording the time from activity start instead of the start of NTP construction. Bug: 369109839 --- .../chromium/chrome/browser/ntp/BraveNewTabPage.java | 10 +++++++--- .../chrome/browser/BraveSwipeRefreshHandlerTest.java | 3 ++- .../org/chromium/chrome/browser/BytecodeTest.java | 4 +++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java index feb346a336a6..4c632e56e805 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPage.java @@ -21,6 +21,7 @@ import org.chromium.chrome.browser.feed.FeedSwipeRefreshLayout; import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.magic_stack.ModuleRegistry; +import org.chromium.chrome.browser.metrics.StartupMetricsTracker; import org.chromium.chrome.browser.privacy.settings.PrivacyPreferencesManagerImpl; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; @@ -74,7 +75,8 @@ public BraveNewTabPage( ObservableSupplier tabContentManagerSupplier, ObservableSupplier tabStripHeightSupplier, OneshotSupplier moduleRegistrySupplier, - ObservableSupplier edgeToEdgeControllerSupplier) { + ObservableSupplier edgeToEdgeControllerSupplier, + StartupMetricsTracker startupMetricsTracker) { super( activity, browserControlsStateProvider, @@ -97,7 +99,8 @@ public BraveNewTabPage( tabContentManagerSupplier, tabStripHeightSupplier, moduleRegistrySupplier, - edgeToEdgeControllerSupplier); + edgeToEdgeControllerSupplier, + startupMetricsTracker); mJankTracker = jankTracker; @@ -134,7 +137,8 @@ protected void initializeMainView( boolean isInNightMode, Supplier shareDelegateSupplier, String url, - ObservableSupplier edgeToEdgeControllerSupplier) { + ObservableSupplier edgeToEdgeControllerSupplier, + StartupMetricsTracker startupMetricsTracker) { // Override surface provider Profile profile = Profile.fromWebContents(mTab.getWebContents()); diff --git a/android/javatests/org/chromium/chrome/browser/BraveSwipeRefreshHandlerTest.java b/android/javatests/org/chromium/chrome/browser/BraveSwipeRefreshHandlerTest.java index 4488574d5318..8c5aba97ca7c 100644 --- a/android/javatests/org/chromium/chrome/browser/BraveSwipeRefreshHandlerTest.java +++ b/android/javatests/org/chromium/chrome/browser/BraveSwipeRefreshHandlerTest.java @@ -81,7 +81,8 @@ private TabbedModeTabDelegateFactory createTabDelegateFactory() { null, rootUiCoordinator.getToolbarManager().getTabStripHeightSupplier(), new OneshotSupplierImpl(), - new ObservableSupplierImpl()); + new ObservableSupplierImpl(), + cta.getStartupMetricsTracker()); } @Test diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 5bc3bf969fbc..21040d68f0a3 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -83,6 +83,7 @@ import org.chromium.chrome.browser.lifecycle.ActivityLifecycleDispatcher; import org.chromium.chrome.browser.logo.CachedTintedBitmap; import org.chromium.chrome.browser.logo.LogoCoordinator; +import org.chromium.chrome.browser.metrics.StartupMetricsTracker; import org.chromium.chrome.browser.multiwindow.MultiInstanceManager; import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher; import org.chromium.chrome.browser.new_tab_url.DseNewTabUrlManager; @@ -1256,7 +1257,8 @@ public void testConstructorsExistAndMatch() throws Exception { ObservableSupplier.class, ObservableSupplier.class, OneshotSupplier.class, - ObservableSupplier.class)); + ObservableSupplier.class, + StartupMetricsTracker.class)); Assert.assertTrue( constructorsMatch( "org/chromium/chrome/browser/toolbar/top/TopToolbarCoordinator", From a7e5cac2ed0ea37182c6b50d21d92584d228f5d5 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 10 Feb 2025 09:38:22 +0000 Subject: [PATCH 021/139] Update from Chromium 134.0.6998.4 to Chromium 135.0.7009.0. --- .../transport_security_state_generator/input_file_parsers.cc | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index ea515e2f8619..45d887a69e87 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -552,9 +552,9 @@ bool ParseCertificatesFile(std::string_view certs_input, Pinsets* pinsets, base::Time* timestamp) { constexpr std::string_view brave_certs = R"brave_certs( -# Last updated: Fri Feb 07 13:34:27 2025 +# Last updated: Mon Feb 10 09:38:22 2025 PinsListTimestamp -1738935267 +1739180302 # =====BEGIN BRAVE ROOTS ASC===== #From https://www.amazontrust.com/repository/ diff --git a/package.json b/package.json index ef0def679983..afade21760b7 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "135.0.7003.2", + "tag": "135.0.7009.0", "repository": { "url": "https://github.com/brave/chromium" } From 00d7dff88f523c694460e6dd71acb1021de9d76a Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 10 Feb 2025 09:51:03 +0000 Subject: [PATCH 022/139] [cr135] Reconcile `SOCKS5ClientSocket` patch with safe buffers fixes This patch had significant changes due to upstream safe buffers refactor to this file. Chromium change: https://chromium.googlesource.com/chromium/src/+/21cedfc448846e7c778352e208b153c68a024316 commit 21cedfc448846e7c778352e208b153c68a024316 Author: Matt Menke Date: Fri Feb 7 09:50:21 2025 -0800 Remove allow_unsafe_buffers from socks5_client_socket.cc. This CL restructures the read/write loop more than strictly needed to reduce use of variables and copies, using a pair of fancier IOBuffer subclasses rather than IOBuffers + a std::string + read/write size integers. Bug: 40284755 --- .../net-socket-socks5_client_socket.cc.patch | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/patches/net-socket-socks5_client_socket.cc.patch b/patches/net-socket-socks5_client_socket.cc.patch index f4ce4a0bc624..0b9fe9b01a78 100644 --- a/patches/net-socket-socks5_client_socket.cc.patch +++ b/patches/net-socket-socks5_client_socket.cc.patch @@ -1,8 +1,8 @@ diff --git a/net/socket/socks5_client_socket.cc b/net/socket/socks5_client_socket.cc -index 575c1dcd1bc31047ff0155f3287ac9dc145307f1..645139d09cef2744d384ddf05daef9640ea29d4e 100644 +index a908a11fa618d1258dc2f4dc8e733c1a3c7f99ff..adb78aa25e5915bce393d247bdf6f5f018310379 100644 --- a/net/socket/socks5_client_socket.cc +++ b/net/socket/socks5_client_socket.cc -@@ -225,6 +225,9 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { +@@ -224,6 +224,9 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { net_log_.EndEventWithNetErrorCode(NetLogEventType::SOCKS5_GREET_READ, rv); break; @@ -12,42 +12,47 @@ index 575c1dcd1bc31047ff0155f3287ac9dc145307f1..645139d09cef2744d384ddf05daef964 case STATE_HANDSHAKE_WRITE: DCHECK_EQ(OK, rv); net_log_.BeginEvent(NetLogEventType::SOCKS5_HANDSHAKE_WRITE); -@@ -252,8 +255,6 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { - return rv; +@@ -248,12 +251,9 @@ int SOCKS5ClientSocket::DoLoop(int last_io_result) { + NOTREACHED() << "bad state"; + } + } while (rv != ERR_IO_PENDING && next_state_ != STATE_NONE); +- return rv; ++ return rv; } --const char kSOCKS5GreetWriteData[] = { 0x05, 0x01, 0x00 }; // no authentication +-static constexpr std::array kSOCKS5GreetWriteData{ +- 0x05, 0x01, 0x00}; // no authentication - int SOCKS5ClientSocket::DoGreetWrite() { // Since we only have 1 byte to send the hostname length in, if the // URL has a hostname longer than 255 characters we can't send it. -@@ -263,8 +264,12 @@ int SOCKS5ClientSocket::DoGreetWrite() { +@@ -263,8 +263,13 @@ int SOCKS5ClientSocket::DoGreetWrite() { } - if (buffer_.empty()) { -- buffer_ = -- std::string(kSOCKS5GreetWriteData, std::size(kSOCKS5GreetWriteData)); + if (!write_buf_) { + const char greeting[] = { + 0x05, // SOCKS version + 0x01, // number of authentication methods + static_cast(auth_method()), + }; -+ buffer_ = std::string(greeting, sizeof(greeting)); - bytes_sent_ = 0; + auto greet_buffer = +- base::MakeRefCounted(kSOCKS5GreetWriteData); ++ base::MakeRefCounted(greeting); + write_buf_ = base::MakeRefCounted( + std::move(greet_buffer), greet_buffer->size()); } - @@ -323,14 +328,14 @@ int SOCKS5ClientSocket::DoGreetReadComplete(int result) { - "version", buffer_[0]); + "version", read_data[0]); return ERR_SOCKS_CONNECTION_FAILED; } -- if (buffer_[1] != 0x00) { -+ if (buffer_[1] != auth_method()) { +- if (read_data[1] != 0x00) { ++ if (read_data[1] != auth_method()) { net_log_.AddEventWithIntParams(NetLogEventType::SOCKS_UNEXPECTED_AUTH, - "method", buffer_[1]); + "method", read_data[1]); return ERR_SOCKS_CONNECTION_FAILED; } - buffer_.clear(); + read_buf_.reset(); - next_state_ = STATE_HANDSHAKE_WRITE; + next_state_ = STATE_AUTH; return OK; From 5bd0a8097ed735346b7bf672cb2a77e528d85244 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Mon, 10 Feb 2025 09:53:42 +0000 Subject: [PATCH 023/139] Conflict-resolved patches from Chromium 134.0.6998.4 to Chromium 135.0.7009.0. --- .../chrome-browser-ui-views-toolbar-app_menu.h.patch | 8 ++++---- ...onents-vector_icons-aggregate_vector_icons.py.patch | 2 +- patches/net-socket-socks5_client_socket.h.patch | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/patches/chrome-browser-ui-views-toolbar-app_menu.h.patch b/patches/chrome-browser-ui-views-toolbar-app_menu.h.patch index 35e9f6c96219..f0a701477ac1 100644 --- a/patches/chrome-browser-ui-views-toolbar-app_menu.h.patch +++ b/patches/chrome-browser-ui-views-toolbar-app_menu.h.patch @@ -1,13 +1,13 @@ diff --git a/chrome/browser/ui/views/toolbar/app_menu.h b/chrome/browser/ui/views/toolbar/app_menu.h -index def1151fc7ee00303f5a8c8531f85a07d9449d05..f3abd671ec02620fb36cd62b9e4835d14535620b 100644 +index 48ed2bc5fac56de8fa4b4ae3f8e15849d38a891f..86ac2fd11014dfae446ed671d7251466679f2e8e 100644 --- a/chrome/browser/ui/views/toolbar/app_menu.h +++ b/chrome/browser/ui/views/toolbar/app_menu.h -@@ -32,7 +32,7 @@ class MenuRunner; - } // namespace views +@@ -34,7 +34,7 @@ class MenuRunner; + struct BookmarkParentFolder; // AppMenu adapts the AppMenuModel to view's menu related classes. -class AppMenu final : public views::MenuDelegate, +class AppMenu : public views::MenuDelegate, - public bookmarks::BaseBookmarkModelObserver, + public BookmarkMergedSurfaceServiceObserver, public GlobalErrorObserver { public: diff --git a/patches/components-vector_icons-aggregate_vector_icons.py.patch b/patches/components-vector_icons-aggregate_vector_icons.py.patch index ffc09e801af8..0bd3f525da8d 100644 --- a/patches/components-vector_icons-aggregate_vector_icons.py.patch +++ b/patches/components-vector_icons-aggregate_vector_icons.py.patch @@ -1,5 +1,5 @@ diff --git a/components/vector_icons/aggregate_vector_icons.py b/components/vector_icons/aggregate_vector_icons.py -index 374b5297eefbe9369494b879577f22326c45c469..330c28ee623849c0f322369fd29a73bed9d973fa 100644 +index 1974b6fc9eaa2a9f42c7059c25ab8d41108338ef..33587f91977b874c728cb077dbccabf404a9ce4f 100644 --- a/components/vector_icons/aggregate_vector_icons.py +++ b/components/vector_icons/aggregate_vector_icons.py @@ -251,5 +251,6 @@ def main(): diff --git a/patches/net-socket-socks5_client_socket.h.patch b/patches/net-socket-socks5_client_socket.h.patch index ae893e598616..aba679c43e05 100644 --- a/patches/net-socket-socks5_client_socket.h.patch +++ b/patches/net-socket-socks5_client_socket.h.patch @@ -1,8 +1,8 @@ diff --git a/net/socket/socks5_client_socket.h b/net/socket/socks5_client_socket.h -index e70a187cc83b69178a128f3d76136ec122fca3ea..ba5f15123123ada0e778d239eef2042341979e88 100644 +index 41046ef34518e4027bef82325c94d0e90108499a..b3f27d5a4ddb35a1b1a605e445c2d93783291430 100644 --- a/net/socket/socks5_client_socket.h +++ b/net/socket/socks5_client_socket.h -@@ -75,11 +75,14 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket { +@@ -78,11 +78,14 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket { int GetLocalAddress(IPEndPoint* address) const override; private: @@ -17,7 +17,7 @@ index e70a187cc83b69178a128f3d76136ec122fca3ea..ba5f15123123ada0e778d239eef20423 STATE_HANDSHAKE_WRITE, STATE_HANDSHAKE_WRITE_COMPLETE, STATE_HANDSHAKE_READ, -@@ -114,6 +117,13 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket { +@@ -117,6 +120,13 @@ class NET_EXPORT_PRIVATE SOCKS5ClientSocket : public StreamSocket { int DoGreetReadComplete(int result); int DoGreetWrite(); int DoGreetWriteComplete(int result); @@ -29,5 +29,5 @@ index e70a187cc83b69178a128f3d76136ec122fca3ea..ba5f15123123ada0e778d239eef20423 + NetLogWithSource& net_log, + CompletionRepeatingCallback& callback); - // Writes the SOCKS handshake buffer into |handshake| - // and return OK on success. + // Creates a DrainableIOBuffer containing the SOCKS handshake. + scoped_refptr BuildHandshakeWriteBuffer() const; From ea72bb84c3e7f1c22689bfd600982bc013f219e7 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Tue, 11 Feb 2025 08:27:05 +0000 Subject: [PATCH 024/139] `gnrt` run for Chromium 135.0.7009.0 --- .../rust/chromium_crates_io/Cargo.lock | 30 +++++++++---------- .../rust/chromium_crates_io/Cargo.toml | 10 +++---- third_party/rust/ryu/v1/README.chromium | 2 +- .../rust/serde_json/v1/README.chromium | 2 +- third_party/rust/syn/v2/README.chromium | 2 +- third_party/rust/unicode_ident/v1/BUILD.gn | 8 ++--- .../rust/unicode_ident/v1/README.chromium | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/third_party/rust/chromium_crates_io/Cargo.lock b/third_party/rust/chromium_crates_io/Cargo.lock index 16623453cf9e..55fc5b4aa894 100644 --- a/third_party/rust/chromium_crates_io/Cargo.lock +++ b/third_party/rust/chromium_crates_io/Cargo.lock @@ -409,7 +409,7 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.27" +version = "4.5.28" dependencies = [ "clap_builder", ] @@ -562,7 +562,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -585,7 +585,7 @@ dependencies = [ "codespan-reporting", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -599,7 +599,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -1461,7 +1461,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", "synstructure 0.13.1", ] @@ -1522,7 +1522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2026,7 +2026,7 @@ version = "1.0.19" [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" [[package]] name = "scopeguard" @@ -2112,7 +2112,7 @@ version = "1.0.217" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2128,7 +2128,7 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.137" +version = "1.0.138" dependencies = [ "itoa", "memchr", @@ -2408,7 +2408,7 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.96" +version = "2.0.98" dependencies = [ "proc-macro2", "quote", @@ -2433,7 +2433,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2481,7 +2481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2567,7 +2567,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] @@ -2612,7 +2612,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "unicode-ident" -version = "1.0.15" +version = "1.0.16" [[package]] name = "unicode-normalization" @@ -2852,7 +2852,7 @@ version = "0.7.35" dependencies = [ "proc-macro2", "quote", - "syn 2.0.96", + "syn 2.0.98", ] [[package]] diff --git a/third_party/rust/chromium_crates_io/Cargo.toml b/third_party/rust/chromium_crates_io/Cargo.toml index 6f8ed6146a42..5106e42499bc 100644 --- a/third_party/rust/chromium_crates_io/Cargo.toml +++ b/third_party/rust/chromium_crates_io/Cargo.toml @@ -122,7 +122,7 @@ path = "../../../../third_party/rust/chromium_crates_io/vendor/cfg-if-1.0.0" package = "cfg-if" [patch.crates-io.clap] -path = "../../../../third_party/rust/chromium_crates_io/vendor/clap-4.5.27" +path = "../../../../third_party/rust/chromium_crates_io/vendor/clap-4.5.28" package = "clap" [patch.crates-io.clap_builder] @@ -230,7 +230,7 @@ path = "../../../../third_party/rust/chromium_crates_io/vendor/rustversion-1.0.1 package = "rustversion" [patch.crates-io.ryu_v1] -path = "../../../../third_party/rust/chromium_crates_io/vendor/ryu-1.0.18" +path = "../../../../third_party/rust/chromium_crates_io/vendor/ryu-1.0.19" package = "ryu" [patch.crates-io.semver_v1] @@ -242,7 +242,7 @@ path = "../../../../third_party/rust/chromium_crates_io/vendor/serde_derive-1.0. package = "serde_derive" [patch.crates-io.serde_json_v1] -path = "../../../../third_party/rust/chromium_crates_io/vendor/serde_json-1.0.137" +path = "../../../../third_party/rust/chromium_crates_io/vendor/serde_json-1.0.138" package = "serde_json" [patch.crates-io.serde_v1] @@ -258,7 +258,7 @@ path = "../../../../third_party/rust/chromium_crates_io/vendor/strsim-0.11.1" package = "strsim" [patch.crates-io.syn_v2] -path = "../../../../third_party/rust/chromium_crates_io/vendor/syn-2.0.96" +path = "../../../../third_party/rust/chromium_crates_io/vendor/syn-2.0.98" package = "syn" [patch.crates-io.termcolor] @@ -266,7 +266,7 @@ path = "../../../../third_party/rust/chromium_crates_io/vendor/termcolor-1.4.1" package = "termcolor" [patch.crates-io.unicode-ident_v1] -path = "../../../../third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.15" +path = "../../../../third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.16" package = "unicode-ident" [patch.crates-io.unicode-width] diff --git a/third_party/rust/ryu/v1/README.chromium b/third_party/rust/ryu/v1/README.chromium index ea68b2e9bdec..eaeabcb2eb79 100644 --- a/third_party/rust/ryu/v1/README.chromium +++ b/third_party/rust/ryu/v1/README.chromium @@ -1,6 +1,6 @@ Name: ryu URL: https://crates.io/crates/ryu -Version: 1.0.18 +Version: 1.0.19 License: Apache-2.0 License File: Shipped: yes diff --git a/third_party/rust/serde_json/v1/README.chromium b/third_party/rust/serde_json/v1/README.chromium index 3234f54b6cf2..ee8f773aa7a7 100644 --- a/third_party/rust/serde_json/v1/README.chromium +++ b/third_party/rust/serde_json/v1/README.chromium @@ -1,6 +1,6 @@ Name: serde_json URL: https://crates.io/crates/serde_json -Version: 1.0.137 +Version: 1.0.138 License: Apache-2.0 License File: Shipped: yes diff --git a/third_party/rust/syn/v2/README.chromium b/third_party/rust/syn/v2/README.chromium index 52cb46665928..c774fb980523 100644 --- a/third_party/rust/syn/v2/README.chromium +++ b/third_party/rust/syn/v2/README.chromium @@ -1,6 +1,6 @@ Name: syn URL: https://crates.io/crates/syn -Version: 2.0.96 +Version: 2.0.98 License: Apache-2.0 License File: Shipped: yes diff --git a/third_party/rust/unicode_ident/v1/BUILD.gn b/third_party/rust/unicode_ident/v1/BUILD.gn index 356739ad8033..0ff78e15ea55 100644 --- a/third_party/rust/unicode_ident/v1/BUILD.gn +++ b/third_party/rust/unicode_ident/v1/BUILD.gn @@ -15,16 +15,16 @@ cargo_crate("buildrs_support") { crate_name = "unicode_ident" epoch = "1" crate_type = "rlib" - crate_root = "//third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.15/src/lib.rs" + crate_root = "//third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.16/src/lib.rs" sources = [ - "//third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.15/src/lib.rs", - "//third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.15/src/tables.rs", + "//third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.16/src/lib.rs", + "//third_party/rust/chromium_crates_io/vendor/unicode-ident-1.0.16/src/tables.rs", ] inputs = [] build_native_rust_unit_tests = false edition = "2018" - cargo_pkg_version = "1.0.15" + cargo_pkg_version = "1.0.16" cargo_pkg_authors = "David Tolnay " cargo_pkg_name = "unicode-ident" cargo_pkg_description = "Determine whether characters have the XID_Start or XID_Continue properties according to Unicode Standard Annex #31" diff --git a/third_party/rust/unicode_ident/v1/README.chromium b/third_party/rust/unicode_ident/v1/README.chromium index 21ffeef5aa5e..cc82f0ffc8fd 100644 --- a/third_party/rust/unicode_ident/v1/README.chromium +++ b/third_party/rust/unicode_ident/v1/README.chromium @@ -1,6 +1,6 @@ Name: unicode-ident URL: https://crates.io/crates/unicode-ident -Version: 1.0.15 +Version: 1.0.16 License: Apache-2.0, Unicode-3.0 License File: Shipped: yes From 1654506279fb2d4820c4354a8f655cdad17392f0 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Tue, 11 Feb 2025 09:09:17 +0000 Subject: [PATCH 025/139] [cr135] `SignedSeedData` added compressed data args This argument for browser variation tests doesn't seem to be relevant for the existing variations test in brave. Chromium change: https://chromium.googlesource.com/chromium/src/+/7435d1e23a59fe37968c54354c362da5da5d4048 commit 7435d1e23a59fe37968c54354c362da5da5d4048 Author: Ramon Cano Aparicio Date: Fri Feb 7 01:17:36 2025 -0800 Fix variations safe mode browser tests. The VariationsSafeModeEndToEndBrowserTest depended on having Local-State-based seeds. Add also support for Seed File. Seed is stored in the file compressed but without being base64 encoded. Bug: 379869158 --- browser/metrics/variations_browsertest.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/metrics/variations_browsertest.cc b/browser/metrics/variations_browsertest.cc index 689f9aaa301c..ab460896cfb5 100644 --- a/browser/metrics/variations_browsertest.cc +++ b/browser/metrics/variations_browsertest.cc @@ -38,12 +38,12 @@ const SignedSeedData& GetBraveSignedSeedData() { "xmQaBThr1i8ARQ1rKEinHluXeR7ve5fqy7L4AIgNym2PbtlL+9142+" "T8gUjjEsoT28J3HqE4IEa1eFvKLw="; - static const SignedSeedData kBraveTestSeedData{ - study_names, - kBase64UncompressedData, - kBase64CompressedData, - kBase64Signature, - }; + static const SignedSeedData kBraveTestSeedData{study_names, + kBase64UncompressedData, + kBase64CompressedData, + kBase64Signature, + /*in_compressed_data=*/{}, + /*in_compressed_data_size=*/0}; return kBraveTestSeedData; } From e869c6eb3e7c47345123e52bbc5d7ab1535b97d8 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Tue, 11 Feb 2025 09:11:39 +0000 Subject: [PATCH 026/139] [cr135] Lifting deleted `UsageClock` into Brave This class has been deleted from upstream for being unused, so it is being lifted directly into brave as it was still in use in our codebase. Chromium change: https://chromium.googlesource.com/chromium/src/+/1bfee585c32eb3fa81838e7d64e82e7510da517b commit 1bfee585c32eb3fa81838e7d64e82e7510da517b Author: Joe Mason Date: Fri Feb 7 08:40:39 2025 -0800 Remove unused LifecycleUnit methods (2/N) Removes GetChromeUsageTimeWhenHidden. This is the only user of the UsageClock class so removes that as well. R=fdoray Bug: 383374205 --- browser/misc_metrics/BUILD.gn | 4 ++ browser/misc_metrics/sources.gni | 1 + browser/misc_metrics/uptime_monitor.cc | 4 +- browser/misc_metrics/uptime_monitor.h | 8 +-- browser/misc_metrics/usage_clock.cc | 59 +++++++++++++++++ browser/misc_metrics/usage_clock.h | 53 +++++++++++++++ browser/misc_metrics/usage_clock_unittest.cc | 68 ++++++++++++++++++++ 7 files changed, 190 insertions(+), 7 deletions(-) create mode 100644 browser/misc_metrics/usage_clock.cc create mode 100644 browser/misc_metrics/usage_clock.h create mode 100644 browser/misc_metrics/usage_clock_unittest.cc diff --git a/browser/misc_metrics/BUILD.gn b/browser/misc_metrics/BUILD.gn index ffcf6bb9a163..2b8fc9aad80d 100644 --- a/browser/misc_metrics/BUILD.gn +++ b/browser/misc_metrics/BUILD.gn @@ -22,6 +22,7 @@ static_library("misc_metrics_impl") { "//brave/browser/misc_metrics/profile_misc_metrics_service.h", "//brave/browser/misc_metrics/profile_misc_metrics_service_factory.h", "//brave/browser/misc_metrics/uptime_monitor.h", + "//brave/browser/misc_metrics/usage_clock.h", ] deps = [ @@ -56,6 +57,7 @@ static_library("misc_metrics_impl") { ] deps += [ "//brave/browser/themes", + "//chrome/browser/metrics/desktop_session_duration:desktop_session_duration", "//chrome/browser/themes", "//chrome/browser/ui/tabs:tab_strip", "//extensions/browser", @@ -72,6 +74,7 @@ source_set("unit_tests") { "doh_metrics_unittest.cc", "page_metrics_unittest.cc", "uptime_monitor_unittest.cc", + "usage_clock_unittest.cc", ] deps = [ @@ -99,6 +102,7 @@ source_set("unit_tests") { deps += [ "//brave/browser/themes", + "//chrome/browser/metrics/desktop_session_duration:desktop_session_duration", "//chrome/browser/themes", ] } diff --git a/browser/misc_metrics/sources.gni b/browser/misc_metrics/sources.gni index 7bc742e1d001..68508218ca19 100644 --- a/browser/misc_metrics/sources.gni +++ b/browser/misc_metrics/sources.gni @@ -8,6 +8,7 @@ brave_browser_misc_metrics_sources = [ "//brave/browser/misc_metrics/profile_misc_metrics_service.cc", "//brave/browser/misc_metrics/profile_misc_metrics_service_factory.cc", "//brave/browser/misc_metrics/uptime_monitor.cc", + "//brave/browser/misc_metrics/usage_clock.cc", ] brave_browser_misc_metrics_deps = [ diff --git a/browser/misc_metrics/uptime_monitor.cc b/browser/misc_metrics/uptime_monitor.cc index 4d6488c0548b..426b739d0bd6 100644 --- a/browser/misc_metrics/uptime_monitor.cc +++ b/browser/misc_metrics/uptime_monitor.cc @@ -11,7 +11,7 @@ #include "components/prefs/pref_service.h" #if !BUILDFLAG(IS_ANDROID) -#include "chrome/browser/resource_coordinator/usage_clock.h" +#include "brave/browser/misc_metrics/usage_clock.h" #endif namespace misc_metrics { @@ -42,7 +42,7 @@ void UptimeMonitor::Init() { } RecordP3A(); #if !BUILDFLAG(IS_ANDROID) - usage_clock_ = std::make_unique(); + usage_clock_ = std::make_unique(); timer_.Start( FROM_HERE, kUsageTimeQueryInterval, base::BindRepeating(&UptimeMonitor::RecordUsage, base::Unretained(this))); diff --git a/browser/misc_metrics/uptime_monitor.h b/browser/misc_metrics/uptime_monitor.h index 1a379f2d19b8..14d479023216 100644 --- a/browser/misc_metrics/uptime_monitor.h +++ b/browser/misc_metrics/uptime_monitor.h @@ -14,14 +14,12 @@ class PrefService; class PrefRegistrySimple; +namespace misc_metrics { + #if !BUILDFLAG(IS_ANDROID) -namespace resource_coordinator { class UsageClock; -} // namespace resource_coordinator #endif -namespace misc_metrics { - inline constexpr char kBrowserOpenTimeHistogramName[] = "Brave.Uptime.BrowserOpenTime.2"; @@ -54,7 +52,7 @@ class UptimeMonitor { raw_ptr local_state_; #if !BUILDFLAG(IS_ANDROID) - std::unique_ptr usage_clock_; + std::unique_ptr usage_clock_; base::TimeDelta current_total_usage_; base::RepeatingTimer timer_; diff --git a/browser/misc_metrics/usage_clock.cc b/browser/misc_metrics/usage_clock.cc new file mode 100644 index 000000000000..a6e30a2cfa1b --- /dev/null +++ b/browser/misc_metrics/usage_clock.cc @@ -0,0 +1,59 @@ +/* Copyright (c) 2025 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#include "brave/browser/misc_metrics/usage_clock.h" + +#include "chrome/browser/resource_coordinator/time.h" + +namespace misc_metrics { + +UsageClock::UsageClock() + : current_usage_session_start_time_(resource_coordinator::NowTicks()) { + if (metrics::DesktopSessionDurationTracker::IsInitialized()) { + auto* tracker = metrics::DesktopSessionDurationTracker::Get(); + tracker->AddObserver(this); + if (!tracker->in_session()) { + current_usage_session_start_time_ = base::TimeTicks(); + } + } +} + +UsageClock::~UsageClock() { + if (metrics::DesktopSessionDurationTracker::IsInitialized()) { + metrics::DesktopSessionDurationTracker::Get()->RemoveObserver(this); + } +} + +base::TimeDelta UsageClock::GetTotalUsageTime() const { + base::TimeDelta elapsed_time_in_session = usage_time_in_completed_sessions_; + if (IsInUse()) { + elapsed_time_in_session += + resource_coordinator::NowTicks() - current_usage_session_start_time_; + } + return elapsed_time_in_session; +} + +bool UsageClock::IsInUse() const { + return !current_usage_session_start_time_.is_null(); +} + +void UsageClock::OnSessionStarted(base::TimeTicks session_start) { + // Ignore |session_start| because it doesn't come from the resource + // coordinator clock. + DCHECK(!IsInUse()); + current_usage_session_start_time_ = resource_coordinator::NowTicks(); +} + +void UsageClock::OnSessionEnded(base::TimeDelta session_length, + base::TimeTicks session_end) { + // Ignore |session_length| because it wasn't measured using the resource + // coordinator clock. + DCHECK(IsInUse()); + usage_time_in_completed_sessions_ += + resource_coordinator::NowTicks() - current_usage_session_start_time_; + current_usage_session_start_time_ = base::TimeTicks(); +} + +} // namespace misc_metrics diff --git a/browser/misc_metrics/usage_clock.h b/browser/misc_metrics/usage_clock.h new file mode 100644 index 000000000000..b7a5c7787f0e --- /dev/null +++ b/browser/misc_metrics/usage_clock.h @@ -0,0 +1,53 @@ +/* Copyright (c) 2025 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#ifndef BRAVE_BROWSER_MISC_METRICS_USAGE_CLOCK_H_ +#define BRAVE_BROWSER_MISC_METRICS_USAGE_CLOCK_H_ + +#include "base/time/time.h" +#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" + +namespace misc_metrics { + +// A clock that advances when Chrome is in use. +// +// See metrics::DesktopSessionDurationTracker for how Chrome usage is tracked. +// If metrics::DesktopSessionDurationTracker isn't initialized before this, the +// clock will advance continuously, regardless of Chrome usage. This avoids +// forcing all tests that indirectly depend on this to initialize +// metrics::DesktopSessionDurationTracker. +class UsageClock : public metrics::DesktopSessionDurationTracker::Observer { + public: + UsageClock(); + + UsageClock(const UsageClock&) = delete; + UsageClock& operator=(const UsageClock&) = delete; + + ~UsageClock() override; + + // Returns the amount of Chrome usage time since this was instantiated. + base::TimeDelta GetTotalUsageTime() const; + + // Returns true if Chrome is currently considered to be in use. + bool IsInUse() const; + + private: + void OnSessionStarted(base::TimeTicks session_start) override; + void OnSessionEnded(base::TimeDelta session_length, + base::TimeTicks session_end) override; + + // The total time elapsed in completed usage sessions. The duration of the + // current usage session, if any, must be added to this to get the total usage + // time of Chrome. + base::TimeDelta usage_time_in_completed_sessions_; + + // The time at which the current session started, or a null TimeTicks if not + // currently in a session. + base::TimeTicks current_usage_session_start_time_; +}; + +} // namespace misc_metrics + +#endif // BRAVE_BROWSER_MISC_METRICS_USAGE_CLOCK_H_ diff --git a/browser/misc_metrics/usage_clock_unittest.cc b/browser/misc_metrics/usage_clock_unittest.cc new file mode 100644 index 000000000000..3d83c57b24ba --- /dev/null +++ b/browser/misc_metrics/usage_clock_unittest.cc @@ -0,0 +1,68 @@ +/* Copyright (c) 2025 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at https://mozilla.org/MPL/2.0/. */ + +#include "brave/browser/misc_metrics/usage_clock.h" + +#include "base/test/simple_test_clock.h" +#include "base/test/simple_test_tick_clock.h" +#include "base/test/task_environment.h" +#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" +#include "chrome/browser/resource_coordinator/time.h" +#include "testing/gtest/include/gtest/gtest.h" + +namespace misc_metrics { + +TEST(ResourceCoordinatorUsageClock, UsageClock) { + // Required to use DesktopSessionDurationTracker. + base::test::TaskEnvironment task_environment; + + { + base::SimpleTestClock clock; + base::SimpleTestTickClock tick_clock; + tick_clock.Advance(base::Minutes(42)); + resource_coordinator::ScopedSetClocksForTesting + scoped_set_clocks_for_testing(&clock, &tick_clock); + + metrics::DesktopSessionDurationTracker::Initialize(); + auto* tracker = metrics::DesktopSessionDurationTracker::Get(); + tracker->OnVisibilityChanged(true, base::TimeDelta()); + tracker->OnUserEvent(); + EXPECT_TRUE(tracker->in_session()); + + UsageClock usage_clock; + EXPECT_EQ(usage_clock.GetTotalUsageTime(), base::TimeDelta()); + EXPECT_TRUE(tracker->in_session()); + EXPECT_TRUE(usage_clock.IsInUse()); + + // Verify that time advances when Chrome is in use. + tick_clock.Advance(base::Minutes(1)); + EXPECT_EQ(usage_clock.GetTotalUsageTime(), base::Minutes(1)); + tick_clock.Advance(base::Minutes(1)); + EXPECT_EQ(usage_clock.GetTotalUsageTime(), base::Minutes(2)); + + // Verify that time is updated when Chrome stops being used. + tick_clock.Advance(base::Minutes(1)); + tracker->OnVisibilityChanged(false, base::TimeDelta()); + EXPECT_FALSE(tracker->in_session()); + EXPECT_FALSE(usage_clock.IsInUse()); + EXPECT_EQ(usage_clock.GetTotalUsageTime(), base::Minutes(3)); + + // Verify that time stays still when Chrome is not in use. + tick_clock.Advance(base::Minutes(1)); + EXPECT_EQ(usage_clock.GetTotalUsageTime(), base::Minutes(3)); + + // Verify that time advances again when Chrome is in use. + tracker->OnVisibilityChanged(true, base::TimeDelta()); + EXPECT_TRUE(tracker->in_session()); + EXPECT_TRUE(usage_clock.IsInUse()); + tick_clock.Advance(base::Minutes(1)); + EXPECT_EQ(usage_clock.GetTotalUsageTime(), base::Minutes(4)); + } + + // Must be after UsageClock destruction. + metrics::DesktopSessionDurationTracker::CleanupForTesting(); +} + +} // namespace misc_metrics From 7b8b03dff7beeb15a4bb2940976b93b26a63a6ec Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Tue, 11 Feb 2025 09:46:39 +0000 Subject: [PATCH 027/139] Update from Chromium 134.0.6998.4 to Chromium 135.0.7011.0. --- .../transport_security_state_generator/input_file_parsers.cc | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index 45d887a69e87..afb9abdb450c 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -552,9 +552,9 @@ bool ParseCertificatesFile(std::string_view certs_input, Pinsets* pinsets, base::Time* timestamp) { constexpr std::string_view brave_certs = R"brave_certs( -# Last updated: Mon Feb 10 09:38:22 2025 +# Last updated: Tue Feb 11 09:46:39 2025 PinsListTimestamp -1739180302 +1739267199 # =====BEGIN BRAVE ROOTS ASC===== #From https://www.amazontrust.com/repository/ diff --git a/package.json b/package.json index afade21760b7..43b1561f2cf3 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "135.0.7009.0", + "tag": "135.0.7011.0", "repository": { "url": "https://github.com/brave/chromium" } From 22cbbcdd177d36f6cea212dd5dff1d4d7257b311 Mon Sep 17 00:00:00 2001 From: Claudio DeSouza Date: Tue, 11 Feb 2025 11:23:24 +0000 Subject: [PATCH 028/139] [cr135] Fix @typescript-eslint/require-await violations This change corrects the violations in brave for this specific typescript linter. Chromium change: https://chromium.googlesource.com/chromium/src/+/b3cd007c92db6804407d03e7da6cd924135d3a1d commit b3cd007c92db6804407d03e7da6cd924135d3a1d Author: dpapad Date: Mon Feb 10 10:50:53 2025 -0800 CrOS WebUI: Fix violations of ESLint @typescript-eslint/require-await. This is in preparation of enabling build-time and type-aware ESLint checks in build_webui() that will catch such violations. [1] https://typescript-eslint.io/rules/require-await Bug: 394634491 --- .../settings/brave_leo_assistant_page/model_config_ui.ts | 2 +- .../settings/brave_sync_page/brave_sync_configure.ts | 2 +- browser/resources/settings/brave_sync_page/brave_sync_page.ts | 2 +- .../br_elements/br_toolbar/br_toolbar_search_field.ts | 2 +- ui/webui/resources/polymer_overriding.ts | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/browser/resources/settings/brave_leo_assistant_page/model_config_ui.ts b/browser/resources/settings/brave_leo_assistant_page/model_config_ui.ts index 386c6f382277..e1cc4f3d776f 100644 --- a/browser/resources/settings/brave_leo_assistant_page/model_config_ui.ts +++ b/browser/resources/settings/brave_leo_assistant_page/model_config_ui.ts @@ -117,7 +117,7 @@ export class ModelConfigUI extends ModelConfigUIBase { this.checkEndpointValidity_() } - async handleClick_() { + handleClick_() { // If the user is attempting to use a private endpoint, we should show a // modal warning instructing them to enable the optional feature in order // to proceed diff --git a/browser/resources/settings/brave_sync_page/brave_sync_configure.ts b/browser/resources/settings/brave_sync_page/brave_sync_configure.ts index 9285f6db6f83..10f23e4d3591 100644 --- a/browser/resources/settings/brave_sync_page/brave_sync_configure.ts +++ b/browser/resources/settings/brave_sync_page/brave_sync_configure.ts @@ -137,7 +137,7 @@ export class SettingsBraveSyncConfigureElement extends SettingsBraveSyncConfigur router.navigateTo((router.getRoutes() as {BRAVE_SYNC: Route}).BRAVE_SYNC); } - async onPermanentlyDeleteSyncAccount_() { + onPermanentlyDeleteSyncAccount_() { // Clear sync code because after permanently deleting the chain user might // use the same page to create a new sync chain without reload. In worse // case, we will reload the sync code diff --git a/browser/resources/settings/brave_sync_page/brave_sync_page.ts b/browser/resources/settings/brave_sync_page/brave_sync_page.ts index d1fd76e234a0..6dc19c59f1f5 100644 --- a/browser/resources/settings/brave_sync_page/brave_sync_page.ts +++ b/browser/resources/settings/brave_sync_page/brave_sync_page.ts @@ -98,7 +98,7 @@ export class SettingsBraveSyncPageElement extends SettingsBraveSyncPageElementBa /** * Handler for when the sync state is pushed from the browser. */ - async handleSyncStatus_(syncStatus: BraveSyncStatus) { + handleSyncStatus_(syncStatus: BraveSyncStatus) { this.syncStatus_ = syncStatus; } diff --git a/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.ts b/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.ts index 196d1719e572..a3e757734f61 100644 --- a/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.ts +++ b/ui/webui/resources/br_elements/br_toolbar/br_toolbar_search_field.ts @@ -90,7 +90,7 @@ export class BrToolbarSearchFieldElement extends BraveToolbarSearchFieldBase { this.showingSearch = this.hasSearchText || this.isSearchFocused() } - async focus_() { + focus_() { this.getSearchInput().focus() } diff --git a/ui/webui/resources/polymer_overriding.ts b/ui/webui/resources/polymer_overriding.ts index 0be522c2240a..66c91036ce21 100644 --- a/ui/webui/resources/polymer_overriding.ts +++ b/ui/webui/resources/polymer_overriding.ts @@ -167,12 +167,12 @@ export function RegisterPolymerComponentToIgnore(name) { const moduleNamesWithStyleOverrides: { [moduleName: string]: string[] } = {} -export async function RegisterStyleOverrideName(componentName: string, polymerStyleModuleName: string) { +export function RegisterStyleOverrideName(componentName: string, polymerStyleModuleName: string) { const overrideData = (moduleNamesWithStyleOverrides[componentName] = moduleNamesWithStyleOverrides[componentName] || []) overrideData.push(polymerStyleModuleName) } -export async function RegisterStyleOverride(componentName: string, styleTemplate: HTMLTemplateElement) { +export function RegisterStyleOverride(componentName: string, styleTemplate: HTMLTemplateElement) { // Inform polymer of styles by creating a dom-module. // // @@ -18,7 +18,7 @@ index 7f98d8ac8d2f3be3bbae49c8128f15e053643137..484830cb3accd522d23773578cab2b59 diff --git a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch index 6d59548f8401..f7c8c75bb72c 100644 --- a/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch +++ b/patches/chrome-browser-resources-settings-privacy_page-privacy_page.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/settings/privacy_page/privacy_page.ts b/chrome/browser/resources/settings/privacy_page/privacy_page.ts -index 2e5d4330a63fd8a5b9a66eb97523fc60dcfae8a6..046ae235cd63c60f4600f52b4414aae8c29d769c 100644 +index 665becf31aa7afa527e851f939da189061fadfb3..7aa857f9a9abd558f388000315c753f5412d2d44 100644 --- a/chrome/browser/resources/settings/privacy_page/privacy_page.ts +++ b/chrome/browser/resources/settings/privacy_page/privacy_page.ts @@ -22,6 +22,7 @@ import '../settings_page/settings_subpage.js'; diff --git a/patches/chrome-browser-resources-settings-route.ts.patch b/patches/chrome-browser-resources-settings-route.ts.patch index 72bd4783d134..3de339e1d64d 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 001852c43411eae58fc41e4c4dc35af64076c6c9..72127b44ee5d7098a9dcfdb63e240acfabd7f2b4 100644 +index 16d1a68dccf8773fbbba6399b81e5c8002048618..9d5e3ef2b39268e74b7ab8dc2bd42b6335454e54 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-router.ts.patch b/patches/chrome-browser-resources-settings-router.ts.patch index ec8e98c4c235..48b5b1212ac8 100644 --- a/patches/chrome-browser-resources-settings-router.ts.patch +++ b/patches/chrome-browser-resources-settings-router.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/settings/router.ts b/chrome/browser/resources/settings/router.ts -index 57b51014e87321a6f005d88a2d40731045d289e9..a618988150701bd29a10fcbb70f8cc47aceab953 100644 +index 9474c5528dbb86560e240176f1453ec2061a7ace..4cc129e90ccdf84197294e8ad962c8ad4a915138 100644 --- a/chrome/browser/resources/settings/router.ts +++ b/chrome/browser/resources/settings/router.ts -@@ -120,6 +120,7 @@ export interface SettingsRoutes { +@@ -121,6 +121,7 @@ export interface SettingsRoutes { IMPORT_DATA: Route; SIGN_OUT: Route; // diff --git a/patches/chrome-browser-resources-settings-settings.ts.patch b/patches/chrome-browser-resources-settings-settings.ts.patch index cfdb8c85fedb..33d709cfcbdf 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 83a5870db8653255dc51b61bff4b4a0879da37dd..f5065fec953e2d633becf3fad4562c586b65b842 100644 +index ef09c67f656fd316af2ef639bf4773cb7d576576..7a88a74f920af4867b3ff92394e9971be0f2c026 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-side_panel-bookmarks-power_bookmarks_list.ts.patch b/patches/chrome-browser-resources-side_panel-bookmarks-power_bookmarks_list.ts.patch index fddec3130936..ed33418252bc 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 619d694def4c49732e55b471d1caac91e0d99ce3..d8de4f5c20f7d59c972a53edfbd87f8e5adc2252 100644 +index 2d664bc4a07204f9f5c0c502a00ff108b72c8e36..99b66fe998f2515d1b9a08c94e2590e1cfd90050 100644 --- a/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts +++ b/chrome/browser/resources/side_panel/bookmarks/power_bookmarks_list.ts @@ -3,6 +3,7 @@ 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 b644af259c7e..692aead148ff 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 9a847ad3b44a7be841c8c943ecf9293dd6876f3a..54feb4ed95fd1129f1a608bd8f9e080f3a9e9da1 100644 +index 89a4cfd37f629d00b914a6514049e5eea7d9d227..647711690e1ceb5dc534f6b89ae0e3d96b605023 100644 --- a/chrome/browser/resources/side_panel/read_anything/BUILD.gn +++ b/chrome/browser/resources/side_panel/read_anything/BUILD.gn -@@ -68,7 +68,7 @@ build_webui("build") { +@@ -69,7 +69,7 @@ build_webui("build") { target_gen_dir) ] webui_context_type = "untrusted" diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_card.html.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_card.html.ts.patch index 64bdd048aa56..caa4b7ce7266 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_card.html.ts.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_card.html.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_card.html.ts b/chrome/browser/resources/signin/profile_picker/profile_card.html.ts -index 8fcf1023fc7ce94f39314cddbecbdbd92505ca5d..b43a8a6e0dde60ac49222f15b6d6e236d1378788 100644 +index 1aaf591af5d51f3268fdf1413592cb95c3a60066..286c6db5fc27b75e9db2fbe3ebeacbd5f9950cdc 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_card.html.ts +++ b/chrome/browser/resources/signin/profile_picker/profile_card.html.ts @@ -10,7 +10,7 @@ import {isGlicVersion} from './profile_picker_flags.js'; diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.html.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.html.ts.patch index 490b02bb6ed7..4f4e61386e82 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.html.ts.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.html.ts.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts -index 374234197329703c74f324719af39e4d1844b738..478ecd6bba594c104c871342ee22574a49de176f 100644 +index 9130ae3712b6f4a0934077b3ae652d5d2da2bff5..216df04e561aa212b7b1b2ef174633109b050c04 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts +++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.html.ts -@@ -26,7 +26,7 @@ export function getHtml(this: ProfilePickerMainViewElement) { +@@ -34,7 +34,7 @@ ${function() { data-index="${index}"> `)} diff --git a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch index 9fc1a50eaa4e..603b2b4cb7d8 100644 --- a/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch +++ b/patches/chrome-browser-resources-signin-profile_picker-profile_picker_main_view.ts.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts -index fd91dc6690da03a40fb0fb188f3759df9982d954..e0f1177bf131126b5124d654996834199aa346d8 100644 +index 2f2c5f36662e56868f5aec7ce0dac1ecc3d90480..aaef7795313eba80271080aae3a6976d7cd82577 100644 --- a/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts +++ b/chrome/browser/resources/signin/profile_picker/profile_picker_main_view.ts @@ -109,6 +109,7 @@ export class ProfilePickerMainViewElement extends diff --git a/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch b/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch index 5f42c24f2f31..99b0b22a0464 100644 --- a/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch +++ b/patches/chrome-browser-safe_browsing-download_protection-check_client_download_request_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc -index bc64aa588acd6600486bbdd8aea60230aa742a73..694a1d42d0e2c36739782053a7d1d2de61e34b39 100644 +index 6781b61feb0c1fb72ea5b18aa245b78811e5c380..656624cdf8c42e5506c1ffe71e6461dddea79a7b 100644 --- a/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc +++ b/chrome/browser/safe_browsing/download_protection/check_client_download_request_base.cc -@@ -326,6 +326,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt( +@@ -323,6 +323,7 @@ void CheckClientDownloadRequestBase::OnRequestBuilt( client_download_request_ = std::move(request); SanitizeRequest(); diff --git a/patches/chrome-browser-sessions-session_service.cc.patch b/patches/chrome-browser-sessions-session_service.cc.patch index 2b789e068f2e..c9799b785c96 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 ecddd5434f7259aacc22befca9faae84e2e6e3ac..fc405eb7b4077cc3d297c16bb6360a74fd6702f8 100644 +index 0e5585a0faa149e2bd3a755efcd4dcd2907bff96..405e408cff2fda01c17ed76d79cb2f45ac21d9d4 100644 --- a/chrome/browser/sessions/session_service.cc +++ b/chrome/browser/sessions/session_service.cc -@@ -373,6 +373,7 @@ void SessionService::TabClosed(SessionID window_id, SessionID tab_id) { +@@ -345,6 +345,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-signin-account_consistency_mode_manager.cc.patch b/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch index ba363774f0f9..ac070c6b1c72 100644 --- a/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch +++ b/patches/chrome-browser-signin-account_consistency_mode_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/signin/account_consistency_mode_manager.cc b/chrome/browser/signin/account_consistency_mode_manager.cc -index 193a542384e0b4e0f19f35cf244753b6a6f88dbb..299d27a8c4125628e2ac3b0841a1ba69d851f95c 100644 +index cc676d3c1b201ccdf5138b1135b8fab9bf7a48da..f298bc8d1662b23215ce235eb9a2ab15abcc8a87 100644 --- a/chrome/browser/signin/account_consistency_mode_manager.cc +++ b/chrome/browser/signin/account_consistency_mode_manager.cc @@ -186,6 +186,7 @@ AccountConsistencyModeManager::ComputeAccountConsistencyMethod( 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 338a6fbbcc67..68e925c32915 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,5 +1,5 @@ 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 f9b7f46e2ddf7c00074f23c674b92149d224cc3f..db4a8d407f10402f9bc18070b867528901a0b85d 100644 +index 847f9fcbb2c0bd2d0139c1a9d34c86e997c3d2c8..833cef1e0b2cf80a5d712c994b56c3a63db81873 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 @@ -448,6 +448,7 @@ void StorageAccessGrantPermissionContext::CheckForAutoGrantOrAutoDenial( diff --git a/patches/chrome-browser-sync-sync_service_factory.cc.patch b/patches/chrome-browser-sync-sync_service_factory.cc.patch index cd9bbe915a09..0de14cc97c88 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 fc1dd87dcb48d1b45e99b60c73036f8c8f6b30a4..5bd53d375c199d9728f98c23cf046f0cd6d089f6 100644 +index 6378be21fcb9afad1e24f8c628e14fba13816a23..760cb20588728feacd37780c06b79d2f81688a68 100644 --- a/chrome/browser/sync/sync_service_factory.cc +++ b/chrome/browser/sync/sync_service_factory.cc -@@ -410,7 +410,7 @@ std::unique_ptr BuildSyncService( +@@ -408,7 +408,7 @@ std::unique_ptr BuildSyncService( } auto sync_service = diff --git a/patches/chrome-browser-tab_ui-android-BUILD.gn.patch b/patches/chrome-browser-tab_ui-android-BUILD.gn.patch index 1a419b42be8d..0f57ffd4e96b 100644 --- a/patches/chrome-browser-tab_ui-android-BUILD.gn.patch +++ b/patches/chrome-browser-tab_ui-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/tab_ui/android/BUILD.gn b/chrome/browser/tab_ui/android/BUILD.gn -index c35022e35ca28c695a7115e48f67a8288efe3504..63724eb23551df9709a7d74dbb98b3c0c767d9b9 100644 +index b070e2cdc2a53fd9deb18fbb1a2c8a0edcc26130..aa2a08256773bac27d153e96e37982e64ded3c98 100644 --- a/chrome/browser/tab_ui/android/BUILD.gn +++ b/chrome/browser/tab_ui/android/BUILD.gn @@ -23,6 +23,7 @@ android_library("java") { diff --git a/patches/chrome-browser-themes-theme_service_factory.cc.patch b/patches/chrome-browser-themes-theme_service_factory.cc.patch index e791a66a771e..b2900943b802 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 7a08fccfb093aa06c22965646c34998cc0ca3722..ca77a3337ef062dd63e856e17d5e37fa165b7e24 100644 +index 1809d9f6aff5bd3db8c354f25d09bec6c92c1c5d..3d2c56ca5cd21047eb2308643fe8cf5c4f1aa30d 100644 --- a/chrome/browser/themes/theme_service_factory.cc +++ b/chrome/browser/themes/theme_service_factory.cc -@@ -109,6 +109,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default; +@@ -103,6 +103,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 828f43feed63..941ea62df576 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 0f555f49aa931665103835ef89e07dbabdb11ab2..5fb8d2dcbda78d7ab84e57ce78c178d25d11f737 100644 +index ceb3fc51f58ab7096169ad645e64bb205f285df6..ba2d2ade64c8d7b1c7848f0e0cc6d90e288ffa69 100644 --- a/chrome/browser/ui/BUILD.gn +++ b/chrome/browser/ui/BUILD.gn -@@ -749,6 +749,7 @@ static_library("ui") { +@@ -750,6 +750,7 @@ static_library("ui") { "//chrome/browser/task_manager:impl", ] @@ -10,7 +10,7 @@ index 0f555f49aa931665103835ef89e07dbabdb11ab2..5fb8d2dcbda78d7ab84e57ce78c178d2 if (enable_vr && is_win) { deps += [ "//chrome/browser/vr:vr_base" ] -@@ -3521,7 +3522,10 @@ static_library("ui") { +@@ -3526,7 +3527,10 @@ static_library("ui") { ] deps += [ "//chrome/updater/app/server/win:updater_legacy_idl" ] } else { @@ -22,7 +22,7 @@ index 0f555f49aa931665103835ef89e07dbabdb11ab2..5fb8d2dcbda78d7ab84e57ce78c178d2 } } -@@ -5691,6 +5695,7 @@ static_library("ui_public_dependencies") { +@@ -5699,6 +5703,7 @@ static_library("ui_public_dependencies") { if (enable_extensions_core) { public_deps += [ "//extensions/browser" ] } 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 fcd142099f0f..7fa661195406 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 2c5dd5e858ea308538b455c1a81e79a0554df11e..5f2efedb5d01fc9efd674e77830621ddfa556550 100644 +index 99d3b60c63ef1a2953ce54ca53d9c244339a15b9..b0b277903b94058a898052ea748f0aa3be4ad457 100644 --- a/chrome/browser/ui/actions/chrome_action_id.h +++ b/chrome/browser/ui/actions/chrome_action_id.h -@@ -516,6 +516,7 @@ +@@ -519,6 +519,7 @@ /* Side Panel items */ \ E(kActionSidePanelShowAboutThisSite) \ E(kActionSidePanelShowAssistant) \ diff --git a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch index 06f24d32306b..6651b0159d0f 100644 --- a/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch +++ b/patches/chrome-browser-ui-android-appmenu-internal-java-src-org-chromium-chrome-browser-ui-appmenu-AppMenu.java.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -index accdb1bb07689bc67aeca25feef87966fbe7c0aa..eb056358404e300204c33dda59bf8d02b02cc213 100644 +index a594389eecd822f596366f9dc789c72033c38c6c..a758a1b161a2d77e19a03463c8c1b3cd1e513641 100644 --- a/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java +++ b/chrome/browser/ui/android/appmenu/internal/java/src/org/chromium/chrome/browser/ui/appmenu/AppMenu.java -@@ -311,6 +311,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler +@@ -325,6 +325,7 @@ class AppMenu implements OnItemClickListener, OnKeyListener, AppMenuClickHandler anchorView, groupDividerResourceId, anchorViewOffset); diff --git a/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch b/patches/chrome-browser-ui-android-toolbar-BUILD.gn.patch index e9122ded5ae0..eebb14c3ca23 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 0821dc773877f3770b3cfe8fe15f394429b518a5..a958a4f8c83d1f00a20b786f3137e9e6270afef9 100644 +index 416fda957889204f959f2d7209db67913538f4af..a74aed2bd2288f1127edc24b841c1bc73180f6d3 100644 --- a/chrome/browser/ui/android/toolbar/BUILD.gn +++ b/chrome/browser/ui/android/toolbar/BUILD.gn -@@ -112,6 +112,7 @@ android_library("java") { +@@ -113,6 +113,7 @@ android_library("java") { "java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/StripVisibilityState.java", "java/src/org/chromium/chrome/browser/toolbar/top/tab_strip/TabStripTransitionCoordinator.java", ] diff --git a/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch index eb83a54ff2ab..d5ea8b07bbd5 100644 --- a/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch +++ b/patches/chrome-browser-ui-android-toolbar-java-res-layout-toolbar_phone.xml.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml -index c16bbdce2b2a3f8568934a4f40a00d8497f3f696..241b69ee53cdac5b5bab20d6dc04dacd5fa86a8e 100644 +index 4caa95def3fe8153a68d5b56d7a9171dfcb58698..5c952442fa6811448fe4927240f9bc14582fae67 100644 --- a/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml +++ b/chrome/browser/ui/android/toolbar/java/res/layout/toolbar_phone.xml -@@ -38,6 +38,7 @@ found in the LICENSE file. +@@ -39,6 +39,7 @@ found in the LICENSE file. android:orientation="horizontal" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -10,7 +10,7 @@ index c16bbdce2b2a3f8568934a4f40a00d8497f3f696..241b69ee53cdac5b5bab20d6dc04dacd android:layout_gravity="top|end" android:focusable="true" android:focusableInTouchMode="true"> -@@ -50,6 +51,7 @@ found in the LICENSE file. +@@ -51,6 +52,7 @@ found in the LICENSE file. android:layout_width="52dp" style="@style/ToolbarHoverableButton" /> 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 55d6ecc8d6f2..55feef345d95 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 881c37afecc5a4b75515c7b76dc9d567921669e1..60a06fd31a65048b5f9f0f02f401a308737e9438 100644 +index 0992c2793168a99aa301d72e28348864120cae67..5922e6e887a2134acd04604c072c4dbcd3b2c7db 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 -@@ -66,6 +66,7 @@ found in the LICENSE file. +@@ -70,6 +70,7 @@ found in the LICENSE file. android:layout_gravity="center_vertical" android:background="@drawable/modern_toolbar_tablet_text_box_background" android:paddingEnd="@dimen/location_bar_end_padding" /> 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 c7da367c6b9a..ce8aaf7f94fd 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 71b18581d4e8f2c712a9a8e6e4bc3bf82efd8c7f..8c6c21aa7c67d860cc55df7adc39159092d03e32 100644 +index 91bef4906ed1456215a1545b6cc54d625ab7e928..ed550449bd707203751e3b2cf9438a68c6058541 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 -@@ -433,6 +433,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -425,6 +425,7 @@ public class ToolbarPhone extends ToolbarLayout if (mOptionalButtonCoordinator != null) { mOptionalButtonCoordinator.setBackgroundColorFilter(color); } @@ -10,7 +10,7 @@ index 71b18581d4e8f2c712a9a8e6e4bc3bf82efd8c7f..8c6c21aa7c67d860cc55df7adc391590 } private void updateModernLocationBarCorners() { -@@ -589,6 +590,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -581,6 +582,7 @@ public class ToolbarPhone extends ToolbarLayout mTrackerSupplier.get().notifyEvent(EventConstants.PARTNER_HOME_PAGE_BUTTON_PRESSED); } } @@ -18,7 +18,7 @@ index 71b18581d4e8f2c712a9a8e6e4bc3bf82efd8c7f..8c6c21aa7c67d860cc55df7adc391590 } @Override -@@ -1082,6 +1084,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -1032,6 +1034,7 @@ public class ToolbarPhone extends ToolbarLayout * Tab Page. */ private void updateLocationBarLayoutForExpansionAnimation() { @@ -26,7 +26,7 @@ index 71b18581d4e8f2c712a9a8e6e4bc3bf82efd8c7f..8c6c21aa7c67d860cc55df7adc391590 TraceEvent.begin("ToolbarPhone.updateLocationBarLayoutForExpansionAnimation"); if (isInTabSwitcherMode()) return; -@@ -1469,6 +1472,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -1402,6 +1405,7 @@ public class ToolbarPhone extends ToolbarLayout canvas.restore(); } @@ -34,7 +34,7 @@ index 71b18581d4e8f2c712a9a8e6e4bc3bf82efd8c7f..8c6c21aa7c67d860cc55df7adc391590 // Draw the tab stack button and associated text if necessary. if (getTabSwitcherButtonCoordinator() != null && mUrlExpansionFraction != 1f) { // Draw the tab stack button image. -@@ -2126,6 +2130,7 @@ public class ToolbarPhone extends ToolbarLayout +@@ -2050,6 +2054,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 5d01755210f7..a749dd405452 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 7cf04251bcd3c0e4ed78718cc94c6a77851958b7..bb1ee5accb1a872b7b179b331158fc25fdb5445d 100644 +index d434ff189bff1cced4e8fda2779892387e8823de..6234ab83b99d244d87b0931ec013a48be9c460f9 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 -@@ -403,10 +403,12 @@ public class ToolbarTablet extends ToolbarLayout +@@ -383,10 +383,12 @@ public class ToolbarTablet extends ToolbarLayout mOfflineDownloader.downloadPage(getContext(), getToolbarDataProvider().getTab()); RecordUserAction.record("MobileToolbarDownloadPage"); } @@ -15,7 +15,7 @@ index 7cf04251bcd3c0e4ed78718cc94c6a77851958b7..bb1ee5accb1a872b7b179b331158fc25 String description = null; Context context = getContext(); Resources resources = context.getResources(); -@@ -546,6 +548,7 @@ public class ToolbarTablet extends ToolbarLayout +@@ -526,6 +528,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 c6ce05f1aad9..832c6b229faa 100644 --- a/patches/chrome-browser-ui-browser.cc.patch +++ b/patches/chrome-browser-ui-browser.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc -index 3d0ffcbb38c234b97fe8df33e34eab5386bd59b8..57f3ea6f9e33aef1fc9f6aec3818263d3a709da6 100644 +index fafd84d08e33622aee01f1792c043180a13dd48d..8773ecb93e5a7c999a13e46b9327657d852f7196 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -555,6 +555,7 @@ Browser* Browser::Create(const CreateParams& params) { diff --git a/patches/chrome-browser-ui-omnibox-chrome_omnibox_client.h.patch b/patches/chrome-browser-ui-omnibox-chrome_omnibox_client.h.patch index bbc3ced970c6..4625a051b1e4 100644 --- a/patches/chrome-browser-ui-omnibox-chrome_omnibox_client.h.patch +++ b/patches/chrome-browser-ui-omnibox-chrome_omnibox_client.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/omnibox/chrome_omnibox_client.h b/chrome/browser/ui/omnibox/chrome_omnibox_client.h -index c69321daaa50b2025571e084e32daab081d854f2..88ceb225a9b7b8a050bcf7cbaa1c21ac34bd937e 100644 +index 467c4b29931b3ed8bacd76db9b4a760c4df2a107..73742f09a415c3f4afc6bdd90bef996eebd80c9d 100644 --- a/chrome/browser/ui/omnibox/chrome_omnibox_client.h +++ b/chrome/browser/ui/omnibox/chrome_omnibox_client.h @@ -23,7 +23,7 @@ class GURL; diff --git a/patches/chrome-browser-ui-tab_helpers.cc.patch b/patches/chrome-browser-ui-tab_helpers.cc.patch index 018c42617535..0ddbbcd7d5cc 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 2d39a00a308eff3c2b631f43637b00d6b6abb8f6..9858402af17d3d8f361b91652122aed2a54453d8 100644 +index 605c712f3d182c60c4b347cdf54523d5c037a98f..f2bf932e44d11970f71ea06fc9eed222226d70de 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc -@@ -772,4 +772,5 @@ void TabHelpers::AttachTabHelpers(WebContents* web_contents) { +@@ -787,4 +787,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-views-bookmarks-bookmark_bar_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bar_view.cc.patch index 04744b855100..697cac54801c 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 0ea69547411a1cc89ac0ad996b0918369def42e8..86e1c9f0ca5d0bbe99d6eec5f97fdc7f10b11327 100644 +index c9758f16912b31d41215bf49e5dfd49c2965c987..ce1995b0ae6fc92e1719f46e8cf138ed902cd51c 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc -@@ -877,6 +877,7 @@ void BookmarkBarView::Layout(PassKey) { +@@ -869,6 +869,7 @@ void BookmarkBarView::Layout(PassKey) { x = next_x; } } diff --git a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch index a951b40672e8..63160819cb9e 100644 --- a/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch +++ b/patches/chrome-browser-ui-views-bookmarks-bookmark_bubble_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -index 60672a6fd4fffb7013cc894b6bd9362fc224da38..e4b58dc622cff04dc7d3e2bbc1d91a45ea96c0df 100644 +index b3c3d1f001f5cb90096ea82e7bc818af8f26093a..5b1b584ff07c97711eb7d1ebf1f1b39cfe1ce332 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc -@@ -449,6 +449,7 @@ void BookmarkBubbleView::ShowBubble( +@@ -440,6 +440,7 @@ void BookmarkBubbleView::ShowBubble(views::View* anchor_view, dialog_model_builder.Build(), anchor_view, views::BubbleBorder::TOP_RIGHT); bookmark_bubble_ = bubble.get(); 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 bc6aea8bdb85..c017c6b2cce2 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 9119f90e636cfce180128076eba1e7d104c24f80..2307c42a224cb513ca51369c157f33c8ecfd2ba4 100644 +index 62778c9ebe4d344a82707ea65651d4a66e474766..22b1779b7bfed94694e041b75e2a634bb535f1f5 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 -@@ -216,6 +216,7 @@ void ExtensionsMenuMainPageView::CreateAndInsertMenuItem( +@@ -217,6 +217,7 @@ void ExtensionsMenuMainPageView::CreateAndInsertMenuItem( ExtensionMenuItemView::SitePermissionsButtonAccess site_permissions_button_access, int index) { diff --git a/patches/chrome-browser-ui-views-frame-browser_view_layout.cc.patch b/patches/chrome-browser-ui-views-frame-browser_view_layout.cc.patch index 7c127b199750..025cc2150969 100644 --- a/patches/chrome-browser-ui-views-frame-browser_view_layout.cc.patch +++ b/patches/chrome-browser-ui-views-frame-browser_view_layout.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/frame/browser_view_layout.cc b/chrome/browser/ui/views/frame/browser_view_layout.cc -index 46f6be18ac556ef42c5f40c7bca792c156eafac9..b8bce345f82be29f0a76d617936fcb2bfe9484b0 100644 +index 39f9345a8bf6a9cf28343a3706de734013452ec6..e890b6bf251abcfef00aca944ef961cb44977b66 100644 --- a/chrome/browser/ui/views/frame/browser_view_layout.cc +++ b/chrome/browser/ui/views/frame/browser_view_layout.cc @@ -72,6 +72,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) { diff --git a/patches/chrome-browser-ui-views-frame-tab_strip_region_view.h.patch b/patches/chrome-browser-ui-views-frame-tab_strip_region_view.h.patch index 0077e14db357..3eeea25b4d91 100644 --- a/patches/chrome-browser-ui-views-frame-tab_strip_region_view.h.patch +++ b/patches/chrome-browser-ui-views-frame-tab_strip_region_view.h.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/frame/tab_strip_region_view.h b/chrome/browser/ui/views/frame/tab_strip_region_view.h -index 62662c70ae6d83be51bc9a6ade27d8b240e80d78..f5cbd6940b255b71b789680d60f925e7c1e31b14 100644 +index bca3cc6c4fd27b5c1264778ff38f8dd43ac32ff1..9d4bbaf888b474705b581f977acb0cb7b9a2a638 100644 --- a/chrome/browser/ui/views/frame/tab_strip_region_view.h +++ b/chrome/browser/ui/views/frame/tab_strip_region_view.h @@ -29,7 +29,7 @@ class TabSearchPositionMetricsLogger; 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 e87f80b60eab..bb0964f2a8f9 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 7f9528294463ce8a730e2ce92ed53d19976de7b2..fdb6ed767072bc4333696bbe375854dd7b234e9b 100644 +index 5067e96c2701a7fdf35099070478b4825feccff9..b150841ce0bb18ef5e5ce0da2f2884ccd38507ba 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 -@@ -748,6 +748,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const { +@@ -749,6 +749,7 @@ SkPath IconLabelBubbleView::GetHighlightPath() const { SkIntToScalar(radii.lower_right()), SkIntToScalar(radii.lower_right()), SkIntToScalar(radii.lower_left()), SkIntToScalar(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 18ae9050f30c..a98d8b2412c3 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc -index a81ff31023f55ee641fa5b25ed04edf68a5fc207..b6e5bbf8ccdb4ec7904d991092404dba8d71f89d 100644 +index 22e9b1938429f86c617c8ba59d9e3edb988cb11e..839ad1d1c236bee117fe673c3510518f4257bafe 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc -@@ -771,6 +771,7 @@ void LocationBarView::Layout(PassKey) { +@@ -773,6 +773,7 @@ void LocationBarView::Layout(PassKey) { // Indentation add padding when the permission chip is visible and replacing // the LHS icon. int text_overriding_permission_chip_indent = 0; @@ -10,7 +10,7 @@ index a81ff31023f55ee641fa5b25ed04edf68a5fc207..b6e5bbf8ccdb4ec7904d991092404dba if (should_indent) { icon_left += icon_indent; text_left += text_indent; -@@ -835,6 +836,7 @@ void LocationBarView::Layout(PassKey) { +@@ -845,6 +846,7 @@ void LocationBarView::Layout(PassKey) { } selected_keyword_view_->SetCustomImage(image); } @@ -18,7 +18,7 @@ index a81ff31023f55ee641fa5b25ed04edf68a5fc207..b6e5bbf8ccdb4ec7904d991092404dba } else if (location_icon_view_->GetShowText() && !ShouldChipOverrideLocationIcon()) { location_icon_view_->SetVisible(true); -@@ -882,6 +884,7 @@ void LocationBarView::Layout(PassKey) { +@@ -892,6 +894,7 @@ void LocationBarView::Layout(PassKey) { } }; @@ -26,7 +26,7 @@ index a81ff31023f55ee641fa5b25ed04edf68a5fc207..b6e5bbf8ccdb4ec7904d991092404dba add_trailing_decoration(page_action_icon_container_, /*intra_item_padding=*/0); add_trailing_decoration(page_action_container_, -@@ -897,6 +900,7 @@ void LocationBarView::Layout(PassKey) { +@@ -907,6 +910,7 @@ void LocationBarView::Layout(PassKey) { } add_trailing_decoration(clear_all_button_, /*intra_item_padding=*/0); diff --git a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch index 8c24fe06d398..73e3b8854015 100644 --- a/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch +++ b/patches/chrome-browser-ui-views-location_bar-location_bar_view.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h -index f60a77c61182278ffa581b5bfbdc6adf7e7b86b0..2ed902249eeb7e929152b298c3a265036b56eec2 100644 +index 45ce3e2833ead125c1e9f3f91ea2a66e9f15b0b3..8fa1910c4a47de350bd63ef8835ce2a07e0b3ac9 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.h +++ b/chrome/browser/ui/views/location_bar/location_bar_view.h -@@ -128,6 +128,7 @@ class LocationBarView +@@ -129,6 +129,7 @@ class LocationBarView int GetBorderRadius() const; // Initializes the LocationBarView. @@ -10,7 +10,7 @@ index f60a77c61182278ffa581b5bfbdc6adf7e7b86b0..2ed902249eeb7e929152b298c3a26503 void Init(); // True if this instance has been initialized by calling Init, which can only -@@ -189,6 +190,7 @@ class LocationBarView +@@ -190,6 +191,7 @@ class LocationBarView // Updates the controller, and, if |contents| is non-null, restores saved // state that the tab holds. @@ -18,7 +18,7 @@ index f60a77c61182278ffa581b5bfbdc6adf7e7b86b0..2ed902249eeb7e929152b298c3a26503 void Update(content::WebContents* contents); // Clears the location bar's state for |contents|. -@@ -288,6 +290,7 @@ class LocationBarView +@@ -289,6 +291,7 @@ class LocationBarView GetContentSettingViewsForTest() { return content_setting_views_; } 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 9433f7f23371..5d2314564e61 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,5 +1,5 @@ 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 d1bfeca48574c54dfa19cee5ba718d34ce2adc50..9e0aaec6d7b8e141aaf72c9376e159b7a7c1c1e3 100644 +index 6671f304fc15221d18fa1be2c4f20368db518e59..0dc3521fa18ca326a6cc14c82c19876722bc8424 100644 --- a/chrome/browser/ui/views/overlay/video_overlay_window_views.cc +++ b/chrome/browser/ui/views/overlay/video_overlay_window_views.cc @@ -363,7 +363,7 @@ std::unique_ptr VideoOverlayWindowViews::Create( diff --git a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch index 9b8342ace851..cec571f97f1a 100644 --- a/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch +++ b/patches/chrome-browser-ui-views-page_info-page_info_view_factory.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/views/page_info/page_info_view_factory.cc b/chrome/browser/ui/views/page_info/page_info_view_factory.cc -index 0ab9b97b32807d78cb53c3f365e9e0aef4defa63..dc19dd7a0653d07fc09361d9c8fb972d976a1d56 100644 +index b38d6049f7451e05e8b82fbb785374eaa0600304..f542d140e4d19c9bd271bd8138bd34dad5bbb7ba 100644 --- a/chrome/browser/ui/views/page_info/page_info_view_factory.cc +++ b/chrome/browser/ui/views/page_info/page_info_view_factory.cc @@ -466,6 +466,7 @@ const ui::ImageModel PageInfoViewFactory::GetPermissionIcon( 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 ca2a19104d63..e3e7bb9e9d01 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,5 +1,5 @@ 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 2f2b15301fdd112faab2837f91f4f5d2345e416c..97b411cffd7690ce512a7d3438099f6707329a05 100644 +index 4af1b3933d65f412955fc0b37bd2068d53b490b4..98ac783753e245a197e267252bf7960048472cad 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 @@ -156,6 +156,7 @@ void PermissionPromptBubbleBaseView::CreatePermissionButtons( 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 144997cf0503..32465fbae535 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 188e19af3f741d092e1db201c61f014779a8b435..ae664865e7a7a1fd5be2bd4064b8e074e8d8310b 100644 +index bd414791858d960c7a3b491ca4bb6c2590294c7f..04731af36f8c4f0c64803ceadb712644535f4dfb 100644 --- a/chrome/browser/ui/views/profiles/avatar_toolbar_button.h +++ b/chrome/browser/ui/views/profiles/avatar_toolbar_button.h -@@ -145,6 +145,7 @@ class AvatarToolbarButton : public ToolbarButton { +@@ -147,6 +147,7 @@ class AvatarToolbarButton : public ToolbarButton { CreateScopedZeroDelayOverrideSigninPendingTextForTesting(); private: diff --git a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch index 76176580f81a..3cec57a0821a 100644 --- a/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch +++ b/patches/chrome-browser-ui-views-profiles-profile_menu_view_base.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/profiles/profile_menu_view_base.h b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -index 32f0ff1a74ddbd4b5b5cff01c19f347af6f81271..562299f2d3e4f55ae85dd914a7e582c9b379bbce 100644 +index 1be1c66ac0f3b958717f560d48a4e6d15d0a0a60..5cedfa2dd4df746a8f4ccc845acec3fc0461c2a7 100644 --- a/chrome/browser/ui/views/profiles/profile_menu_view_base.h +++ b/chrome/browser/ui/views/profiles/profile_menu_view_base.h -@@ -232,6 +232,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, +@@ -236,6 +236,7 @@ class ProfileMenuViewBase : public content::WebContentsDelegate, void set_perform_menu_actions_for_testing(bool perform_menu_actions) { perform_menu_actions_ = perform_menu_actions; } diff --git a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch index 7371a78ca56f..a657962d6167 100644 --- a/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch +++ b/patches/chrome-browser-ui-views-side_panel-side_panel_coordinator.h.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h -index 14820d9e776883cfb724291ba9882dbbceeace7d..4945952dd49b5170d3a42b8bd236d459a1677785 100644 +index bbeaafba9f40e73001e4af3b0b36908f460880d3..8bc7f07a95f03c38326f94dc9b20088fff34871e 100644 --- a/chrome/browser/ui/views/side_panel/side_panel_coordinator.h +++ b/chrome/browser/ui/views/side_panel/side_panel_coordinator.h -@@ -56,7 +56,7 @@ class View; +@@ -57,7 +57,7 @@ class View; // registry's active_entry() then global registry's. These values are reset when // the side panel is closed and |last_active_global_entry_id_| is used to // determine what entry is seen when the panel is reopened. diff --git a/patches/chrome-browser-ui-views-tabs-tab.cc.patch b/patches/chrome-browser-ui-views-tabs-tab.cc.patch index 3a03b62c4413..43c6d31983bb 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 dcdf31f2c44f2fbb8dbe8ca37dd14d99f77fdfc0..bc518950bc467b29a67da8881f3a9966f19d0e35 100644 +index 10d0898b909a8bc50de784ee43c7d7fdf7583422..1d3c803a9a0c844b5b0fd42c512acca44b05911d 100644 --- a/chrome/browser/ui/views/tabs/tab.cc +++ b/chrome/browser/ui/views/tabs/tab.cc -@@ -331,6 +331,7 @@ void Tab::Layout(PassKey) { +@@ -332,6 +332,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 dcdf31f2c44f2fbb8dbe8ca37dd14d99f77fdfc0..bc518950bc467b29a67da8881f3a9966 if (center_icon_) { // When centering the favicon, the favicon is allowed to escape the normal // contents rect. -@@ -430,6 +431,7 @@ void Tab::Layout(PassKey) { +@@ -431,6 +432,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 dcdf31f2c44f2fbb8dbe8ca37dd14d99f77fdfc0..bc518950bc467b29a67da8881f3a9966 } else if (showing_close_button_) { // Allow the title to overlay the close button's empty border padding. title_right = close_x - after_title_padding; -@@ -1151,6 +1153,7 @@ void Tab::UpdateIconVisibility() { +@@ -1156,6 +1158,7 @@ void Tab::UpdateIconVisibility() { !controller_->IsLockedForOnTask() && #endif large_enough_for_close_button; 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 bec235c7c871..9f96f3d0af83 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,5 +1,5 @@ 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 c1382281c430fc9de0c9da6c4698fabed9412d9d..af53148bae6590b387efbf797cdc7db5e72ecc7e 100644 +index 19a3d6c2b98a5f08dc0330f84757a5c37328ff0e..64df85c4ea6e275b517bd6b34e9f2520ae65c331 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 @@ -91,6 +91,7 @@ class TabHoverCardBubbleView : public views::BubbleDialogDelegateView { 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 7d8c3057ee53..29780c4cc205 100644 --- a/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch +++ b/patches/chrome-browser-ui-views-tabs-tab_strip.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc -index 3cc13da526ba7f12dfaf8f6c923d4f084fd6dda4..b8d6af01d3a792df831d1e79ae5e71cdd9dd7a92 100644 +index b3c3e7d932f6dc5b2d6f649b513481c137be1a26..938ef937954355247d77ff3668a79a1d65003aa0 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc -@@ -541,6 +541,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -543,6 +543,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, std::vector CalculateBoundsForDraggedViews( const std::vector>& views) override { @@ -10,7 +10,7 @@ index 3cc13da526ba7f12dfaf8f6c923d4f084fd6dda4..b8d6af01d3a792df831d1e79ae5e71cd CHECK(!views.empty(), base::NotFatalUntil::M128) << "The views vector must not be empty."; -@@ -837,6 +838,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, +@@ -839,6 +840,7 @@ class TabStrip::TabDragContextImpl : public TabDragContext, continue; } 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 1aecadd91c35..aa1619977945 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 13203a55591f2747729185ac763c00f59488da41..e8c7b632db8911d8511b36ba20ef5815411277a8 100644 +index 29ff9c9f413cc2b73443fa274a826effbecd9bd8..2bcf16aa51628156893338916d49916cd28b70d9 100644 --- a/chrome/browser/ui/views/tabs/tab_style_views.cc +++ b/chrome/browser/ui/views/tabs/tab_style_views.cc -@@ -128,6 +128,7 @@ class TabStyleViewsImpl : public TabStyleViews { +@@ -127,6 +127,7 @@ class TabStyleViewsImpl : public TabStyleViews { TabStyle::TabSelectionState GetSelectionState() const; private: @@ -10,7 +10,7 @@ index 13203a55591f2747729185ac763c00f59488da41..e8c7b632db8911d8511b36ba20ef5815 // Gets the bounds for the leading and trailing separators for a tab. TabStyle::SeparatorBounds GetSeparatorBounds(float scale) const; -@@ -343,6 +344,7 @@ SkPath TabStyleViewsImpl::GetPath(TabStyle::PathType path_type, +@@ -339,6 +340,7 @@ SkPath TabStyleViewsImpl::GetPath(TabStyle::PathType path_type, extension_corner_radius -= 0.5f * stroke_adjustment; } const bool compact_left_to_bottom = ShouldCompactLeadingEdge(path_type); @@ -18,7 +18,7 @@ index 13203a55591f2747729185ac763c00f59488da41..e8c7b632db8911d8511b36ba20ef5815 SkPath path; -@@ -1018,14 +1020,18 @@ void TabStyleViewsImpl::PaintSeparators(gfx::Canvas* canvas) const { +@@ -1003,14 +1005,18 @@ void TabStyleViewsImpl::PaintSeparators(gfx::Canvas* canvas) const { SK_AlphaOPAQUE)); }; diff --git a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch index 4438e9a59c00..1029151fa9b4 100644 --- a/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch +++ b/patches/chrome-browser-ui-views-toolbar-toolbar_view.cc.patch @@ -1,8 +1,8 @@ diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc -index 27efd0c4238f4eb39c16b51338bd3d7aa62e64b4..2425386e9b90b03ca4b4bdc62c48f8f02214aa40 100644 +index 0d912a7cbf371458a6997c1362a44265698f2541..4f83fd13e9e55feae4adc80b13b1428933f00b2d 100644 --- a/chrome/browser/ui/views/toolbar/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc -@@ -481,6 +481,7 @@ void ToolbarView::Init() { +@@ -467,6 +467,7 @@ void ToolbarView::Init() { container_view_->AddChildView(std::move(send_tab_to_self_button)); } diff --git a/patches/chrome-browser-ui-webui-BUILD.gn.patch b/patches/chrome-browser-ui-webui-BUILD.gn.patch index 8578ad5ff729..dd44893d0e81 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 ee8a22c4514de2b356933fa2a9764a1799cfeaa5..3c9ce7b5bb2d3084b0a3631e84dada2ac3b4a5c2 100644 +index f5e62acbe488bbf758d0084ae3fca7ef05595a13..63ac37a30dc9d0b6e35d238fd77885643b9bafef 100644 --- a/chrome/browser/ui/webui/BUILD.gn +++ b/chrome/browser/ui/webui/BUILD.gn -@@ -74,6 +74,7 @@ source_set("configs") { +@@ -78,6 +78,7 @@ source_set("configs") { if (enable_glic) { deps += [ "//chrome/browser/glic" ] } 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 e435d2aa60af..97b2cd9d424c 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 af4d850908f905d3db8b2c58df16bdfbdf3e5017..6a9804e2f0db1c7da8178a3786cf7a4308f84443 100644 +index e4dd0d8a793f279c6ac1ffc546ae4af6ec44840f..d4f64128e9982b02135dcad9be5f433543d75aa6 100644 --- a/chrome/browser/ui/webui/extensions/extensions_ui.cc +++ b/chrome/browser/ui/webui/extensions/extensions_ui.cc -@@ -502,6 +502,7 @@ content::WebUIDataSource* CreateAndAddExtensionsSource(Profile* profile, +@@ -501,6 +501,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-history-history_ui.cc.patch b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch index 42e48df44dd4..6e2d5b8e5c90 100644 --- a/patches/chrome-browser-ui-webui-history-history_ui.cc.patch +++ b/patches/chrome-browser-ui-webui-history-history_ui.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/history/history_ui.cc b/chrome/browser/ui/webui/history/history_ui.cc -index fdbd1e679be1687b430c00f9aa638ea67768fcf1..148672cb5c0adf7706efde79919322fc82f31a7e 100644 +index f84d35ce8e4646143216dbd28e5c685fcac711eb..dc4b6c0b9213c9476bc4ce4ec266f5bef64823f8 100644 --- a/chrome/browser/ui/webui/history/history_ui.cc +++ b/chrome/browser/ui/webui/history/history_ui.cc @@ -89,6 +89,7 @@ content::WebUIDataSource* CreateAndAddHistoryUIHTMLSource(Profile* profile) { diff --git a/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch b/patches/chrome-browser-ui-webui-settings-people_handler.cc.patch index 47b20d38e4fa..eb3a19ff2ed1 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 95aefbf0ea8d7b59848727520b7ee088652cbb04..e4fd5b04fb1ca73d98d42ebbaeec571fed619aab 100644 +index 889f8a4c45680330a611d739acbf0c7ab1c3afa5..da63eaa29dd6a4ebe897b22e29d530c45003167b 100644 --- a/chrome/browser/ui/webui/settings/people_handler.cc +++ b/chrome/browser/ui/webui/settings/people_handler.cc -@@ -1095,6 +1095,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { +@@ -1081,6 +1081,7 @@ void PeopleHandler::OnStateChanged(syncer::SyncService* sync_service) { void PeopleHandler::BeforeUnloadDialogCancelled() { // The before unload dialog is only shown during the first sync setup. @@ -10,7 +10,7 @@ index 95aefbf0ea8d7b59848727520b7ee088652cbb04..e4fd5b04fb1ca73d98d42ebbaeec571f DCHECK(IdentityManagerFactory::GetForProfile(profile_)->HasPrimaryAccount( signin::ConsentLevel::kSync)); syncer::SyncService* service = GetSyncService(); -@@ -1144,6 +1145,7 @@ base::Value::Dict PeopleHandler::GetSyncStatusDictionary() const { +@@ -1130,6 +1131,7 @@ base::Value::Dict PeopleHandler::GetSyncStatusDictionary() const { service && !disallowed_by_policy && service->IsSetupInProgress() && !service->GetUserSettings()->IsInitialSyncFeatureSetupComplete() && identity_manager->HasPrimaryAccount(signin::ConsentLevel::kSync)); @@ -18,7 +18,7 @@ index 95aefbf0ea8d7b59848727520b7ee088652cbb04..e4fd5b04fb1ca73d98d42ebbaeec571f SyncStatusLabels status_labels; -@@ -1355,6 +1357,7 @@ void PeopleHandler::MaybeMarkSyncConfiguring() { +@@ -1341,6 +1343,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 e50116b72967..c76c42594bfd 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 fa7a92d236786036a60976d30fb22dee4203ff4b..d28fd01460b55bc5ea639fc35bbf473958ae9501 100644 +index 2df5b87bbace72ffaf02395a4486c32c1a23ded9..fee2c3ae7bd5a2e7aa3d7156fd53ce413699f880 100644 --- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc +++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -3792,6 +3792,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, +@@ -3802,6 +3802,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source, policy_indicator::AddLocalizedStrings(html_source); AddSecurityKeysStrings(html_source); diff --git a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch index 37db4d392c3b..88e32312cba6 100644 --- a/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch +++ b/patches/chrome-browser-ui-webui-settings-site_settings_helper.cc.patch @@ -1,5 +1,5 @@ diff --git a/chrome/browser/ui/webui/settings/site_settings_helper.cc b/chrome/browser/ui/webui/settings/site_settings_helper.cc -index 8856936f6b0a270a9aba9482c248a89a115dcdd1..785a5dc41b593d67ac94e0bb9af08701a94782b7 100644 +index e5e4877a45971b773704a139a88dede0efc31eff..d270c3209582896a27c478f0fd691ad4d9318356 100644 --- a/chrome/browser/ui/webui/settings/site_settings_helper.cc +++ b/chrome/browser/ui/webui/settings/site_settings_helper.cc @@ -248,6 +248,7 @@ constexpr auto kContentSettingsTypeGroupNames = std::to_array< @@ -34,7 +34,7 @@ index 8856936f6b0a270a9aba9482c248a89a115dcdd1..785a5dc41b593d67ac94e0bb9af08701 case ProviderType::kWebuiAllowlistProvider: return SiteSettingSource::kAllowlist; case ProviderType::kPolicyProvider: -@@ -723,6 +727,7 @@ SiteSettingSource ProviderTypeToSiteSettingsSource( +@@ -724,6 +728,7 @@ SiteSettingSource ProviderTypeToSiteSettingsSource( std::string ProviderToDefaultSettingSourceString(const ProviderType provider) { switch (provider) { diff --git a/patches/chrome-common-BUILD.gn.patch b/patches/chrome-common-BUILD.gn.patch index bee61e85973b..90af6eb725aa 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 e394083a20ade73f1fc2df4e215bce63d8252d6b..ec4a3e6467188425858999513a14e051933bf231 100644 +index 40e1d1c431dd0d9f44ad2f78e2e535dbdc436438..9d4758954075d98d974fd368e642be0fecac4684 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -99,6 +99,7 @@ source_set("channel_info") { +@@ -95,6 +95,7 @@ source_set("channel_info") { } else if (is_posix) { sources += [ "channel_info_posix.cc" ] } @@ -10,7 +10,7 @@ index e394083a20ade73f1fc2df4e215bce63d8252d6b..ec4a3e6467188425858999513a14e051 } source_set("ini_parser") { -@@ -284,6 +285,7 @@ static_library("common_lib") { +@@ -279,6 +280,7 @@ static_library("common_lib") { if (enable_ppapi) { public_deps += [ "//ppapi/shared_impl" ] } @@ -18,7 +18,7 @@ index e394083a20ade73f1fc2df4e215bce63d8252d6b..ec4a3e6467188425858999513a14e051 if (enable_extensions_core) { public_deps += [ -@@ -495,6 +497,7 @@ static_library("non_code_constants") { +@@ -488,6 +490,7 @@ static_library("non_code_constants") { if (is_win) { sources += [ "chrome_icon_resources_win.h" ] } diff --git a/patches/chrome-common-extensions-BUILD.gn.patch b/patches/chrome-common-extensions-BUILD.gn.patch index 4ad6352fbf48..111e1771cf8f 100644 --- a/patches/chrome-common-extensions-BUILD.gn.patch +++ b/patches/chrome-common-extensions-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/chrome/common/extensions/BUILD.gn b/chrome/common/extensions/BUILD.gn -index fdcf7eaac6b2511536d709efba7f97519a13a6fb..d98a383b3014a682965b3b7002881cb5222c01bb 100644 +index f6db8be51b3bbf9c861091ccb5e135784735b9b9..285429162c4f7c53e369cb13a07de4ca768d797c 100644 --- a/chrome/common/extensions/BUILD.gn +++ b/chrome/common/extensions/BUILD.gn -@@ -119,6 +119,7 @@ source_set("extensions") { +@@ -118,6 +118,7 @@ source_set("extensions") { sources += [ "api/file_system_provider_capabilities/file_system_provider_capabilities_handler.cc" ] } diff --git a/patches/chrome-common-extensions-api-developer_private.idl.patch b/patches/chrome-common-extensions-api-developer_private.idl.patch index 24bfd80b6498..03448e9f98b9 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 8b09424e0c4cd409f1693ba06eb69d800f948473..7341c79c9647c07320733829314638d7b7c6c799 100644 +index 28ffe3b9b74aa78a95cfdac4d202fc250918d702..38221251f0f8784f44a9881778286daa0c355b13 100644 --- a/chrome/common/extensions/api/developer_private.idl +++ b/chrome/common/extensions/api/developer_private.idl -@@ -257,6 +257,7 @@ namespace developerPrivate { +@@ -258,6 +258,7 @@ namespace developerPrivate { DOMString id; AccessModifier incognitoAccess; AccessModifier userScriptsAccess; diff --git a/patches/chrome-installer-mini_installer-BUILD.gn.patch b/patches/chrome-installer-mini_installer-BUILD.gn.patch index 6ec3a920090e..410a595547d8 100644 --- a/patches/chrome-installer-mini_installer-BUILD.gn.patch +++ b/patches/chrome-installer-mini_installer-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mini_installer/BUILD.gn b/chrome/installer/mini_installer/BUILD.gn -index c490d199bf51e9bc4919e769488a5f5d57825015..b4867d29548428054e0b4a54de4a6f50dd9c6e0e 100644 +index be48771397da4f845a4b911a97b144c2db484bdc..7478089442af4bb521641b70b98e10a5ac6494a9 100644 --- a/chrome/installer/mini_installer/BUILD.gn +++ b/chrome/installer/mini_installer/BUILD.gn @@ -137,7 +137,7 @@ if (enable_uncompressed_archive) { @@ -11,7 +11,7 @@ index c490d199bf51e9bc4919e769488a5f5d57825015..b4867d29548428054e0b4a54de4a6f50 script = "//chrome/tools/build/win/create_installer_archive.py" release_file = "chrome.release" -@@ -311,6 +311,7 @@ template("generate_mini_installer") { +@@ -317,6 +317,7 @@ template("generate_mini_installer") { no_default_deps = true ldflags += [ "/ENTRY:MainEntryPoint" ] } diff --git a/patches/chrome-installer-mini_installer-chrome.release.patch b/patches/chrome-installer-mini_installer-chrome.release.patch index 77e10f29c888..941aaf9adc6f 100644 --- a/patches/chrome-installer-mini_installer-chrome.release.patch +++ b/patches/chrome-installer-mini_installer-chrome.release.patch @@ -1,5 +1,5 @@ diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release -index ffa94d46ccc9df3d7bde256ba14e405e8b7ed976..5647e45aa17411dbf7b8783dd1e207b904411474 100644 +index 0f331c3e0f2a39813af0a33a162cefaff9324524..56f286a033a7958b3be1e3bb790a6b9c191d9ff3 100644 --- a/chrome/installer/mini_installer/chrome.release +++ b/chrome/installer/mini_installer/chrome.release @@ -6,7 +6,7 @@ @@ -31,7 +31,7 @@ index ffa94d46ccc9df3d7bde256ba14e405e8b7ed976..5647e45aa17411dbf7b8783dd1e207b9 chrome_elf.dll: %(VersionDir)s\ chrome_pwa_launcher.exe: %(VersionDir)s\ chrome_wer.dll: %(VersionDir)s\ -@@ -65,6 +75,7 @@ MEIPreload\preloaded_data.pb: %(VersionDir)s\MEIPreload\ +@@ -71,6 +81,7 @@ IwaKeyDistribution\manifest.json: %(VersionDir)s\IwaKeyDistribution\ [HIDPI] chrome_200_percent.pak: %(VersionDir)s\ diff --git a/patches/chrome-test-BUILD.gn.patch b/patches/chrome-test-BUILD.gn.patch index 6b81731be706..1e4b9203bcf6 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 c56a3502fd364356b6a014764eeda80ada812932..2f123a58247cdcdfbc8f864bec5ce7b3186314c4 100644 +index 0bb0935ce8d6998cbaeee63647e587601214d367..deb3c8fd2705a9670e4bd1beadc700de67a80e1a 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn -@@ -616,6 +616,7 @@ static_library("test_support") { +@@ -641,6 +641,7 @@ static_library("test_support") { "//ui/gl", ] diff --git a/patches/chrome-test-data-webui-settings-BUILD.gn.patch b/patches/chrome-test-data-webui-settings-BUILD.gn.patch index 376be3c4a4ce..42efc45cf368 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 427e1348fdc4e3f8761973dcadf6fc348e863e76..08f48fc6cc858883f4dd56a78690fed3d7367546 100644 +index 03f60767cd3ad2045ddbcb397d9cd45595c6266c..0e420ac68e7998aa8caa684e0a17990f1f2947b2 100644 --- a/chrome/test/data/webui/settings/BUILD.gn +++ b/chrome/test/data/webui/settings/BUILD.gn -@@ -261,6 +261,7 @@ build_webui_tests("build") { +@@ -260,6 +260,7 @@ build_webui_tests("build") { ts_definitions += [ "//tools/typescript/definitions/quick_unlock_private.d.ts" ] } diff --git a/patches/components-browser_ui-settings-android-BUILD.gn.patch b/patches/components-browser_ui-settings-android-BUILD.gn.patch index b8e5d218b1a5..2516447218b7 100644 --- a/patches/components-browser_ui-settings-android-BUILD.gn.patch +++ b/patches/components-browser_ui-settings-android-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/settings/android/BUILD.gn b/components/browser_ui/settings/android/BUILD.gn -index af01598e18da5affe96b305403730740f65f8b23..34a02a73d6d394b9e338c4039f550d3270c92ee3 100644 +index 7c28c68eee22fa39d131d00ca02e2c846b0df33c..703d0462e3a9cd1263f4c934da26adaa7a60beb0 100644 --- a/components/browser_ui/settings/android/BUILD.gn +++ b/components/browser_ui/settings/android/BUILD.gn @@ -52,6 +52,7 @@ android_library("java") { 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 66cc61fa6afd..c207aa9b9348 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,8 +1,8 @@ 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 bb76d688ce04f1109efdadfc7a053def6301c72e..22e2ab4e1183c03bb0899abce396297218a756a7 100644 +index d60a457c42a189775c02b851e3ad71660b47d332..d5a1c84417aeab5136c156811119f7325cdcb75e 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 -@@ -158,7 +158,7 @@ public class ChosenObjectSettings extends BaseSiteSettingsFragment +@@ -169,7 +169,7 @@ public class ChosenObjectSettings extends BaseSiteSettingsFragment getSiteSettingsDelegate().launchSettingsHelpAndFeedbackActivity(getActivity()); return true; } 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 bb7f0074d142..181aa423ccf9 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 5518adebf57a7d37e4b523c9241de489da2e1bb6..cd7178936ad6fb692897a4dc98944329a6355c19 100644 +index 43bc613536b19f59815a573ec14243b244a3c5d5..fa91fb9accdb78d0f642aa93c3aa07e9d6268963 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 -@@ -555,7 +555,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment +@@ -582,7 +582,7 @@ public class SingleCategorySettings extends BaseSiteSettingsFragment if (queryHasChanged) getInfoForOrigins(); return true; } diff --git a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch index f14fa9ab76fb..5c30dc6d7db1 100644 --- a/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch +++ b/patches/components-browser_ui-site_settings-android-java-src-org-chromium-components-browser_ui-site_settings-SiteSettingsCategory.java.patch @@ -1,8 +1,8 @@ diff --git a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java -index 9215e06fe9f1475607047127c17ee96f34caba68..219899ca0f3f0070fce7203348d77e89a38eb22b 100644 +index d4e5359bc330443179485e68d7421b1d30a3b6a2..d9a207d75a3d7895ae7fe6f02740f1d9cb9dd81f 100644 --- a/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java +++ b/components/browser_ui/site_settings/android/java/src/org/chromium/components/browser_ui/site_settings/SiteSettingsCategory.java -@@ -75,6 +75,7 @@ public class SiteSettingsCategory { +@@ -77,6 +77,7 @@ public class SiteSettingsCategory { Type.TRACKING_PROTECTION, Type.FILE_EDITING, Type.JAVASCRIPT_OPTIMIZER, @@ -10,7 +10,7 @@ index 9215e06fe9f1475607047127c17ee96f34caba68..219899ca0f3f0070fce7203348d77e89 Type.NUM_ENTRIES }) @Retention(RetentionPolicy.SOURCE) -@@ -115,9 +116,10 @@ public class SiteSettingsCategory { +@@ -117,9 +118,10 @@ public class SiteSettingsCategory { int HAND_TRACKING = 31; int FILE_EDITING = 32; int JAVASCRIPT_OPTIMIZER = 33; 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 e348cc86b15f..4dfc618a63dc 100644 --- a/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch +++ b/patches/components-browser_ui-widget-android-java-res-values-dimens.xml.patch @@ -1,5 +1,5 @@ diff --git a/components/browser_ui/widget/android/java/res/values/dimens.xml b/components/browser_ui/widget/android/java/res/values/dimens.xml -index 60925014636144e398bc4cfa2a0d3ee5be1e25b9..6b6061b6c9432d38899317b18603a7c088ccf5a6 100644 +index f2311c163e3fe8eef1b8825184fbbd250fa4e25d..5a455245a4fc4027ca2374dfaa3a8dd2a9ca72a2 100644 --- a/components/browser_ui/widget/android/java/res/values/dimens.xml +++ b/components/browser_ui/widget/android/java/res/values/dimens.xml @@ -74,7 +74,7 @@ found in the LICENSE file. diff --git a/patches/components-browsing_data-content-browsing_data_helper.cc.patch b/patches/components-browsing_data-content-browsing_data_helper.cc.patch index 961bdf4b3c4c..9bb099c3ae8b 100644 --- a/patches/components-browsing_data-content-browsing_data_helper.cc.patch +++ b/patches/components-browsing_data-content-browsing_data_helper.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/browsing_data/content/browsing_data_helper.cc b/components/browsing_data/content/browsing_data_helper.cc -index 85b715a741276fd21c67fd27ec59e764bfe51875..19ef2fbf1a1139c917372f232c5b8d975d25fe70 100644 +index 3ebbaf5de1b328a248ea1c03a6553bf81997d956..a36322f0493dcf4bc74cb6674e5f25a0d1d89802 100644 --- a/components/browsing_data/content/browsing_data_helper.cc +++ b/components/browsing_data/content/browsing_data_helper.cc @@ -38,7 +38,7 @@ bool WebsiteSettingsFilterAdapter( 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 b272bb43dfd6..b1629c7b4b55 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 6ce65953a3b1caa2f6db5734f302fa4d5dd95ac0..6f2a677abd1e733cda4907b5cee68b8dae98bd23 100644 +index 61b878909e3b8d1f2f4bcaad08e2d47a5151be14..b8f78ea0f6e27aeb89b852fb7bd520bd8e794027 100644 --- a/components/content_settings/browser/page_specific_content_settings.cc +++ b/components/content_settings/browser/page_specific_content_settings.cc -@@ -858,6 +858,7 @@ bool PageSpecificContentSettings::IsContentBlocked( +@@ -860,6 +860,7 @@ bool PageSpecificContentSettings::IsContentBlocked( content_type == ContentSettingsType::ADS || content_type == ContentSettingsType::SOUND || content_type == ContentSettingsType::CLIPBOARD_READ_WRITE || @@ -10,7 +10,7 @@ index 6ce65953a3b1caa2f6db5734f302fa4d5dd95ac0..6f2a677abd1e733cda4907b5cee68b8d content_type == ContentSettingsType::SENSORS || content_type == ContentSettingsType::GEOLOCATION || content_type == ContentSettingsType::NOTIFICATIONS) { -@@ -884,6 +885,7 @@ bool PageSpecificContentSettings::IsContentAllowed( +@@ -886,6 +887,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-BUILD.gn.patch b/patches/components-content_settings-core-browser-BUILD.gn.patch index 20cdb5ae7651..bd0eb426a9a7 100644 --- a/patches/components-content_settings-core-browser-BUILD.gn.patch +++ b/patches/components-content_settings-core-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/BUILD.gn b/components/content_settings/core/browser/BUILD.gn -index 6c6fdcc82a7838853f355c5c207f9658c55a59e1..8221914d7d22cedb8ce7be6b9f895485be60679e 100644 +index 9fe0928e5574c9c9bfef24ba368b08aa08d018e4..deffc2b2607809f2af8ccb63c100941c3e3cdd6d 100644 --- a/components/content_settings/core/browser/BUILD.gn +++ b/components/content_settings/core/browser/BUILD.gn -@@ -84,6 +84,7 @@ static_library("browser") { +@@ -86,6 +86,7 @@ static_library("browser") { } configs += [ "//build/config/compiler:wexit_time_destructors" ] 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 f5f2c704a86f..26bc6172d2af 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 8cc77db04a02710664bec06107ef21c5bb230d6c..d51e33b2763de5b91d1f7b114ad8088c5c03a770 100644 +index 52fb93a67d41dcf4ff409c224595b0cd532de52f..e2713386c85c5506475189977fe5c892c8216cbd 100644 --- a/components/content_settings/core/browser/content_settings_default_provider.cc +++ b/components/content_settings/core/browser/content_settings_default_provider.cc -@@ -399,6 +399,7 @@ void DefaultProvider::DiscardOrMigrateObsoletePreferences() { +@@ -373,6 +373,7 @@ void DefaultProvider::DiscardOrMigrateObsoletePreferences() { prefs_->SetBoolean(kBug364820109AlreadyWorkedAroundPref, true); } #endif // !BUILDFLAG(IS_IOS) 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 25edf0c0387e..30fe5a0763ef 100644 --- a/patches/components-content_settings-core-browser-content_settings_registry.cc.patch +++ b/patches/components-content_settings-core-browser-content_settings_registry.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/content_settings/core/browser/content_settings_registry.cc b/components/content_settings/core/browser/content_settings_registry.cc -index b1e3ab1d5562a4c67082025ea81c9aa06019091a..b1ad4c5e2450b92ef9db743870fe3e55f713d927 100644 +index abc8bc5353fe6669e4a9a6c0d0b564be9d590beb..93c5c9cecbd487a6a1c9e0a3a47f8d281f61fb91 100644 --- a/components/content_settings/core/browser/content_settings_registry.cc +++ b/components/content_settings/core/browser/content_settings_registry.cc -@@ -858,6 +858,7 @@ void ContentSettingsRegistry::Init() { +@@ -859,6 +859,7 @@ void ContentSettingsRegistry::Init() { WebsiteSettingsRegistry::DESKTOP, ContentSettingsInfo::INHERIT_IN_INCOGNITO, ContentSettingsInfo::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 cf5fce2145ef..19558a013f0b 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,8 +1,8 @@ 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 87519a1fbffb5908212608db400e58e9b13656f3..9903672972089d0bcb884dc974ec8df1e4ff1770 100644 +index 7459ff55241d5ed6e46cd31dd272ab2b3f075af3..419f3aaddd21c9d449e8bccfcc0c0450ad03685c 100644 --- a/components/content_settings/core/browser/content_settings_uma_util.cc +++ b/components/content_settings/core/browser/content_settings_uma_util.cc -@@ -156,6 +156,7 @@ constexpr auto kHistogramValue = base::MakeFixedFlatMap(choice)) { CHECK(is_third_party_request, base::NotFatalUntil::M128); CHECK(block_third_party_cookies, base::NotFatalUntil::M128); 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 eb553da7c335..7140ec67c725 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 0ac68fe538ee0d1e674b89f609cd72eddb1aceff..26782a87ba074093596024d5e39c99da1af9c173 100644 +index 6ce571214bce09c322849a70f7a1aa73bc6f5ee6..1601a7bde6ec3f8ef3fe63d3a43282bc99e4dd67 100644 --- a/components/content_settings/core/common/cookie_settings_base.h +++ b/components/content_settings/core/common/cookie_settings_base.h @@ -77,7 +77,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 1a3feb077120..a9f44bab1a41 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 048926736488257197c212f1f8124babec82325a..fd0916350187d1a77d43dd55f72d3dba68451656 100644 +index 906a126260b98c085d95617ff50ba544c22630ee..e59a8acbc395c4e564c78d139066afda398c55f4 100644 --- a/components/download/internal/common/download_item_impl.cc +++ b/components/download/internal/common/download_item_impl.cc -@@ -1965,8 +1965,8 @@ void DownloadItemImpl::OnDownloadCompleting() { +@@ -1966,8 +1966,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 1427d438fa40..d33917a34314 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 1856966f2b9130fab8ca74f4aec1076a7004ed47..d7a5a722258528d1004df3f81dd1a94c5dc8f250 100644 +index 64f9e50f60186a06d1b0998f1f2d5b83ca864cdf..c1f09e4c3cf7f8c67b4b6252e67b0214d0aff5c0 100644 --- a/components/embedder_support/user_agent_utils.cc +++ b/components/embedder_support/user_agent_utils.cc -@@ -191,10 +191,11 @@ const blink::UserAgentBrandList GetUserAgentBrandList( +@@ -188,10 +188,11 @@ const blink::UserAgentBrandList GetUserAgentBrandList( #if !BUILDFLAG(CHROMIUM_BRANDING) brand = version_info::GetProductName(); #endif diff --git a/patches/components-infobars-core-infobar_delegate.h.patch b/patches/components-infobars-core-infobar_delegate.h.patch index 95b5a4c50794..276c3ea74427 100644 --- a/patches/components-infobars-core-infobar_delegate.h.patch +++ b/patches/components-infobars-core-infobar_delegate.h.patch @@ -1,5 +1,5 @@ diff --git a/components/infobars/core/infobar_delegate.h b/components/infobars/core/infobar_delegate.h -index b7c5c6d41b09f1eb3da9daebad514df4a949124a..c2bb82c0269f072fbe1c776a306246e6e6691811 100644 +index 7a44429a3fa3e8849eaa4290f9fd9bacb6c6f98a..18025f21ab217230f2e72092dad7319960c079a6 100644 --- a/components/infobars/core/infobar_delegate.h +++ b/components/infobars/core/infobar_delegate.h @@ -187,6 +187,7 @@ class InfoBarDelegate { diff --git a/patches/components-metrics-BUILD.gn.patch b/patches/components-metrics-BUILD.gn.patch index 77854fb41d9d..401ff466d067 100644 --- a/patches/components-metrics-BUILD.gn.patch +++ b/patches/components-metrics-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn -index 1498acc1ba9176fdcd8b9ad7b8b5a08dd303381a..40c31b6e6bbde6bebcb6432c4c54c9185f1824d8 100644 +index c298ee63cb2f10aeaa52c829b0aadc048773d7e4..b77d108516cb16a7a65ff56cb7c4da540292476e 100644 --- a/components/metrics/BUILD.gn +++ b/components/metrics/BUILD.gn @@ -341,6 +341,7 @@ if (!is_cronet_build || is_ios) { diff --git a/patches/components-omnibox-browser-BUILD.gn.patch b/patches/components-omnibox-browser-BUILD.gn.patch index 2be94333b875..e8ffee19da67 100644 --- a/patches/components-omnibox-browser-BUILD.gn.patch +++ b/patches/components-omnibox-browser-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn -index 64313114f89cf9250e9c235241267b96c1c5a7cb..ee5b7ee24d0a5c4f12f04a02f9f2bd0fefdb96fd 100644 +index 6a02e84a4c418a43c725d1003b304310c2cbff92..b0c043d730c2d30630e922c63f6e72d8d55e102e 100644 --- a/components/omnibox/browser/BUILD.gn +++ b/components/omnibox/browser/BUILD.gn -@@ -384,6 +384,7 @@ static_library("browser") { +@@ -385,6 +385,7 @@ static_library("browser") { "//ui/base", "//ui/gfx", ] @@ -10,7 +10,7 @@ index 64313114f89cf9250e9c235241267b96c1c5a7cb..ee5b7ee24d0a5c4f12f04a02f9f2bd0f configs += [ "//build/config/compiler:wexit_time_destructors" ] -@@ -986,6 +987,7 @@ fuzzer_test("search_suggestion_parser_fuzzer") { +@@ -995,6 +996,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 4fc447a2da68..404815b37c9d 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 92d628514d3c454dcdb6163c9e314239b2f5b449..de9c896e0a1b5c047819c322d102049182879c92 100644 +index 9f6fcbc10802bd28de72d68edd1fd7c6bc67fc10..c5c8b611c117e07fbe84f4f8b580545258bc71d8 100644 --- a/components/omnibox/browser/autocomplete_controller.cc +++ b/components/omnibox/browser/autocomplete_controller.cc -@@ -1184,6 +1184,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) { +@@ -1193,6 +1193,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) { if (provider_types & AutocompleteProvider::TYPE_SEARCH) { search_provider_ = new SearchProvider(provider_client_.get(), this); providers_.push_back(search_provider_.get()); @@ -10,7 +10,7 @@ index 92d628514d3c454dcdb6163c9e314239b2f5b449..de9c896e0a1b5c047819c322d1020491 } // Providers run in the order they're added. Add `HistoryURLProvider` after // `SearchProvider` because: -@@ -1402,6 +1403,7 @@ void AutocompleteController::UpdateResult(UpdateType update_type, +@@ -1411,6 +1412,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 532ea510a990..9e991a3b2467 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 bbcfb856b65da55833ff324b8f8c369d27c86827..2edc4427b8d99947e2e3dd8643456b598bfce585 100644 +index 83f9ad0c6c406061abefcd34cb334a844765496f..4850270a0b7aec4662abe2d15982d31a3e78af92 100644 --- a/components/omnibox/browser/autocomplete_match.h +++ b/components/omnibox/browser/autocomplete_match.h -@@ -713,7 +713,7 @@ struct AutocompleteMatch { +@@ -722,7 +722,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-omnibox-browser-omnibox_edit_model.cc.patch b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch index e881952cbe33..a7cec0370c19 100644 --- a/patches/components-omnibox-browser-omnibox_edit_model.cc.patch +++ b/patches/components-omnibox-browser-omnibox_edit_model.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/omnibox/browser/omnibox_edit_model.cc b/components/omnibox/browser/omnibox_edit_model.cc -index af3809afb263faf9ee303c653db3bd6b5093cf9c..b45af20d0065103114c7ad82aca4a6786ec8e44e 100644 +index 9a66224caabdbdce3592e976c79b3b35784dcc86..45d0d62d94b9ecc9148c457baa054e2e6ecee46e 100644 --- a/components/omnibox/browser/omnibox_edit_model.cc +++ b/components/omnibox/browser/omnibox_edit_model.cc -@@ -505,6 +505,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, +@@ -507,6 +507,7 @@ void OmniboxEditModel::AdjustTextForCopy(int sel_min, (*text == display_text_ || *text == url_for_editing_)) { *url_from_text = controller_->client()->GetNavigationEntryURL(); *write_url = true; diff --git a/patches/components-page_info-page_info.cc.patch b/patches/components-page_info-page_info.cc.patch index eabff7b480ad..72189a28e8d7 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 f72c437850adeba75825fc3cdeeb42f95a55852a..814dca90f91688947e7cf3e0a230ef0f134c8ec0 100644 +index 38592a4db87cd8cb63a8f410c6ebc10a4ea76693..148a92699223bb4e1824cd87662aed24b831ac60 100644 --- a/components/page_info/page_info.cc +++ b/components/page_info/page_info.cc -@@ -1265,6 +1265,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, +@@ -1256,6 +1256,7 @@ void PageInfo::PopulatePermissionInfo(PermissionInfo& permission_info, // applies to permissions listed in |kPermissionType|. bool PageInfo::ShouldShowPermission( const PageInfo::PermissionInfo& info) const { diff --git a/patches/components-permissions-BUILD.gn.patch b/patches/components-permissions-BUILD.gn.patch index 19395884844b..36cd9d732d14 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 6c74df772cf5b63cee7db1d3e331e4f38311e003..80a45ff2fb7f38be9d73485d09a43c14c78ea9f2 100644 +index 61bc7d1c031f93faa4f66940d7f82c6a2fc564a8..8ad031c4c5c2533d52ec65864958058ec324a14c 100644 --- a/components/permissions/BUILD.gn +++ b/components/permissions/BUILD.gn @@ -6,7 +6,7 @@ import("//components/guest_view/buildflags/buildflags.gni") diff --git a/patches/components-permissions-android-BUILD.gn.patch b/patches/components-permissions-android-BUILD.gn.patch index ae3341525292..28dcae40c029 100644 --- a/patches/components-permissions-android-BUILD.gn.patch +++ b/patches/components-permissions-android-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/components/permissions/android/BUILD.gn b/components/permissions/android/BUILD.gn -index dfbc28f7dca5e34b2527922b542f94d9c81f0800..2e936e5c96501a2b04610d0011c72cfb4cd53660 100644 +index 32cedcb748dab99d0a5a1c8cb6b504ddb7716eb6..d1c713c6db250c7d15d407ae99456fb901e5de49 100644 --- a/components/permissions/android/BUILD.gn +++ b/components/permissions/android/BUILD.gn -@@ -163,6 +163,7 @@ android_library("java") { +@@ -167,6 +167,7 @@ android_library("java") { "//third_party/jni_zero:jni_zero_java", "//ui/android:ui_java", ] diff --git a/patches/components-permissions-permission_request_manager.cc.patch b/patches/components-permissions-permission_request_manager.cc.patch index dce1cdb1953e..b83b89339e06 100644 --- a/patches/components-permissions-permission_request_manager.cc.patch +++ b/patches/components-permissions-permission_request_manager.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/permission_request_manager.cc b/components/permissions/permission_request_manager.cc -index 37aa2d24e7426d7b67c252c173ba5ad133091d15..aa23f3d4b8749d05857209205fe3e72e81190a11 100644 +index e94fd890c954597251a0aee934822e46bfc58222..1cf55a69ff11e733962ed968002975194a4b593c 100644 --- a/components/permissions/permission_request_manager.cc +++ b/components/permissions/permission_request_manager.cc @@ -581,6 +581,7 @@ GURL PermissionRequestManager::GetRequestingOrigin() const { diff --git a/patches/components-permissions-permission_uma_util.cc.patch b/patches/components-permissions-permission_uma_util.cc.patch index 45e462624dbf..ff5b657eb4fa 100644 --- a/patches/components-permissions-permission_uma_util.cc.patch +++ b/patches/components-permissions-permission_uma_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/permission_uma_util.cc b/components/permissions/permission_uma_util.cc -index 5a428e737ff8e8280eeb57f16f943e6311e72011..8294726394b69891dcda6d98b68ea8ae0f9808ee 100644 +index cbe7653907ca3af15fce5d28027f8dd8b232ad49..f3f5b772dd424dab7dbe0e4e8761e469c2c0b211 100644 --- a/components/permissions/permission_uma_util.cc +++ b/components/permissions/permission_uma_util.cc @@ -151,6 +151,7 @@ RequestTypeForUma GetUmaValueForRequestType(RequestType request_type) { diff --git a/patches/components-permissions-permission_util.cc.patch b/patches/components-permissions-permission_util.cc.patch index 5c1e2690c704..2c2c76315934 100644 --- a/patches/components-permissions-permission_util.cc.patch +++ b/patches/components-permissions-permission_util.cc.patch @@ -1,5 +1,5 @@ diff --git a/components/permissions/permission_util.cc b/components/permissions/permission_util.cc -index ce926b9da23df5dc9b36a447755c9251dac0c95b..acbf74733270a0bfee920c00f8a367a2b4a3d801 100644 +index 20056b1464699cc7d45717bfc710366eb48d85f6..a19123b4d3abedfe6bc5107b2fe046f22c5a2587 100644 --- a/components/permissions/permission_util.cc +++ b/components/permissions/permission_util.cc @@ -386,6 +386,7 @@ ContentSettingsType PermissionUtil::PermissionTypeToContentSettingsTypeSafe( diff --git a/patches/components-permissions-request_type.cc.patch b/patches/components-permissions-request_type.cc.patch index f9d32595cd0a..f11cb5802ad1 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 00db9b31085208523b92fdac06d29943425f2ccf..57ee48f08a78c5e3c3f31b851ecb1b39ccdade13 100644 +index d15ee901a112cd8949c156c7c1a412fd56e30025..33e7d68d95f6ea225a9066e44d4cd1c9fcf5f88d 100644 --- a/components/permissions/request_type.cc +++ b/components/permissions/request_type.cc -@@ -462,6 +462,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { +@@ -461,6 +461,7 @@ const char* PermissionKeyForRequestType(permissions::RequestType request_type) { #endif case permissions::RequestType::kIdentityProvider: return "identity_provider"; diff --git a/patches/components-policy-resources-webui-policy_base.ts.patch b/patches/components-policy-resources-webui-policy_base.ts.patch index cc8bd11e2642..8437ba52872b 100644 --- a/patches/components-policy-resources-webui-policy_base.ts.patch +++ b/patches/components-policy-resources-webui-policy_base.ts.patch @@ -1,8 +1,8 @@ diff --git a/components/policy/resources/webui/policy_base.ts b/components/policy/resources/webui/policy_base.ts -index 45f2d2df48d06f1f35b21f14809fe84c8b26d3e9..7ae5168d117ef0d708965755574a81f2bf929aca 100644 +index 973695e7d0611dcf512648bccfaddb558b340c8f..ee72d03855d4169431e16602bbcb6f010cfe26ed 100644 --- a/components/policy/resources/webui/policy_base.ts +++ b/components/policy/resources/webui/policy_base.ts -@@ -214,7 +214,7 @@ export class Page { +@@ -211,7 +211,7 @@ export class Page { policyNames['precedence']?.policyNames, ].includes(knownPolicyNames) && knownPolicyNamesSet.has(name) ? diff --git a/patches/components-search_engines-default_search_manager.cc.patch b/patches/components-search_engines-default_search_manager.cc.patch index f59b55848c53..37ac9a60c972 100644 --- a/patches/components-search_engines-default_search_manager.cc.patch +++ b/patches/components-search_engines-default_search_manager.cc.patch @@ -1,8 +1,8 @@ diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc -index a7a4e431959541cea510677fe6300853e9600051..feaad2921eff6b41e0408b61cece2fcc234d13d6 100644 +index 599b5f1a1a9bf37bf946d4ea6bfe7018c5d6b544..7d1b1334ca5d2b1840140d52d73e1d9d5c476c7a 100644 --- a/components/search_engines/default_search_manager.cc +++ b/components/search_engines/default_search_manager.cc -@@ -318,6 +318,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { +@@ -321,6 +321,7 @@ void DefaultSearchManager::LoadDefaultSearchEngineFromPrefs() { // Check if default search preference is overridden by extension. if (pref->IsExtensionControlled()) { extension_default_search_ = std::move(turl_data); diff --git a/patches/components-sync-engine-data_type_worker.h.patch b/patches/components-sync-engine-data_type_worker.h.patch index 8eb67d9a609f..2fdbbca4ee24 100644 --- a/patches/components-sync-engine-data_type_worker.h.patch +++ b/patches/components-sync-engine-data_type_worker.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/engine/data_type_worker.h b/components/sync/engine/data_type_worker.h -index d4ecb89ea48c671a093a1b4e0739c0f4802db20a..19a37a2e9de719382fc28fab22bf195c6655e475 100644 +index 52d754cf99f8b1e672f669345805064e3a40cceb..cc94ba717c94e64dfd3f1500eebe287b44833c60 100644 --- a/components/sync/engine/data_type_worker.h +++ b/components/sync/engine/data_type_worker.h -@@ -215,6 +215,7 @@ class DataTypeWorker : public UpdateHandler, +@@ -216,6 +216,7 @@ class DataTypeWorker : public UpdateHandler, static constexpr size_t kMaxPendingInvalidations = 10u; diff --git a/patches/components-sync-protocol-proto_visitors.h.patch b/patches/components-sync-protocol-proto_visitors.h.patch index ce15dced8c05..a213ab5d6851 100644 --- a/patches/components-sync-protocol-proto_visitors.h.patch +++ b/patches/components-sync-protocol-proto_visitors.h.patch @@ -1,8 +1,8 @@ diff --git a/components/sync/protocol/proto_visitors.h b/components/sync/protocol/proto_visitors.h -index b814ab24bc9b969a3639562e145368d51d942531..b27ab8cfb7b104936638fbc89d1334cc1f85333f 100644 +index d41ac59cd2f08a9abe6f341f3a3432b45f7408db..b1b0eee0d78b1fb5c65aa498d69403ad5d14e4ea 100644 --- a/components/sync/protocol/proto_visitors.h +++ b/components/sync/protocol/proto_visitors.h -@@ -621,6 +621,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { +@@ -632,6 +632,7 @@ VISIT_PROTO_FIELDS(const sync_pb::DeviceInfoSpecifics& proto) { VISIT(manufacturer); VISIT(last_updated_timestamp); VISIT(feature_fields); @@ -10,7 +10,7 @@ index b814ab24bc9b969a3639562e145368d51d942531..b27ab8cfb7b104936638fbc89d1334cc VISIT(sharing_fields); VISIT(invalidation_fields); VISIT(paask_fields); -@@ -643,6 +644,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { +@@ -654,6 +655,7 @@ VISIT_PROTO_FIELDS(const sync_pb::FeatureSpecificFields& proto) { VISIT(floating_workspace_last_signin_time_windows_epoch_micros); } diff --git a/patches/components-sync-protocol-protocol_sources.gni.patch b/patches/components-sync-protocol-protocol_sources.gni.patch index c9a387cd2aad..58affc12ce10 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 4915eb96eadf3cc4b83c56ba2ffc3f9633aabae9..aeb1815e1244f249ecfd3bf53d69bbfd67e2f5e8 100644 +index 518dbad5397a812779ca1bd84a2dc2c75125f407..aecc5427a49025531e9f294f2fe0eb084ff2ae54 100644 --- a/components/sync/protocol/protocol_sources.gni +++ b/components/sync/protocol/protocol_sources.gni -@@ -82,3 +82,4 @@ sync_protocol_sources = [ +@@ -83,3 +83,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 ba17b5915109..c972f2b21f60 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 ac93f64122d0b84220712d1b5ea2f443844c512d..cd8b7d90f347f6b61dde5a1dc025d5e2cdd86d45 100644 +index 63bd858d6a65ffcfb3ea7fb236b763aa787d936f..0602c5532c03072be43ae752ee606ffcb3eb73a7 100644 --- a/components/sync/service/BUILD.gn +++ b/components/sync/service/BUILD.gn -@@ -130,4 +130,5 @@ static_library("service") { +@@ -131,4 +131,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 ee2d2b27b354..d95b42e9a2a5 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 d64de7c4e5a3bb1603b4ae63e4a302fd9b59fbdc..0b0d1da775d1245ae80e97b47bf755fdd23340d6 100644 +index fe95c08af8413e277a42c5db5735b4dbf3f500a0..c50e47877a8c9210bec0e8b12d36f1535981606e 100644 --- a/components/sync/service/sync_service_impl.h +++ b/components/sync/service/sync_service_impl.h -@@ -266,6 +266,7 @@ class SyncServiceImpl : public SyncService, +@@ -272,6 +272,7 @@ class SyncServiceImpl : public SyncService, size_t GetQueuedLocalDataMigrationItemCountForTest() const; private: 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 9aa54e72546b..13aec5053685 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,5 +1,5 @@ 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 ccfac3b103824eaa59dbe1e02dcec6c8dbf3f555..f32bfff7f44077847499f8eebe898cd70dfb49b9 100644 +index d09df298697b909e09d057f439d3654110dce4ed..a5f685d159041d072af041d2fd80e5c8e2b4085d 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 @@ -2053,6 +2053,7 @@ void ExtractUnderlines(NSAttributedString* string, diff --git a/patches/content-browser-BUILD.gn.patch b/patches/content-browser-BUILD.gn.patch index af58e8efd0b4..7314e45af163 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 fcb315726a70b150bf2238eef717dafcc8d8efd0..e592df7532ed7cf29e6d17fae6353b9a46b1f723 100644 +index eafad94a1b7d0d3b41a324618b603e7aee7f551e..51adebc34849ad2fef66bb02a812b122718c7808 100644 --- a/content/browser/BUILD.gn +++ b/content/browser/BUILD.gn -@@ -3616,6 +3616,7 @@ source_set("browser") { +@@ -3645,6 +3645,7 @@ source_set("browser") { "profiling_utils.cc", ] } diff --git a/patches/content-browser-gpu-gpu_internals_ui.cc.patch b/patches/content-browser-gpu-gpu_internals_ui.cc.patch index 669b10044b7a..60f7d17679e7 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 a598b669c611c144599fd06022f06b548bcbd4b7..11d626138844a712a5b83ed1c626814f2b773cb5 100644 +index 10e6601d8f8c3d169067b6e5914cfa1f0297efb0..761b06460751d9b79a28a4f316ba3c11fc3390b2 100644 --- a/content/browser/gpu/gpu_internals_ui.cc +++ b/content/browser/gpu/gpu_internals_ui.cc -@@ -815,6 +815,7 @@ base::Value::Dict GpuMessageHandler::GetClientInfo() { +@@ -819,6 +819,7 @@ base::Value::Dict 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-navigation_controller_impl.cc.patch b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch index 030fa1d15616..c1c788c3ee8c 100644 --- a/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch +++ b/patches/content-browser-renderer_host-navigation_controller_impl.cc.patch @@ -1,5 +1,5 @@ diff --git a/content/browser/renderer_host/navigation_controller_impl.cc b/content/browser/renderer_host/navigation_controller_impl.cc -index 597384a52c009804ac2eb7df9896d03a19890562..aa28db6f8d200d2837178807dc322ad3d6f4e093 100644 +index 715a22a7b3c77e3e73793a66df7b244b940baaa8..216e45c44410ef57479e74e65f1448e88dd420ef 100644 --- a/content/browser/renderer_host/navigation_controller_impl.cc +++ b/content/browser/renderer_host/navigation_controller_impl.cc @@ -3690,16 +3690,17 @@ base::WeakPtr NavigationControllerImpl::NavigateWithoutEntry( diff --git a/patches/content-browser-renderer_host-navigation_request.cc.patch b/patches/content-browser-renderer_host-navigation_request.cc.patch index 9bb35a7b818f..d1fa162b9ec9 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 e51bcccd6f63f01bc736721b1a7057d3380327e4..7bc0d4d920adf93b0ea811a0a2e992ae3165912c 100644 +index f790e2c9ebe6aefcd3186c95e4ce8f2193540052..a7ae901de6644f3574befc2b5c44de60fbf93cf2 100644 --- a/content/browser/renderer_host/navigation_request.cc +++ b/content/browser/renderer_host/navigation_request.cc -@@ -3516,6 +3516,7 @@ void NavigationRequest::OnRequestRedirected( +@@ -3535,6 +3535,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 e51bcccd6f63f01bc736721b1a7057d3380327e4..7bc0d4d920adf93b0ea811a0a2e992ae common_params_->referrer = Referrer::SanitizeForRequest( common_params_->url, *common_params_->referrer); -@@ -5303,6 +5304,7 @@ void NavigationRequest::OnStartChecksComplete( +@@ -5324,6 +5325,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 f772e5343557..212cdaf781df 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 622142dcf64df8bf50a6ae5448fdf97c097e49c6..9d2df8cac2856da73dec81b9a94f32b57d795f2e 100644 +index 3db42c2bf2740639a32d4097bf2577021bcebaf7..24cba9033c17f243a6b05bfbda687429b46a9919 100644 --- a/content/browser/renderer_host/render_frame_host_impl.cc +++ b/content/browser/renderer_host/render_frame_host_impl.cc -@@ -5097,6 +5097,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( +@@ -5101,6 +5101,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( candidate_site_for_cookies = net::SiteForCookies(top_frame_site); } @@ -10,7 +10,7 @@ index 622142dcf64df8bf50a6ae5448fdf97c097e49c6..9d2df8cac2856da73dec81b9a94f32b5 std::optional nonce = ComputeNonce(is_credentialless, fenced_frame_nonce_for_navigation); return net::IsolationInfo::Create(request_type, top_frame_origin, -@@ -5107,6 +5108,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( +@@ -5111,6 +5112,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal( std::optional RenderFrameHostImpl::ComputeNonce( bool is_credentialless, std::optional fenced_frame_nonce_for_navigation) { @@ -18,7 +18,7 @@ index 622142dcf64df8bf50a6ae5448fdf97c097e49c6..9d2df8cac2856da73dec81b9a94f32b5 // 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. -@@ -5166,6 +5168,7 @@ bool RenderFrameHostImpl::IsThirdPartyStoragePartitioningEnabled( +@@ -5170,6 +5172,7 @@ bool RenderFrameHostImpl::IsThirdPartyStoragePartitioningEnabled( // current value of net::features::ThirdPartyStoragePartitioning. if (rfs_document_data_for_storage_key->runtime_feature_state_read_context() .IsDisableThirdPartyStoragePartitioning3Enabled()) { @@ -26,7 +26,7 @@ index 622142dcf64df8bf50a6ae5448fdf97c097e49c6..9d2df8cac2856da73dec81b9a94f32b5 return false; } // Compile the list of third-party origins we need to check in addition to -@@ -5183,6 +5186,7 @@ bool RenderFrameHostImpl::IsThirdPartyStoragePartitioningEnabled( +@@ -5187,6 +5190,7 @@ bool RenderFrameHostImpl::IsThirdPartyStoragePartitioningEnabled( if (rfs_document_data_for_storage_key->runtime_feature_state_read_context() .IsDisableThirdPartyStoragePartitioning3EnabledForThirdParty( third_party_origins)) { @@ -34,7 +34,7 @@ index 622142dcf64df8bf50a6ae5448fdf97c097e49c6..9d2df8cac2856da73dec81b9a94f32b5 return false; } } -@@ -9654,6 +9658,7 @@ void RenderFrameHostImpl::CreateNewWindow( +@@ -9666,6 +9670,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 3633e9dd3445..7e6769a2fbbc 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 a7d1c70d55d4ea473811c119290211ef9decd0db..a9157986a655bcf4a2c07b8237c32baf9b94a093 100644 +index 130a9ba8e828ba5f198f0a036f064d86eca808f0..34a6faa7e44f84d842d825b0ac69bd033a3090ea 100644 --- a/content/browser/resources/gpu/info_view.ts +++ b/content/browser/resources/gpu/info_view.ts @@ -527,6 +527,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 7a4bb2b1938c..7893194f4bd8 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 94917dc412682c04086cb6d2971209e660f406dc..95f38660afe427904eee34a8f2c17445c5f66b2a 100644 +index b45b3210c956414878df2fa427a513aadd72fdbe..3c3adf8ab3a4e79f953b78988c1676afd237ff4b 100644 --- a/content/browser/web_contents/web_contents_impl.cc +++ b/content/browser/web_contents/web_contents_impl.cc -@@ -5014,7 +5014,7 @@ FrameTree* WebContentsImpl::CreateNewWindow( +@@ -5043,7 +5043,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-common-BUILD.gn.patch b/patches/content-common-BUILD.gn.patch index 51022ed463ae..c15fc6da77d5 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 804e0934004a465b610fb9b83692adea15808d87..f880d9cd26ccbb7d121d113f54864a9d4cc566fc 100644 +index 9de0d44a70c4c2587a7e4283783b614174393819..7a6edfb42a141c25a1b627e669756cc60cc4f8b5 100644 --- a/content/common/BUILD.gn +++ b/content/common/BUILD.gn @@ -68,6 +68,7 @@ source_set("common") { diff --git a/patches/content-common-user_agent.cc.patch b/patches/content-common-user_agent.cc.patch index 4e8b61bbf701..3e6a8c540f0e 100644 --- a/patches/content-common-user_agent.cc.patch +++ b/patches/content-common-user_agent.cc.patch @@ -1,8 +1,8 @@ diff --git a/content/common/user_agent.cc b/content/common/user_agent.cc -index 761d0650f514b71c7a0de32254ac39dc711253e1..9d0433ca4bbadab20ca6a56fc1621f6bc8e07315 100644 +index d930058bb06af7ade5dce8110b7c46bee19f4677..8f9a7cfd2b3e5b2d426151fd68f0836f6943a85a 100644 --- a/content/common/user_agent.cc +++ b/content/common/user_agent.cc -@@ -390,6 +390,7 @@ std::string GetAndroidOSInfo( +@@ -392,6 +392,7 @@ std::string GetAndroidOSInfo( // Send information about the device. bool semicolon_inserted = false; diff --git a/patches/content-public-browser-BUILD.gn.patch b/patches/content-public-browser-BUILD.gn.patch index 900ea21f9426..931b38fc5b9b 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 f6e7f72966f7bb744da4b2df999020250b5c0dc3..695786bb4575ccf52001f0edfd1e80a5282cf893 100644 +index 90d7cedfddccb9c4e106ccceed8d917746e97c75..20b6294acfa5591515344f9667bedafc69520bef 100644 --- a/content/public/browser/BUILD.gn +++ b/content/public/browser/BUILD.gn -@@ -752,6 +752,7 @@ source_set("browser_sources") { +@@ -750,6 +750,7 @@ source_set("browser_sources") { if (enable_video_effects) { public_deps += [ "//services/video_effects/public/mojom:mojom" ] } diff --git a/patches/content-renderer-render_frame_impl.cc.patch b/patches/content-renderer-render_frame_impl.cc.patch index 4d350322fd06..32445e228024 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 5d9ad1b7d5dfce78ce411a7670d4b20f35747b88..e534fa2f6d98ca0b4bc461667b9fab15072338a2 100644 +index f4f4ba811c0a4b682716d0d75da4a7ef8900f6d3..2ae1075611d66e36a7e23fd538f09d8a50cc749c 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc -@@ -4831,6 +4831,7 @@ bool RenderFrameImpl::ShouldUseUserAgentOverride() const { +@@ -4837,6 +4837,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 ada8630b3f7d..277a9db5f77c 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 beb2d175d23f0321dda223e55eced1202fe210e6..8f2aa259b44ef151550978cbb568bac3b6a67e1d 100644 +index eda1a7a3f65b812026d6d30b919b94f572879e4b..c8f4bda254b100f1597a72b61ce16de570e9455d 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc -@@ -930,6 +930,7 @@ void RenderThreadImpl::InitializeRenderer( +@@ -931,6 +931,7 @@ void RenderThreadImpl::InitializeRenderer( } void RenderThreadImpl::RegisterSchemes() { diff --git a/patches/crypto-unexportable_key_metrics.cc.patch b/patches/crypto-unexportable_key_metrics.cc.patch index a06274329be4..88649780126c 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 5144c7c9574dcc0b752551d0651977cd4ba50006..e9a87eef4128531e4b8a3437b8b925d51107f55b 100644 +index 842547fff6edb1641678f27720e785c926832777..7c9c860aa0dd7b4787c4722c0024809cd53f38ec 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 c53754087035..6301b093d7df 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 ed36da52a56c8e6999742b72c687d2cfc384099b..0b21d18d0c01b325966dbfc297ca48fa07f84d60 100644 +index a5e03a98534cf79c92c75e3fb0ea2db45c2b9276..15fde9e453aae6beb7480a2c20ecdb3be0f6c53c 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 -@@ -1321,6 +1321,7 @@ WebRequestEventRouter::OnAuthRequired(content::BrowserContext* browser_context, +@@ -1342,6 +1342,7 @@ WebRequestEventRouter::OnAuthRequired(content::BrowserContext* browser_context, *request)) { return AuthRequiredResponse::AUTH_REQUIRED_RESPONSE_NO_ACTION; } diff --git a/patches/extensions-browser-extension_creator.cc.patch b/patches/extensions-browser-extension_creator.cc.patch index 4877712ed7b0..701596300a96 100644 --- a/patches/extensions-browser-extension_creator.cc.patch +++ b/patches/extensions-browser-extension_creator.cc.patch @@ -1,8 +1,8 @@ diff --git a/extensions/browser/extension_creator.cc b/extensions/browser/extension_creator.cc -index d6664dd7fa06505ee1ee936dd99ccd0210d53637..af22b6306565a631d6672198dd591c0c9e0e6590 100644 +index 79b422e02e10cb61ba79b7bd03c5b035976baee1..0d0d845881e471ce7a5b48bfa6849a2e9f09b0aa 100644 --- a/extensions/browser/extension_creator.cc +++ b/extensions/browser/extension_creator.cc -@@ -211,7 +211,7 @@ bool ExtensionCreator::CreateCrx( +@@ -212,7 +212,7 @@ bool ExtensionCreator::CreateCrx( result = crx_file::CreateCrxWithVerifiedContentsInHeader( crx_path, zip_path, private_key, compressed_verified_contents.value()); } else { diff --git a/patches/ios-chrome-browser-flags-BUILD.gn.patch b/patches/ios-chrome-browser-flags-BUILD.gn.patch index 59a4a7e9fa29..9f4067273346 100644 --- a/patches/ios-chrome-browser-flags-BUILD.gn.patch +++ b/patches/ios-chrome-browser-flags-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ios/chrome/browser/flags/BUILD.gn b/ios/chrome/browser/flags/BUILD.gn -index 0b8752dd815620a4a80fc73bfadd84bbb2e1cb57..e7354b07537826dc5ab4aaa3fedc8cb3c2addb11 100644 +index fe4fce8065d119191813fb19d027d9e35518ae0f..80f0e9c43b49a0c4b1cb85326bb857affe978d75 100644 --- a/ios/chrome/browser/flags/BUILD.gn +++ b/ios/chrome/browser/flags/BUILD.gn @@ -115,6 +115,7 @@ source_set("flags") { diff --git a/patches/ios-chrome-browser-flags-about_flags.mm.patch b/patches/ios-chrome-browser-flags-about_flags.mm.patch index 62189e99d9d4..7762feadf564 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 603f55e72885aa25eecf6d5e3278cb268d4fb561..1228bdfd4fe267704a1fae6981133feb2e2214b1 100644 +index ffa7559b9a7619daa3436515cd89edf6bedada5d..d277d0472d3c3fadbe257baa1ab83dc94514a441 100644 --- a/ios/chrome/browser/flags/about_flags.mm +++ b/ios/chrome/browser/flags/about_flags.mm -@@ -1290,6 +1290,7 @@ const FeatureEntry::FeatureVariation kDeprecateFeedHeaderVariations[] = { +@@ -1376,6 +1376,7 @@ const FeatureEntry::FeatureVariation kBestFeaturesScreenInFirstRunVariations[] = // // When adding a new choice, add it to the end of the list. const flags_ui::FeatureEntry kFeatureEntries[] = { diff --git a/patches/ios-chrome-browser-shared-model-prefs-BUILD.gn.patch b/patches/ios-chrome-browser-shared-model-prefs-BUILD.gn.patch index 1b3cc50be4d3..589f99774417 100644 --- a/patches/ios-chrome-browser-shared-model-prefs-BUILD.gn.patch +++ b/patches/ios-chrome-browser-shared-model-prefs-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/ios/chrome/browser/shared/model/prefs/BUILD.gn b/ios/chrome/browser/shared/model/prefs/BUILD.gn -index 5b205fbb4f0ef85a2ebbfe5abc052fbfcc205cc6..36da5977ca1425bbfffabedfb827bbd2baaa46b5 100644 +index 14e322414f5a472843d9beea55df265346fc7e6e..17074635b2f6c7ace5793d63b96f56b80078f5ab 100644 --- a/ios/chrome/browser/shared/model/prefs/BUILD.gn +++ b/ios/chrome/browser/shared/model/prefs/BUILD.gn @@ -138,6 +138,7 @@ source_set("browser_prefs") { diff --git a/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch b/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch index ec81e4f5a6ea..7d347d3c4e66 100644 --- a/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch +++ b/patches/ios-chrome-browser-sync-model-sync_service_factory.mm.patch @@ -1,8 +1,8 @@ diff --git a/ios/chrome/browser/sync/model/sync_service_factory.mm b/ios/chrome/browser/sync/model/sync_service_factory.mm -index a568135cb8d867060841ef06d715c3daaa68e21e..8a5f6c31128f14fbaa6da80435da89f00b8491f5 100644 +index 41972b9cdc5dff48191a5ebad78cf5bf69e898d7..a5daa5d3adbb384dbafdd0928d43f602ad5b22f3 100644 --- a/ios/chrome/browser/sync/model/sync_service_factory.mm +++ b/ios/chrome/browser/sync/model/sync_service_factory.mm -@@ -198,7 +198,7 @@ std::unique_ptr BuildSyncService(web::BrowserState* context) { +@@ -199,7 +199,7 @@ std::unique_ptr BuildSyncService(web::BrowserState* context) { init_params.debug_identifier = profile->GetProfileName(); auto sync_service = diff --git a/patches/ios-web_view-BUILD.gn.patch b/patches/ios-web_view-BUILD.gn.patch index b38d7cdf3f91..38f93b405887 100644 --- a/patches/ios-web_view-BUILD.gn.patch +++ b/patches/ios-web_view-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/ios/web_view/BUILD.gn b/ios/web_view/BUILD.gn -index 87d7a08bd5ef7c081169d2f56b0dc0b8416580b7..38f2fd8b0a65a927c97eddd4a4a1ce142f3ee2cd 100644 +index 7e4fbe764e299aa2f0dd2098c6ef750e38c6baf0..09d79a816a79e98a520b4f1cd9d07bf6b4303173 100644 --- a/ios/web_view/BUILD.gn +++ b/ios/web_view/BUILD.gn -@@ -438,6 +438,7 @@ source_set("web_view_sources") { +@@ -445,6 +445,7 @@ source_set("web_view_sources") { "//components/version_info:channel", ] configs += [ ":config" ] diff --git a/patches/net-BUILD.gn.patch b/patches/net-BUILD.gn.patch index 84d468bf471b..12c43d4596d9 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 2a21dff5f55d7b2630acbdcfbeb7a806c3de5efb..11f188a3596ba5c6382731d66ff3145deaaaa70b 100644 +index c86b77ce4dd33c243dcd36155ed27106fe683d32..860e05e30c812d38e31f2530216c4a020a3e2ef7 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn -@@ -1185,6 +1185,7 @@ component("net") { +@@ -1186,6 +1186,7 @@ component("net") { "reporting/reporting_uploader.h", ] } diff --git a/patches/net-dns-host_resolver_manager_job.cc.patch b/patches/net-dns-host_resolver_manager_job.cc.patch index cc437cee7102..f90fd055473b 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 45f75a2215765f5a857c8e5df4fe3d361c2233cb..e07ced18f3a8833d0b187d83070b6ba71df0584c 100644 +index 927780d191468eabc1c66b64dea194784f56232c..212e66109611623c760ba5ee264aba9993f4ee7b 100644 --- a/net/dns/host_resolver_manager_job.cc +++ b/net/dns/host_resolver_manager_job.cc -@@ -1055,6 +1055,7 @@ void HostResolverManager::Job::CompleteRequests( +@@ -1067,6 +1067,7 @@ void HostResolverManager::Job::CompleteRequests( } RecordJobHistograms(results, task_type); 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 188571f0c808..f56e1a445417 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 d002522518b987ba6af90d970a56243f48b1fd3f..8a00396aac19b46c8cfd10963d1a36ebd4712733 100644 +index 82c6860602355b62bcdd2a8d6373685f3f51ca2b..ff61cc400296857a71072aa64d3a5ae006d24680 100644 --- a/net/proxy_resolution/configured_proxy_resolution_service.cc +++ b/net/proxy_resolution/configured_proxy_resolution_service.cc -@@ -985,6 +985,7 @@ int ConfiguredProxyResolutionService::ResolveProxy( +@@ -984,6 +984,7 @@ int ConfiguredProxyResolutionService::ResolveProxy( // Check if the request can be completed right away. (This is the case when // using a direct connection for example). int rv = TryToCompleteSynchronously(url, result); diff --git a/patches/sandbox-win-BUILD.gn.patch b/patches/sandbox-win-BUILD.gn.patch index c1b8e383af61..279a12396121 100644 --- a/patches/sandbox-win-BUILD.gn.patch +++ b/patches/sandbox-win-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/sandbox/win/BUILD.gn b/sandbox/win/BUILD.gn -index 8848277d114d984cf7c5457a7be0690671f7fff8..efd0050d1efd18ab2fffe9925ff6cfa2eb6bf7ca 100644 +index de68fc7024d6e2a634bda17546b502f4fb1af5d0..3b459471d4cfd37a1246abcad967a3fc41fa6e76 100644 --- a/sandbox/win/BUILD.gn +++ b/sandbox/win/BUILD.gn @@ -179,6 +179,7 @@ static_library("sandbox") { diff --git a/patches/services-network-cors-cors_url_loader.cc.patch b/patches/services-network-cors-cors_url_loader.cc.patch index 8b5afdd3550a..bc07590e0264 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 f29a82f6787752bc0f92394cbd09ce76acbce304..534af1d86cf7253c4610b59c5a02c708c2e90aaa 100644 +index 251133657cd3b06ed2116b1d76ee4f89334f4fac..6e2312d441bf393310fe2e0dbaf08d12eec6d6bd 100644 --- a/services/network/cors/cors_url_loader.cc +++ b/services/network/cors/cors_url_loader.cc -@@ -900,6 +900,7 @@ void CorsURLLoader::StartRequest() { +@@ -921,6 +921,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 2b7e39756e01..483b9ab6e12b 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 10166e803f180f607fecc09af0e234690e5d00d7..8396331a1c40d4b8ba5fbbf2621296ebebdcf973 100644 +index 0a575c10bbddbb354b0693bf220ae9a5c41a61db..ad187b7a8f274a6e6231d93c062a914f6d4281c6 100644 --- a/services/network/public/cpp/BUILD.gn +++ b/services/network/public/cpp/BUILD.gn -@@ -176,6 +176,7 @@ component("cpp") { +@@ -221,6 +221,7 @@ component("cpp") { "//services/proxy_resolver/public/mojom", ] diff --git a/patches/third_party-blink-common-client_hints-client_hints.cc.patch b/patches/third_party-blink-common-client_hints-client_hints.cc.patch index 74ce82bb81ae..2163a3e67217 100644 --- a/patches/third_party-blink-common-client_hints-client_hints.cc.patch +++ b/patches/third_party-blink-common-client_hints-client_hints.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/common/client_hints/client_hints.cc b/third_party/blink/common/client_hints/client_hints.cc -index d55147ee204bf2277b5aa0ff9464a32405b3efd9..e282c22dcb90af199f1031e612c55fe053c7146d 100644 +index ab8af78c7a48343250a25a7104b20d95181c1967..6bb2ec35dc5f51b0b784a8a1802f07a2fc227796 100644 --- a/third_party/blink/common/client_hints/client_hints.cc +++ b/third_party/blink/common/client_hints/client_hints.cc @@ -21,6 +21,7 @@ diff --git a/patches/third_party-blink-public-mojom-BUILD.gn.patch b/patches/third_party-blink-public-mojom-BUILD.gn.patch index 7331268249d1..63ead0c67c5d 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 f86e3bccfacc311bce0553f51b3fec66fb71c8de..ccaa975876344b147c904c177b9a90ac5c7de285 100644 +index 1b2fbd36f3b4dc9bd286e0f41157c86eec2b9fbf..0d916c6c3e316c62dbe0102e6cc2f2a832b8b3ef 100644 --- a/third_party/blink/public/mojom/BUILD.gn +++ b/third_party/blink/public/mojom/BUILD.gn -@@ -1169,6 +1169,7 @@ mojom("mojom_platform") { +@@ -1125,6 +1125,7 @@ mojom("mojom_platform") { ] cpp_typemaps += shared_cpp_typemaps blink_cpp_typemaps += shared_cpp_typemaps diff --git a/patches/third_party-blink-renderer-BUILD.gn.patch b/patches/third_party-blink-renderer-BUILD.gn.patch index 8c1ea850f25c..410b8101cf0d 100644 --- a/patches/third_party-blink-renderer-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/BUILD.gn b/third_party/blink/renderer/BUILD.gn -index 443b3406d8c3f08d7e8ba6855a64433d5b8b348a..29c6c9f6f2dd3f2a31da3ad0ee01fd465dd277c0 100644 +index 0f2a6baa28cfacd99d1b68acf4f5850590eab5db..e8f8de6f3b2a12c77b6c973e1090aaab64fe7ffe 100644 --- a/third_party/blink/renderer/BUILD.gn +++ b/third_party/blink/renderer/BUILD.gn -@@ -10,6 +10,7 @@ if (is_clang) { +@@ -9,6 +9,7 @@ if (is_clang) { } visibility = [ "//third_party/blink/*" ] diff --git a/patches/third_party-blink-renderer-bindings-BUILD.gn.patch b/patches/third_party-blink-renderer-bindings-BUILD.gn.patch index d6bd3b05ee14..2db81854fc22 100644 --- a/patches/third_party-blink-renderer-bindings-BUILD.gn.patch +++ b/patches/third_party-blink-renderer-bindings-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/bindings/BUILD.gn b/third_party/blink/renderer/bindings/BUILD.gn -index d88e11926dff4ee420478c35ee70197e66e0008d..c562126b44ddc4d653fcc5342c3f6e7e96c99702 100644 +index 1a9dfc4c1689e8d592b2a6f97bf5ca8c9064e621..a065f41dad55a4b8a1c4d7ab1cf17b6da9c2090c 100644 --- a/third_party/blink/renderer/bindings/BUILD.gn +++ b/third_party/blink/renderer/bindings/BUILD.gn -@@ -200,6 +200,7 @@ template("generate_bindings") { +@@ -203,6 +203,7 @@ template("generate_bindings") { args += invoker.targets deps = [ ":web_idl_database" ] 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 c9881694a9e9..61bb738403a2 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 2f01fa19601ffb5557516b50519b3e65f3b6b925..f7c12ba1e0843bdb4a19c1699f5639e864c82470 100644 +index 88079c09e9a7efec8aa2a80a48985f6d1bc7032d..e31e17511626741ab1e60d86f3f9e45f10aa70e5 100644 --- a/third_party/blink/renderer/bindings/generated_in_modules.gni +++ b/third_party/blink/renderer/bindings/generated_in_modules.gni -@@ -3189,6 +3189,7 @@ generated_interface_sources_in_modules = [ +@@ -3217,6 +3217,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 f0a92096681c..d755e3c2b0b2 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 c18bf52ccbd826352d2ce092b39fd72aa031563f..35bcd8a240ecf592c8b705d8eeff7d324ebb75f7 100644 +index f2d26befd66ffa66a6fd330027e47c407f2af899..5c6138081df7c9b0ef48b6b6502989b2508245b7 100644 --- a/third_party/blink/renderer/bindings/idl_in_modules.gni +++ b/third_party/blink/renderer/bindings/idl_in_modules.gni -@@ -1290,6 +1290,7 @@ static_idl_files_in_modules = [ +@@ -1299,6 +1299,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 c91616a15535..3891869b22ea 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 17b3ddd66513a01a631d77535cfeb1ae94881e0e..6dfb47d24258621705e2a1b9ea372786c645a067 100644 +index ea60aebb0db8645dea72b81592aa0f39bb39386c..3f8415d1b3dc611fa0946ff0b3753e4b5b2c09f3 100644 --- a/third_party/blink/renderer/core/BUILD.gn +++ b/third_party/blink/renderer/core/BUILD.gn -@@ -441,6 +441,7 @@ component("core") { +@@ -445,6 +445,7 @@ component("core") { "Carbon.framework", ] } diff --git a/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch b/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch index d4b9ef5e705e..1aa3caded099 100644 --- a/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch +++ b/patches/third_party-blink-renderer-core-dom-events-event_target.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/dom/events/event_target.cc b/third_party/blink/renderer/core/dom/events/event_target.cc -index 55c7b494f2ee0280c70f2bcc8a34a99f5f92400f..17d297f53f9a9635a3fb924a7923bcddcf6c6520 100644 +index 15aeb0e17de576cddf5733e6bb994cecc5f0c0c8..b6bd8f24431fe06f4f39069281f9b5cae20f02bc 100644 --- a/third_party/blink/renderer/core/dom/events/event_target.cc +++ b/third_party/blink/renderer/core/dom/events/event_target.cc @@ -643,6 +643,7 @@ bool EventTarget::AddEventListenerInternal( @@ -10,7 +10,7 @@ index 55c7b494f2ee0280c70f2bcc8a34a99f5f92400f..17d297f53f9a9635a3fb924a7923bcdd if (options->hasSignal()) { // Instead of passing the entire |options| here, which could create a // circular reference due to |options| holding a Member, just -@@ -824,6 +825,7 @@ bool EventTarget::RemoveEventListenerInternal( +@@ -801,6 +802,7 @@ bool EventTarget::RemoveEventListenerInternal( ®istered_listener)) { return false; } diff --git a/patches/third_party-blink-renderer-core-frame-dom_window.h.patch b/patches/third_party-blink-renderer-core-frame-dom_window.h.patch index 9e7330dfd2b7..a223b1da555b 100644 --- a/patches/third_party-blink-renderer-core-frame-dom_window.h.patch +++ b/patches/third_party-blink-renderer-core-frame-dom_window.h.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/frame/dom_window.h b/third_party/blink/renderer/core/frame/dom_window.h -index a0898396287a70f5ab4d147cdc354c971ed5d8d1..43b3e92f66a228b0827e942a70690e66a6f8a059 100644 +index d8222f5add05b6730d6452e68c5f68af1b1d2881..18bf0231341c9ef34e533490798c56d5b60c84a9 100644 --- a/third_party/blink/renderer/core/frame/dom_window.h +++ b/third_party/blink/renderer/core/frame/dom_window.h -@@ -206,6 +206,7 @@ class CORE_EXPORT DOMWindow : public WindowProperties { +@@ -200,6 +200,7 @@ class CORE_EXPORT DOMWindow : public WindowProperties { void DisconnectFromFrame() { frame_ = nullptr; } 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 bcfee2425ea3..33e915530f8c 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 28c64640717f499227786f661336557b9eede5d0..8cd09b44c387ea252d9a2fa777c06e1348b2259d 100644 +index b44f0db98f89befc33430bcf275bffcfae9e7171..f34273050f6d1053846d6db41235e53186090f95 100644 --- a/third_party/blink/renderer/core/frame/local_dom_window.cc +++ b/third_party/blink/renderer/core/frame/local_dom_window.cc @@ -491,6 +491,7 @@ bool LocalDOMWindow::CanExecuteScripts( diff --git a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch index fcb7e92b11ac..7826042b010f 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-canvas_async_blob_creator.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -index c7c80baf54b8d91e307c5d1dd032ed91e7b5a26d..8aa2500d8f3db3608aedbc152ed8a002380bd84b 100644 +index 82d59224dd3c68621f662f2f7e30d11d38596292..4d952cbf9f093cba46843f900d0a9072fc241dde 100644 --- a/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc +++ b/third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -220,6 +220,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( +@@ -215,6 +215,7 @@ CanvasAsyncBlobCreator::CanvasAsyncBlobCreator( src_data_.reset(info, src_data_.addr(), src_data_.rowBytes()); } } 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 52b60f6dba90..f39ea01033c7 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 cab65475494f11d50c65411542d625cdcf0199f5..97d24573b6557f2df19819780be6756d82ef7f7f 100644 +index 4c086810e8cd78ef3dc6db185e53cba32c69a157..cdd40ee2e488cec604b9515bf2d11e195de59b33 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 -@@ -1254,6 +1254,7 @@ String HTMLCanvasElement::ToDataURLInternal( +@@ -1279,6 +1279,7 @@ String HTMLCanvasElement::ToDataURLInternal( if (!data_buffer) return String("data:,"); diff --git a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch index 4dc7cc1cb852..711b4147e163 100644 --- a/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch +++ b/patches/third_party-blink-renderer-core-html-canvas-html_canvas_element.h.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h -index f0eab17e767819fbc1ebf6276383ea430b2916d4..be370eb2289804286ed912471c28c860dabc0cc5 100644 +index 20f711a3b704c3db46107e34de74b227501017db..dbf6813027dd34245a051f3a781dfd6edd52c345 100644 --- a/third_party/blink/renderer/core/html/canvas/html_canvas_element.h +++ b/third_party/blink/renderer/core/html/canvas/html_canvas_element.h -@@ -330,6 +330,7 @@ class CORE_EXPORT HTMLCanvasElement final +@@ -331,6 +331,7 @@ class CORE_EXPORT HTMLCanvasElement final bool ShouldDisableAccelerationBecauseOfReadback() const; diff --git a/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch b/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch index e059094d5191..c0094d0d99ee 100644 --- a/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch +++ b/patches/third_party-blink-renderer-core-html-media-autoplay_policy.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/html/media/autoplay_policy.cc b/third_party/blink/renderer/core/html/media/autoplay_policy.cc -index 429b4b07c292bba49550962133ae341d40eafd75..52ce54953330b9829f18f977e6ad6beb6bab6aab 100644 +index eee8ed896657ad52a954591378ea672b9165b4db..db31f24276fad6097d8b99b9ea6f183cb3efc76b 100644 --- a/third_party/blink/renderer/core/html/media/autoplay_policy.cc +++ b/third_party/blink/renderer/core/html/media/autoplay_policy.cc @@ -65,6 +65,7 @@ bool ComputeLockPendingUserGestureRequired(const Document& document) { 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 bc1a772f666c..d7b80e255512 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 fed35d75cb609507cd006b5ba8c17e9ff0cfcdc0..3a17dede69d2addae4210a5cff031044a88bdcaf 100644 +index a209f20ce750c9c4cf2d7baaa1d2206c37748eb5..298a3d05baf83eba4ce2546966e95f07ab28f415 100644 --- a/third_party/blink/renderer/core/loader/frame_fetch_context.cc +++ b/third_party/blink/renderer/core/loader/frame_fetch_context.cc -@@ -520,6 +520,7 @@ void FrameFetchContext::AddClientHintsIfNecessary( +@@ -510,6 +510,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-modulescript-module_script_loader.cc.patch b/patches/third_party-blink-renderer-core-loader-modulescript-module_script_loader.cc.patch index e05df08686dd..3c668066337a 100644 --- a/patches/third_party-blink-renderer-core-loader-modulescript-module_script_loader.cc.patch +++ b/patches/third_party-blink-renderer-core-loader-modulescript-module_script_loader.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc b/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc -index 38b36cc3d2abcac63639853fe9ad786a2abc89b9..7e6fb5727047213f2080c24aa0148bd49fc27770 100644 +index 377aff90569939d549060fc0f7ba1b529eed77e4..4452e7ddc88dcca6c1a84a1a74f7f3256b77e5d2 100644 --- a/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc +++ b/third_party/blink/renderer/core/loader/modulescript/module_script_loader.cc @@ -187,6 +187,7 @@ void ModuleScriptLoader::FetchInternal( 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 96e806d862ff..b6c54420e3d4 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,8 +1,8 @@ diff --git a/third_party/blink/renderer/core/script/script_loader.cc b/third_party/blink/renderer/core/script/script_loader.cc -index 6b98bb17fe16fd63b3b920e39f6ff248d02c2ffc..3bc260588770435e51841c3d2767ed9cbf1f7c17 100644 +index 445f3b85cab228633f897f26aaed06d75ffb7f63..cc379c175d6613a2fddae5720a489afa8ac2e80e 100644 --- a/third_party/blink/renderer/core/script/script_loader.cc +++ b/third_party/blink/renderer/core/script/script_loader.cc -@@ -749,6 +749,7 @@ PendingScript* ScriptLoader::PrepareScript( +@@ -751,6 +751,7 @@ PendingScript* ScriptLoader::PrepareScript( parser_state, credentials_mode, referrer_policy, fetch_priority_hint, render_blocking_behavior, RejectCoepUnsafeNone(false)); diff --git a/patches/third_party-blink-renderer-modules-BUILD.gn.patch b/patches/third_party-blink-renderer-modules-BUILD.gn.patch index 7ba11bc1e6b0..5ad9f57c7f07 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 275a7e9b81eca91885ff0cd631999692089836bf..34a1da297fe85b6a43554a0737e8c41e2492d539 100644 +index 509301458f218eb568e78f6a448ebe5956dab9a6..508973a3cd9199b38de4e819d0e76de3f13b08ac 100644 --- a/third_party/blink/renderer/modules/BUILD.gn +++ b/third_party/blink/renderer/modules/BUILD.gn @@ -20,6 +20,7 @@ if (is_ios) { 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 3425040c2e49..7ae8f49e40dd 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 21d7d9e9fd5217589140b2ec563ff08528283e26..5b27284e1de90248dc206d40845f4445145f1a95 100644 +index 2570b5a8e377af0ccfc301f2b13b73b81a330029..2fd731cab14d98634954716f8181c036f014a002 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 -@@ -2798,6 +2798,7 @@ ImageData* BaseRenderingContext2D::getImageData( +@@ -2792,6 +2792,7 @@ ImageData* BaseRenderingContext2D::getImageData( perfetto::EventContext GetEventContext(); ImageData* BaseRenderingContext2D::getImageDataInternal( @@ -10,7 +10,7 @@ index 21d7d9e9fd5217589140b2ec563ff08528283e26..5b27284e1de90248dc206d40845f4445 int sx, int sy, int sw, -@@ -2971,6 +2972,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( +@@ -2965,6 +2966,7 @@ ImageData* BaseRenderingContext2D::getImageDataInternal( DCHECK(!bounds.intersect(SkIRect::MakeXYWH(sx, sy, sw, sh))); } } @@ -18,7 +18,7 @@ index 21d7d9e9fd5217589140b2ec563ff08528283e26..5b27284e1de90248dc206d40845f4445 return image_data; } -@@ -3693,6 +3695,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { +@@ -3751,6 +3753,7 @@ TextMetrics* BaseRenderingContext2D::measureText(const String& text) { return MakeGarbageCollected(); } diff --git a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.idl.patch b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.idl.patch index 1a0e9fb99e2b..341cd71715bf 100644 --- a/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.idl.patch +++ b/patches/third_party-blink-renderer-modules-canvas-canvas2d-base_rendering_context_2d.idl.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.idl b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.idl -index 2d486fd43e1fcdceef22612d93eb68e3532b7e2b..e68f0e335a06e6860f0421950b1bcc2006316d1c 100644 +index d15b902a7b711f40feb1187e68ae3adff6dcf334..9928b3f1b3d1b58a0b183dcf9f19333e6d56c487 100644 --- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.idl +++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.idl -@@ -20,8 +20,8 @@ interface mixin BaseRenderingContext2D { +@@ -25,8 +25,8 @@ interface mixin BaseRenderingContext2D { [RaisesException] ImageData createImageData(ImageData imagedata); [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh); [RaisesException] ImageData createImageData([EnforceRange] long sw, [EnforceRange] long sh, ImageDataSettings imageDataSettings); diff --git a/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch b/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch index 98002beec6e0..25d685595d56 100644 --- a/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch +++ b/patches/third_party-blink-renderer-modules-encryptedmedia-navigator_request_media_key_system_access.cc.patch @@ -1,5 +1,5 @@ diff --git a/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc b/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc -index c3db0bc3d2cdc44ce9acf1e9d08d0a83caed1429..2396f413fad1db2c8adc8c8c80606de737e3c2df 100644 +index bb2b814fb9399ea9c3bd1ecfa3042ca0eaa403cb..8360c53e9d02eded2032bb4afc165f18209d6241 100644 --- a/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc +++ b/third_party/blink/renderer/modules/encryptedmedia/navigator_request_media_key_system_access.cc @@ -203,6 +203,7 @@ NavigatorRequestMediaKeySystemAccess::requestMediaKeySystemAccess( diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch index 4a58c2220715..fd646f8c77a3 100644 --- a/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch +++ b/patches/third_party-blink-renderer-modules-webgl-webgl2_rendering_context_base.cc.patch @@ -1,8 +1,8 @@ diff --git a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -index 954af48e60de2f51bb4ad07d11787548710557b2..21ffc7eb3d9ef6dac6c2bd9935eea1eeec8bf6f4 100644 +index 28e0c530426cf30b7a1013f4cf5231285d97cf6f..032fcdda466fa20e385c7ccbe3fa5fcee55b6c1f 100644 --- a/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc +++ b/third_party/blink/renderer/modules/webgl/webgl2_rendering_context_base.cc -@@ -4802,6 +4802,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, +@@ -4795,6 +4795,7 @@ ScriptValue WebGL2RenderingContextBase::getParameter(ScriptState* script_state, GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -10,7 +10,7 @@ index 954af48e60de2f51bb4ad07d11787548710557b2..21ffc7eb3d9ef6dac6c2bd9935eea1ee switch (pname) { case GL_SHADING_LANGUAGE_VERSION: { return WebGLAny( -@@ -5412,6 +5413,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( +@@ -5405,6 +5406,7 @@ ScriptValue WebGL2RenderingContextBase::getFramebufferAttachmentParameter( if (isContextLost() || !ValidateGetFramebufferAttachmentParameterFunc( kFunctionName, target, attachment)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -18,7 +18,7 @@ index 954af48e60de2f51bb4ad07d11787548710557b2..21ffc7eb3d9ef6dac6c2bd9935eea1ee WebGLFramebuffer* framebuffer_binding = GetFramebufferBinding(target); DCHECK(!framebuffer_binding || framebuffer_binding->Object()); -@@ -5630,6 +5632,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( +@@ -5623,6 +5625,7 @@ ScriptValue WebGL2RenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost() || !ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); diff --git a/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch b/patches/third_party-blink-renderer-modules-webgl-webgl_rendering_context_base.cc.patch index 433b46be5ec0..9db9fe4b3506 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 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f472f236acd 100644 +index 1eb821b4c0b804325bd1a9d2138e4aa86cf123c6..caddc93d05268202510e66aa9e2d3907af1ac907 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 -@@ -3209,6 +3209,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( +@@ -3208,6 +3208,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveAttrib( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveAttrib", program)) return nullptr; @@ -10,7 +10,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_ATTRIBUTE_MAX_LENGTH, -@@ -3240,6 +3241,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( +@@ -3239,6 +3240,7 @@ WebGLActiveInfo* WebGLRenderingContextBase::getActiveUniform( GLuint index) { if (!ValidateWebGLProgramOrShader("getActiveUniform", program)) return nullptr; @@ -18,7 +18,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 GLuint program_id = ObjectNonZero(program); GLint max_name_length = -1; ContextGL()->GetProgramiv(program_id, GL_ACTIVE_UNIFORM_MAX_LENGTH, -@@ -3270,6 +3272,7 @@ std::optional>> +@@ -3269,6 +3271,7 @@ std::optional>> WebGLRenderingContextBase::getAttachedShaders(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getAttachedShaders", program)) return std::nullopt; @@ -26,7 +26,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 HeapVector> shader_objects; for (GLenum shaderType : {GL_VERTEX_SHADER, GL_FRAGMENT_SHADER}) { -@@ -3284,6 +3287,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, +@@ -3283,6 +3286,7 @@ GLint WebGLRenderingContextBase::getAttribLocation(WebGLProgram* program, const String& name) { if (!ValidateWebGLProgramOrShader("getAttribLocation", program)) return -1; @@ -34,7 +34,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 if (!ValidateLocationLength("getAttribLocation", name)) return -1; if (!ValidateString("getAttribLocation", name)) -@@ -3317,6 +3321,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( +@@ -3316,6 +3320,7 @@ ScriptValue WebGLRenderingContextBase::getBufferParameter( GLenum pname) { if (isContextLost() || !ValidateBufferTarget("getBufferParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -42,7 +42,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 switch (pname) { case GL_BUFFER_USAGE: { -@@ -3454,6 +3459,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( +@@ -3453,6 +3458,7 @@ ScriptValue WebGLRenderingContextBase::getFramebufferAttachmentParameter( return ScriptValue::CreateNull(script_state->GetIsolate()); } @@ -50,7 +50,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 if (!framebuffer_binding_ || !framebuffer_binding_->Object()) { SynthesizeGLError(GL_INVALID_OPERATION, kFunctionName, "no framebuffer bound"); -@@ -3857,6 +3863,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3853,6 +3859,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 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -3872,6 +3879,7 @@ ScriptValue WebGLRenderingContextBase::getParameter(ScriptState* script_state, +@@ -3868,6 +3875,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 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 if (ExtensionEnabled(kWebGLDebugRendererInfoName)) { if (IdentifiabilityStudySettings::Get()->ShouldSampleType( blink::IdentifiableSurface::Type::kWebGLParameter)) { -@@ -4007,6 +4015,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -4003,6 +4011,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 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 if (!ValidateWebGLProgramOrShader("getProgramParamter", program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -4062,6 +4071,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( +@@ -4058,6 +4067,7 @@ ScriptValue WebGLRenderingContextBase::getProgramParameter( String WebGLRenderingContextBase::getProgramInfoLog(WebGLProgram* program) { if (!ValidateWebGLProgramOrShader("getProgramInfoLog", program)) return String(); @@ -82,7 +82,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(program)); } -@@ -4072,6 +4082,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( +@@ -4068,6 +4078,7 @@ ScriptValue WebGLRenderingContextBase::getRenderbufferParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -90,7 +90,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 if (target != GL_RENDERBUFFER) { SynthesizeGLError(GL_INVALID_ENUM, "getRenderbufferParameter", "invalid target"); -@@ -4123,6 +4134,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -4119,6 +4130,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 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 if (!ValidateWebGLProgramOrShader("getShaderParameter", shader)) { return ScriptValue::CreateNull(script_state->GetIsolate()); } -@@ -4154,6 +4166,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( +@@ -4150,6 +4162,7 @@ ScriptValue WebGLRenderingContextBase::getShaderParameter( String WebGLRenderingContextBase::getShaderInfoLog(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderInfoLog", shader)) return String(); @@ -106,7 +106,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 GLStringQuery query(ContextGL()); return query.Run(ObjectNonZero(shader)); } -@@ -4184,6 +4197,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -4180,6 +4193,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( GLint precision = 0; ContextGL()->GetShaderPrecisionFormat(shader_type, precision_type, range, &precision); @@ -114,7 +114,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 auto* result = MakeGarbageCollected( range[0], range[1], precision); if (IdentifiabilityStudySettings::Get()->ShouldSampleType( -@@ -4196,6 +4210,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( +@@ -4192,6 +4206,7 @@ WebGLShaderPrecisionFormat* WebGLRenderingContextBase::getShaderPrecisionFormat( String WebGLRenderingContextBase::getShaderSource(WebGLShader* shader) { if (!ValidateWebGLProgramOrShader("getShaderSource", shader)) return String(); @@ -122,7 +122,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 return EnsureNotNull(shader->Source()); } -@@ -4221,6 +4236,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( +@@ -4217,6 +4232,7 @@ ScriptValue WebGLRenderingContextBase::getTexParameter( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -130,7 +130,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 if (!ValidateTextureBinding("getTexParameter", target)) return ScriptValue::CreateNull(script_state->GetIsolate()); switch (pname) { -@@ -4255,6 +4271,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( +@@ -4251,6 +4267,7 @@ ScriptValue WebGLRenderingContextBase::getUniform( const WebGLUniformLocation* uniform_location) { if (!ValidateWebGLProgramOrShader("getUniform", program)) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -138,7 +138,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 DCHECK(uniform_location); if (!ValidateUniformLocation("getUniform", uniform_location, program)) { return ScriptValue::CreateNull(script_state->GetIsolate()); -@@ -4507,6 +4524,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( +@@ -4503,6 +4520,7 @@ WebGLUniformLocation* WebGLRenderingContextBase::getUniformLocation( const String& name) { if (!ValidateWebGLProgramOrShader("getUniformLocation", program)) return nullptr; @@ -146,7 +146,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 if (!ValidateLocationLength("getUniformLocation", name)) return nullptr; if (!ValidateString("getUniformLocation", name)) -@@ -4531,6 +4549,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( +@@ -4527,6 +4545,7 @@ ScriptValue WebGLRenderingContextBase::getVertexAttrib( GLenum pname) { if (isContextLost()) return ScriptValue::CreateNull(script_state->GetIsolate()); @@ -154,7 +154,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 if (index >= max_vertex_attribs_) { SynthesizeGLError(GL_INVALID_VALUE, "getVertexAttrib", "index out of range"); -@@ -4605,6 +4624,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, +@@ -4601,6 +4620,7 @@ int64_t WebGLRenderingContextBase::getVertexAttribOffset(GLuint index, GLenum pname) { if (isContextLost()) return 0; @@ -162,7 +162,7 @@ index 4b320ebccaefb68e082f145a304c01f59432b34f..a7772c5b9840e41e535f8ab5717c3f47 GLvoid* result = nullptr; // NOTE: If pname is ever a value that returns more than 1 element // this will corrupt memory. -@@ -4963,6 +4983,7 @@ void WebGLRenderingContextBase::ReadPixelsHelper(GLint x, +@@ -4959,6 +4979,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 81e91568615d..ac55b6f04c34 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 871916a18d58d124f41df811e6214836cfab0083..65b6376a677b11c148bda849fec26d3c52b25fda 100644 +index c4d8b50411c139df8c5e8e8f8d164b23b6524f6f..f57817765bde54126c4f377ca3c9f8c2ffc2b306 100644 --- a/third_party/blink/renderer/platform/BUILD.gn +++ b/third_party/blink/renderer/platform/BUILD.gn -@@ -1933,6 +1933,7 @@ component("platform") { +@@ -1941,6 +1941,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 c3233b1fc7cd..9f222e50c7f7 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 a40ebb8a7bf55fa94f65e94a264bef53d954a263..66f07f01efe6123596e99472c3081df6798e66ad 100644 +index 07c177ee6a6bcbcc43690ab7128c204d24edc998..6c36099cc00ab4169ae1a4a2325056583b9bc243 100644 --- a/third_party/blink/renderer/platform/runtime_enabled_features.json5 +++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5 -@@ -1977,6 +1977,7 @@ +@@ -2007,6 +2007,7 @@ // In-development features for the File System Access API. name: "FileSystemAccessAPIExperimental", status: "experimental", @@ -10,7 +10,7 @@ index a40ebb8a7bf55fa94f65e94a264bef53d954a263..66f07f01efe6123596e99472c3081df6 }, { // The FileSystemHandle.getCloudIdentifiers() method (see -@@ -1991,6 +1992,7 @@ +@@ -2021,6 +2022,7 @@ // Non-OPFS File System Access API. name: "FileSystemAccessLocal", status: {"default": "stable"}, @@ -18,7 +18,7 @@ index a40ebb8a7bf55fa94f65e94a264bef53d954a263..66f07f01efe6123596e99472c3081df6 }, { name: "FileSystemAccessLockingScheme", -@@ -2818,6 +2820,7 @@ +@@ -2842,6 +2844,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 5fd6b993a85f..61e8af040106 100644 --- a/patches/third_party-lit-v3_0-BUILD.gn.patch +++ b/patches/third_party-lit-v3_0-BUILD.gn.patch @@ -1,5 +1,5 @@ diff --git a/third_party/lit/v3_0/BUILD.gn b/third_party/lit/v3_0/BUILD.gn -index 525a853b6ee927a0be9aebf92307ee544383ba98..58eddd0d10e27cbba6af4016184a916ff978828f 100644 +index 0d86a9b9fa19002fa0bff08454b060c314e8394d..fa8b0f93e4e73a1191f351619416987a028e3abd 100644 --- a/third_party/lit/v3_0/BUILD.gn +++ b/third_party/lit/v3_0/BUILD.gn @@ -105,6 +105,7 @@ ts_library("build_ts") { diff --git a/patches/third_party-polymer-v3_0-BUILD.gn.patch b/patches/third_party-polymer-v3_0-BUILD.gn.patch index f38113484687..e530a430d31c 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 2300eacab097aca49f07a1ffe6019d1e19f076f4..7078e0e87151092d5dc727a45cde21f1961b2d1d 100644 +index f13328770d4598b4e1fc8174e3ca4b35aac977b8..3c564365cc9650e1f64410a8d3c2e637b34e240a 100644 --- a/third_party/polymer/v3_0/BUILD.gn +++ b/third_party/polymer/v3_0/BUILD.gn @@ -18,6 +18,7 @@ js_files = [ @@ -10,7 +10,7 @@ index 2300eacab097aca49f07a1ffe6019d1e19f076f4..7078e0e87151092d5dc727a45cde21f1 js_files += [ "iron-a11y-announcer/iron-a11y-announcer.js", "iron-a11y-keys/iron-a11y-keys.js", -@@ -228,11 +229,13 @@ ts_library("library") { +@@ -229,11 +230,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 2300eacab097aca49f07a1ffe6019d1e19f076f4..7078e0e87151092d5dc727a45cde21f1 definitions += [ "components-chromium/iron-a11y-announcer/iron-a11y-announcer.d.ts", "components-chromium/iron-a11y-keys/iron-a11y-keys.d.ts", -@@ -275,4 +278,5 @@ ts_library("library") { +@@ -276,4 +279,5 @@ ts_library("library") { "components-chromium/paper-tooltip/paper-tooltip.d.ts", ] } diff --git a/patches/third_party-rust-anyhow-v1-BUILD.gn.patch b/patches/third_party-rust-anyhow-v1-BUILD.gn.patch index 28ca6acd66fa..2d8f36b907f3 100644 --- a/patches/third_party-rust-anyhow-v1-BUILD.gn.patch +++ b/patches/third_party-rust-anyhow-v1-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/anyhow/v1/BUILD.gn b/third_party/rust/anyhow/v1/BUILD.gn -index 32bbd3ff85e5bb395f1349e3f85e818651cd6614..2b2566cfd5dcb3c75eef01b42e8e3897eeb64fda 100644 +index 7e28cc89cce75ca0e193471dd81548b490302542..9eced79d500e54c5f9e9225267668129707c2904 100644 --- a/third_party/rust/anyhow/v1/BUILD.gn +++ b/third_party/rust/anyhow/v1/BUILD.gn -@@ -51,5 +51,4 @@ cargo_crate("lib") { +@@ -52,5 +52,4 @@ cargo_crate("lib") { "--cap-lints=allow", # Suppress all warnings in crates.io crates ] diff --git a/patches/third_party-rust-bitflags-v2-BUILD.gn.patch b/patches/third_party-rust-bitflags-v2-BUILD.gn.patch index 3c978a30511d..1e6bf4088700 100644 --- a/patches/third_party-rust-bitflags-v2-BUILD.gn.patch +++ b/patches/third_party-rust-bitflags-v2-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/bitflags/v2/BUILD.gn b/third_party/rust/bitflags/v2/BUILD.gn -index 9bf3b62be710f6c3d12c98adc52896c8977c4f0c..15f695e764507aba6e4b6d429ec712b76a29f57c 100644 +index bc1fd25250cba328fae350813f197916a0bc7810..e39dc78b2707875b0b98ead66a27ec4880eefb90 100644 --- a/third_party/rust/bitflags/v2/BUILD.gn +++ b/third_party/rust/bitflags/v2/BUILD.gn -@@ -73,4 +73,5 @@ cargo_crate("lib") { +@@ -74,4 +74,5 @@ cargo_crate("lib") { rustflags = [ "--cap-lints=allow", # Suppress all warnings in crates.io crates ] diff --git a/patches/third_party-rust-byteorder-v1-BUILD.gn.patch b/patches/third_party-rust-byteorder-v1-BUILD.gn.patch index 861347e9c084..18a832884ba5 100644 --- a/patches/third_party-rust-byteorder-v1-BUILD.gn.patch +++ b/patches/third_party-rust-byteorder-v1-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/byteorder/v1/BUILD.gn b/third_party/rust/byteorder/v1/BUILD.gn -index 2ff8f05d8d77852a430729372715305323a600cb..9a0152f3d73af2baa9ee502c65ba4870c419ed91 100644 +index 2731f4aef708a593ea117e864269203fd72f624c..cdb28cf2af6847d760acdc186b189d3607907b4b 100644 --- a/third_party/rust/byteorder/v1/BUILD.gn +++ b/third_party/rust/byteorder/v1/BUILD.gn -@@ -41,4 +41,5 @@ cargo_crate("lib") { +@@ -42,4 +42,5 @@ cargo_crate("lib") { # //third_party/rust/chromium_crates_io/Cargo.toml to use # it from first-party code. visibility = [ "//third_party/rust/*" ] diff --git a/patches/third_party-rust-getrandom-v0_2-BUILD.gn.patch b/patches/third_party-rust-getrandom-v0_2-BUILD.gn.patch index 2ac09403cd52..4db60867b911 100644 --- a/patches/third_party-rust-getrandom-v0_2-BUILD.gn.patch +++ b/patches/third_party-rust-getrandom-v0_2-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/getrandom/v0_2/BUILD.gn b/third_party/rust/getrandom/v0_2/BUILD.gn -index d43e4e8f6729ea94eb7c4528657ebbe0a4d01af8..6efecb8df784f50986f4eb40d0306fa27d079e06 100644 +index 29d2813377c200ede86cc43dd2137de8d8bb23fb..7e84aee6c7dc00a76400a62778a718ae36d86ffa 100644 --- a/third_party/rust/getrandom/v0_2/BUILD.gn +++ b/third_party/rust/getrandom/v0_2/BUILD.gn -@@ -67,5 +67,4 @@ cargo_crate("lib") { +@@ -68,5 +68,4 @@ cargo_crate("lib") { # //third_party/rust/chromium_crates_io/Cargo.toml to use # it from first-party code. visibility = [ "//third_party/rust/*" ] diff --git a/patches/third_party-rust-hex-v0_4-BUILD.gn.patch b/patches/third_party-rust-hex-v0_4-BUILD.gn.patch index 9ee8b50ae54a..effd2b69e0b2 100644 --- a/patches/third_party-rust-hex-v0_4-BUILD.gn.patch +++ b/patches/third_party-rust-hex-v0_4-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/hex/v0_4/BUILD.gn b/third_party/rust/hex/v0_4/BUILD.gn -index 771fd1b7a1cef6798333f98390af43a41e69ccab..b137f6fd9e99323b5e180b8a7f15f95911bdaed3 100644 +index 24dcfb0bf4474047ebf5ff7acded9f2c16c0d373..d6e1f1e834101bd1c3d265dfd11b7f3732d74527 100644 --- a/third_party/rust/hex/v0_4/BUILD.gn +++ b/third_party/rust/hex/v0_4/BUILD.gn -@@ -42,5 +42,4 @@ cargo_crate("lib") { +@@ -43,5 +43,4 @@ cargo_crate("lib") { "--cap-lints=allow", # Suppress all warnings in crates.io crates ] diff --git a/patches/third_party-rust-ppv_lite86-v0_2-BUILD.gn.patch b/patches/third_party-rust-ppv_lite86-v0_2-BUILD.gn.patch index a64f93cc2f8c..434d7b780d42 100644 --- a/patches/third_party-rust-ppv_lite86-v0_2-BUILD.gn.patch +++ b/patches/third_party-rust-ppv_lite86-v0_2-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/ppv_lite86/v0_2/BUILD.gn b/third_party/rust/ppv_lite86/v0_2/BUILD.gn -index 029f7fa81b54de4eb178f8ed4b06aceb617bfaa3..e48982aebf5d0e38aa7b36a2169f2e2cc925d56d 100644 +index c5e5e36626e36b8a9ca9322b3c571ec4884881d2..6bb9348a7b2cb702e7bf1d984d2a8f8c85d89635 100644 --- a/third_party/rust/ppv_lite86/v0_2/BUILD.gn +++ b/third_party/rust/ppv_lite86/v0_2/BUILD.gn -@@ -48,5 +48,4 @@ cargo_crate("lib") { +@@ -49,5 +49,4 @@ cargo_crate("lib") { # //third_party/rust/chromium_crates_io/Cargo.toml to use # it from first-party code. visibility = [ "//third_party/rust/*" ] diff --git a/patches/third_party-rust-rand-v0_8-BUILD.gn.patch b/patches/third_party-rust-rand-v0_8-BUILD.gn.patch index d23331860256..e5cb38582313 100644 --- a/patches/third_party-rust-rand-v0_8-BUILD.gn.patch +++ b/patches/third_party-rust-rand-v0_8-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/rand/v0_8/BUILD.gn b/third_party/rust/rand/v0_8/BUILD.gn -index 3ed69d63f09554a43e89aaad6679b00b26b3cee7..80c87141b4e6ee6b4f6eead3e55a6c05b822ae5d 100644 +index 55c80c0f479398e606fc1c0af01071395972d104..08343846efb5eb2b473a8cc213ba6684dba5b475 100644 --- a/third_party/rust/rand/v0_8/BUILD.gn +++ b/third_party/rust/rand/v0_8/BUILD.gn -@@ -76,5 +76,5 @@ cargo_crate("lib") { +@@ -77,5 +77,5 @@ cargo_crate("lib") { "--cap-lints=allow", # Suppress all warnings in crates.io crates ] diff --git a/patches/third_party-rust-rand_chacha-v0_3-BUILD.gn.patch b/patches/third_party-rust-rand_chacha-v0_3-BUILD.gn.patch index 2df85331f2b4..fff95a636b25 100644 --- a/patches/third_party-rust-rand_chacha-v0_3-BUILD.gn.patch +++ b/patches/third_party-rust-rand_chacha-v0_3-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/rand_chacha/v0_3/BUILD.gn b/third_party/rust/rand_chacha/v0_3/BUILD.gn -index 818da9babb816ee4add7151fbaf86f51f58e2928..d3e9f38fb1b0a5599376607339ec5316cb47a50f 100644 +index 34131ad71f722a1652b2db6a7b53ed6df471ba12..d2b653a60b03b88807935a84fe6077c2507d80d3 100644 --- a/third_party/rust/rand_chacha/v0_3/BUILD.gn +++ b/third_party/rust/rand_chacha/v0_3/BUILD.gn -@@ -45,5 +45,4 @@ cargo_crate("lib") { +@@ -46,5 +46,4 @@ cargo_crate("lib") { # //third_party/rust/chromium_crates_io/Cargo.toml to use # it from first-party code. visibility = [ "//third_party/rust/*" ] diff --git a/patches/third_party-rust-rand_core-v0_6-BUILD.gn.patch b/patches/third_party-rust-rand_core-v0_6-BUILD.gn.patch index 05f2a526fb7a..f53cb5c62449 100644 --- a/patches/third_party-rust-rand_core-v0_6-BUILD.gn.patch +++ b/patches/third_party-rust-rand_core-v0_6-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/rand_core/v0_6/BUILD.gn b/third_party/rust/rand_core/v0_6/BUILD.gn -index 7251cc3332bf8a04a32d2be4f74879142b4da4db..450280f4c863f2dbec74d9b944e395c9ea298896 100644 +index 15c899efacde87dde37babd7d170e62a71e9fb09..40f0cb11f8918f28815a7d3aea6e525ad2b3db54 100644 --- a/third_party/rust/rand_core/v0_6/BUILD.gn +++ b/third_party/rust/rand_core/v0_6/BUILD.gn -@@ -51,5 +51,4 @@ cargo_crate("lib") { +@@ -52,5 +52,4 @@ cargo_crate("lib") { # //third_party/rust/chromium_crates_io/Cargo.toml to use # it from first-party code. visibility = [ "//third_party/rust/*" ] diff --git a/patches/third_party-rust-regex-v1-BUILD.gn.patch b/patches/third_party-rust-regex-v1-BUILD.gn.patch index 0bc916c5e559..5d1e1917b1c6 100644 --- a/patches/third_party-rust-regex-v1-BUILD.gn.patch +++ b/patches/third_party-rust-regex-v1-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/regex/v1/BUILD.gn b/third_party/rust/regex/v1/BUILD.gn -index ea9dea31cdd372f5b992ca268f97840de892bd9b..d8f7211ca142d45878c2d7edd61b609c39874f4c 100644 +index 836b56782fed089feb71dcfa45b1410d6583ac28..ad1b5b4b1753b26d3a90395d7763d7d60c6c7c78 100644 --- a/third_party/rust/regex/v1/BUILD.gn +++ b/third_party/rust/regex/v1/BUILD.gn -@@ -71,5 +71,4 @@ cargo_crate("lib") { +@@ -72,5 +72,4 @@ cargo_crate("lib") { "--cap-lints=allow", # Suppress all warnings in crates.io crates ] diff --git a/patches/third_party-rust-rustc_version-v0_4-BUILD.gn.patch b/patches/third_party-rust-rustc_version-v0_4-BUILD.gn.patch index 91dcaea73081..514d5aba1a98 100644 --- a/patches/third_party-rust-rustc_version-v0_4-BUILD.gn.patch +++ b/patches/third_party-rust-rustc_version-v0_4-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/rustc_version/v0_4/BUILD.gn b/third_party/rust/rustc_version/v0_4/BUILD.gn -index 2d4a99767f0c1537ec1190ec20f69ce8435a5361..4fe23d9131ced99584872a0ad7a72d67e38d311a 100644 +index 2d2096c7108ed3563baa96f9cf4b7ba08bc3ecca..7bb2d4d649ca20a9fe35addbafa0fc2b8a376a0d 100644 --- a/third_party/rust/rustc_version/v0_4/BUILD.gn +++ b/third_party/rust/rustc_version/v0_4/BUILD.gn -@@ -37,5 +37,4 @@ cargo_crate("buildrs_support") { +@@ -38,5 +38,4 @@ cargo_crate("buildrs_support") { # //third_party/rust/chromium_crates_io/Cargo.toml to use # it from first-party code. visibility = [ "//third_party/rust/*" ] diff --git a/patches/third_party-rust-semver-v1-BUILD.gn.patch b/patches/third_party-rust-semver-v1-BUILD.gn.patch index 588c278715a8..b48d49c9b4ec 100644 --- a/patches/third_party-rust-semver-v1-BUILD.gn.patch +++ b/patches/third_party-rust-semver-v1-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/semver/v1/BUILD.gn b/third_party/rust/semver/v1/BUILD.gn -index 35d4872234a159933fde48a7a4db705d49c7097e..a4fa16d9b8a358123b1d36c6428fd17ea9af080e 100644 +index 552529762b59721fb8e6bdce42d068747a506c1b..c1f72d86c89e16b5589621aa3ba8b73029c9c572 100644 --- a/third_party/rust/semver/v1/BUILD.gn +++ b/third_party/rust/semver/v1/BUILD.gn -@@ -53,5 +53,4 @@ cargo_crate("lib") { +@@ -54,5 +54,4 @@ cargo_crate("lib") { # //third_party/rust/chromium_crates_io/Cargo.toml to use # it from first-party code. visibility = [ "//third_party/rust/*" ] diff --git a/patches/third_party-rust-serde-v1-BUILD.gn.patch b/patches/third_party-rust-serde-v1-BUILD.gn.patch index f7fbcb5b3496..264c0ee7e5b0 100644 --- a/patches/third_party-rust-serde-v1-BUILD.gn.patch +++ b/patches/third_party-rust-serde-v1-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/serde/v1/BUILD.gn b/third_party/rust/serde/v1/BUILD.gn -index 131dc497a9e730c9ef1c347a58aaf4088ed377e0..0791352e48673fe0679b05a3a0a35c766039f508 100644 +index a28ad77f898976c0f87feb0607853cc8134e40fb..66d57ac1b427489f3846f13232ccad8949ee1ef3 100644 --- a/third_party/rust/serde/v1/BUILD.gn +++ b/third_party/rust/serde/v1/BUILD.gn -@@ -56,6 +56,7 @@ cargo_crate("lib") { +@@ -57,6 +57,7 @@ cargo_crate("lib") { "serde_derive", "std", ] diff --git a/patches/third_party-rust-serde_json-v1-BUILD.gn.patch b/patches/third_party-rust-serde_json-v1-BUILD.gn.patch index 8b5fcc60b490..aa95d4ac083f 100644 --- a/patches/third_party-rust-serde_json-v1-BUILD.gn.patch +++ b/patches/third_party-rust-serde_json-v1-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/serde_json/v1/BUILD.gn b/third_party/rust/serde_json/v1/BUILD.gn -index 26fcbbbd177521b9a60e2af2f81fe6673a1f1cd9..5897e9e6cf9cc12bcd8f91b0e66a6d16310ca9cd 100644 +index ef3bd27bb936c3338d2570406932e1f57def9034..934f726d75941ac2505563bff8718dd97de9e3d5 100644 --- a/third_party/rust/serde_json/v1/BUILD.gn +++ b/third_party/rust/serde_json/v1/BUILD.gn -@@ -82,5 +82,4 @@ cargo_crate("lib") { +@@ -83,5 +83,4 @@ cargo_crate("lib") { "--cap-lints=allow", # Suppress all warnings in crates.io crates ] diff --git a/patches/third_party-rust-syn-v2-BUILD.gn.patch b/patches/third_party-rust-syn-v2-BUILD.gn.patch index 21bebf9cc08a..a6834f8824bf 100644 --- a/patches/third_party-rust-syn-v2-BUILD.gn.patch +++ b/patches/third_party-rust-syn-v2-BUILD.gn.patch @@ -1,8 +1,8 @@ diff --git a/third_party/rust/syn/v2/BUILD.gn b/third_party/rust/syn/v2/BUILD.gn -index 337e318c2fec282ce22d58aed50b07c75e3ca601..4e4bfee7cf2ec315174e656091d3917fe791492a 100644 +index 5fe49af9f1c7b6c9dd658973a101ff6f9c8155a8..2386f6dcaf178b89667df9258a6e3d913f43ce92 100644 --- a/third_party/rust/syn/v2/BUILD.gn +++ b/third_party/rust/syn/v2/BUILD.gn -@@ -105,4 +105,5 @@ cargo_crate("lib") { +@@ -106,4 +106,5 @@ cargo_crate("lib") { rustflags = [ "--cap-lints=allow", # Suppress all warnings in crates.io crates ] diff --git a/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch b/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch index 4e326258ff1b..17cf605482de 100644 --- a/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch +++ b/patches/third_party/catapult/telemetry-telemetry-internal-backends-chrome-desktop_browser_finder.py.patch @@ -1,8 +1,8 @@ diff --git a/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py b/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py -index 9fb39609800d5fe75f2a0f8f8b7728b21025e6e1..1399dbea5f99ce8c21d0509c93aece4d58fab2fb 100644 +index 144a7ff9db43c6adc9d274048636b6a37d7a45d1..7bcb25318dee3a6eec5c19882c185dc69ad1d6a4 100644 --- a/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py +++ b/telemetry/telemetry/internal/backends/chrome/desktop_browser_finder.py -@@ -494,3 +494,4 @@ def FindAllAvailableBrowsers(finder_options, device): +@@ -500,3 +500,4 @@ def FindAllAvailableBrowsers(finder_options, device): return [] return browsers 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 e019d32e101f..b88e4c64c999 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 604c38e786e41564797f74f07351940a2990e1aa..b723918907d350693d3ca7d4d74266499de36154 100644 +index 229ef416bf8cb1fe3ac07f6281ec675107e42a01..9f5cc424adc0bae7b72339d93d9424dbfabe5456 100644 --- a/config/gni/devtools_grd_files.gni +++ b/config/gni/devtools_grd_files.gni -@@ -2505,6 +2505,7 @@ grd_files_debug_sources = [ +@@ -2549,6 +2549,7 @@ grd_files_debug_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-protocol_client-protocol_client.ts.patch b/patches/third_party/devtools-frontend/src/front_end-core-protocol_client-protocol_client.ts.patch index e9a0beec034c..985906209504 100644 --- a/patches/third_party/devtools-frontend/src/front_end-core-protocol_client-protocol_client.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-core-protocol_client-protocol_client.ts.patch @@ -1,5 +1,5 @@ diff --git a/front_end/core/protocol_client/protocol_client.ts b/front_end/core/protocol_client/protocol_client.ts -index 6f4b3f92dbf5beb1be28b9a5d30434e29fa77b48..ddd5d9f1d86395ad72fe602f3f802c147ae1689c 100644 +index ccc94969a90d865058fe336131c27c357d86be70..9f653969a379df9761b279c3a249cdc9a82430ee 100644 --- a/front_end/core/protocol_client/protocol_client.ts +++ b/front_end/core/protocol_client/protocol_client.ts @@ -19,3 +19,4 @@ self.Protocol = self.Protocol || {}; 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 12e1050b5a93..a421e22fffc4 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 5648a0ab0ebbd2b629cf370d36665382ac88024f..c585dda15b05afc1afc434519b9bd6f6a19c6f8e 100644 +index c42a2c5716ca4e6e40b7e86d8de8b785aba5f5bc..a901616d725a1824342da69b7efcdc01b904fd20 100644 --- a/front_end/core/sdk/NetworkManager.ts +++ b/front_end/core/sdk/NetworkManager.ts -@@ -1297,6 +1297,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher { +@@ -1301,6 +1301,7 @@ export class NetworkDispatcher implements ProtocolProxyApi.NetworkDispatcher { return request; } } diff --git a/patches/third_party/devtools-frontend/src/front_end-design_system_tokens.css.patch b/patches/third_party/devtools-frontend/src/front_end-design_system_tokens.css.patch index 6e6e8e841ebe..ce9af5bda9ea 100644 --- a/patches/third_party/devtools-frontend/src/front_end-design_system_tokens.css.patch +++ b/patches/third_party/devtools-frontend/src/front_end-design_system_tokens.css.patch @@ -1,5 +1,5 @@ diff --git a/front_end/design_system_tokens.css b/front_end/design_system_tokens.css -index 799424b8cc1585ce010b50630cf6d53bf152c0eb..07b7fb1415595d8880df29dd477a25d7081edb69 100644 +index 60e701a7023a27d2179278ca76393155350753a7..c900af9f63518c4b2cef152f9d0c01c0691000ea 100644 --- a/front_end/design_system_tokens.css +++ b/front_end/design_system_tokens.css @@ -282,7 +282,7 @@ diff --git a/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch b/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch index 5eee044ec438..ecb23912a777 100644 --- a/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch +++ b/patches/third_party/devtools-frontend/src/front_end-panels-application-ApplicationPanelSidebar.ts.patch @@ -1,5 +1,5 @@ diff --git a/front_end/panels/application/ApplicationPanelSidebar.ts b/front_end/panels/application/ApplicationPanelSidebar.ts -index 9bb428622183a39df5101dbe6c98e5a66c96ee1c..108984b70a398fa8b703bd0f12e39a7c906e481e 100644 +index 62d2c45160902282d5910d77a04085ca42fbbe0d..d72a8858c5b33959f459acfeddfe55da7a2d0700 100644 --- a/front_end/panels/application/ApplicationPanelSidebar.ts +++ b/front_end/panels/application/ApplicationPanelSidebar.ts @@ -569,6 +569,7 @@ export class ApplicationPanelSidebar extends UI.Widget.VBox implements SDK.Targe 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 f5c2644bb12e..6662085c6eac 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 1eab0c9a70a8b88e66854047219a3bb11ef8a94c..82acf871be2ee5e14549c1fea29c570b86651f5c 100644 +index 56347974182cb3385a56926b2346dbeeebacf129..2ac20f42e01bcfd31be3fcb3f9f4ead24cb1cb43 100644 --- a/front_end/panels/network/NetworkDataGridNode.ts +++ b/front_end/panels/network/NetworkDataGridNode.ts -@@ -1506,6 +1506,7 @@ export class NetworkRequestNode extends NetworkNode { +@@ -1492,6 +1492,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 b89ea7cb772b..a7a72f8ab689 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 90769ae7840cd6bcd8c679d561c08390333661be..002e4fc731cd2f099ba9379e647a97021accfff6 100644 +index 6f420138cacd5bf8c114eadfd9cfabab20ce2fd2..9f83f5f42bc12dd1a7dc2fd086cf101c2292bcc4 100644 --- a/front_end/panels/network/NetworkItemView.ts +++ b/front_end/panels/network/NetworkItemView.ts -@@ -359,3 +359,4 @@ export class NetworkItemView extends UI.TabbedPane.TabbedPane { +@@ -357,3 +357,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 2c14c9cd1377..e258b1c51caa 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 75be5f2b93328245b44d66b34b9dbd36e5ba2e93..3661dd9891cdd046ce6365ccfeacb7dbdf5bc76d 100644 +index 08b5e840ec11a834cc8f52aba622584c6b635329..2b48df8f2f8412eb464377c2911dc7de316a3c69 100644 --- a/front_end/panels/timeline/components/LiveMetricsView.ts +++ b/front_end/panels/timeline/components/LiveMetricsView.ts -@@ -1095,7 +1095,7 @@ export class LiveMetricsView extends LegacyWrapper.LegacyWrapper.WrappableCompon +@@ -1123,7 +1123,7 @@ export class LiveMetricsView extends LegacyWrapper.LegacyWrapper.WrappableCompon