Update patches from Chromium 140.0.7339.16 to Chromium 140.0.7339.26.

This commit is contained in:
Claudio DeSouza
2025-08-20 21:25:14 +01:00
parent 36d9f517d4
commit ca911223bb
21 changed files with 41 additions and 41 deletions
@@ -1,8 +1,8 @@
diff --git a/chrome/android/chrome_java_sources.gni b/chrome/android/chrome_java_sources.gni
index dd5e06033d2dc1f6a83270b00cb6f5112f3c6b26..3248f309643f8f4459e0140fb9066fc9f67b282c 100644
index b6f96bf8262eec950293cc697c3720217c47fe88..706fc2efebcf65cd3ebbfd6ac561c8046cc1cbbc 100644
--- a/chrome/android/chrome_java_sources.gni
+++ b/chrome/android/chrome_java_sources.gni
@@ -1225,3 +1225,4 @@ if (enable_screen_capture) {
@@ -1226,3 +1226,4 @@ if (enable_screen_capture) {
"java/src/org/chromium/chrome/browser/media/MediaCapturePickerItemViewBinder.java",
]
}
+3 -3
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 1e937348e3210b4a3cf2762cfd7cafd27650ffaf..8151f88c16423fe382cbe800938afcf54fe6a63c 100644
index 42292200196b51af4dc57e95f65876761bf6b892..147c408fe34f09c2b824f945ce7f0224170b2044 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -2690,6 +2690,7 @@ static_library("browser") {
@@ -2689,6 +2689,7 @@ static_library("browser") {
} else {
sources += [ "net/net_error_diagnostics_dialog_stub.cc" ]
}
@@ -10,7 +10,7 @@ index 1e937348e3210b4a3cf2762cfd7cafd27650ffaf..8151f88c16423fe382cbe800938afcf5
if (is_android) {
sources += [
@@ -8637,6 +8638,7 @@ static_library("browser_public_dependencies") {
@@ -8636,6 +8637,7 @@ static_library("browser_public_dependencies") {
"//rlz:rlz_lib",
]
}
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 25e52874f1092c3463a22e7de1500c3577cc05f8..0d0b083958174e7366bbaf66f7b3c3f4ddd7ee01 100644
index ecd7d789613f16c272494525bf6795dfed7bac5f..9698b3d0938a159e726e57f671f96e81d2a1ada9 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -4878,6 +4878,7 @@ constexpr char kWebiumFlag[] = "webium";
@@ -4910,6 +4910,7 @@ constexpr char kWebiumFlag[] = "webium";
//
// When adding a new choice, add it to the end of the list.
const FeatureEntry kFeatureEntries[] = {
@@ -1,8 +1,8 @@
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 0e758242353860f8aeb37ffc6225b44e7393a1b8..0b0c0da67220e480c39bb652067d29ba8228c8a3 100644
index d016286d9cb7ab38dda90bd38f0f77fb61d484df..99f193db502d84b5a3b66db316a730b2f8fc605c 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -1882,6 +1882,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
@@ -1883,6 +1883,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) {
#endif // !BUILDFLAG(IS_ANDROID)
// This is intentionally last.
@@ -10,7 +10,7 @@ index 0e758242353860f8aeb37ffc6225b44e7393a1b8..0b0c0da67220e480c39bb652067d29ba
RegisterLocalStatePrefsForMigration(registry);
}
@@ -2325,6 +2326,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
@@ -2327,6 +2328,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry,
registry->RegisterDictionaryPref(prefs::kReportingEndpoints);
registry->RegisterBooleanPref(prefs::kViewSourceLineWrappingEnabled, false);
+1 -1
View File
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index dec508b3eb4d55b661e258a6d8b01aea8309ef14..a36dc242fd02657d35bbf1dd6067950b3636f744 100644
index e099f30e5fdad38660acba7c2b6edea745991c61..30c515c696ad4146a883b34a4cf9c5d5c3023822 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -588,6 +588,7 @@ Browser* Browser::Create(const CreateParams& params) {
@@ -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 5fc63d210dcfd0943d0374061ce057fac60aed61..9fec62d89b5bf7af8f83dcef1c98af6e583df37d 100644
index a44457be1be5c01e947955f054f94a5f1b1c01ec..18d38d1e3c2136d28b91de7d6183ecd76b4adc27 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;
@@ -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 5e3f439c1d0f030aa45eb6b097d50ef7cb32e637..3eca2de77b89ea5a4082b8c16fdd0ea126a94b31 100644
index 17880bc0b8ecf9a5c18400ee97f2b2f9c0fb88f2..732508fb6c3122fcceda0c68e870a34a6bca438a 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -728,6 +728,7 @@ void LocationBarView::Layout(PassKey) {
@@ -732,6 +732,7 @@ void LocationBarView::Layout(PassKey) {
.indent_input_when_popup_closed) &&
!location_icon_view_->ShouldShowLabel() &&
!ShouldShowKeywordBubble();
@@ -10,7 +10,7 @@ index 5e3f439c1d0f030aa45eb6b097d50ef7cb32e637..3eca2de77b89ea5a4082b8c16fdd0ea1
if (should_indent) {
icon_left += 7 /*icon_indent*/;
icon_left += omnibox_feature_configs::AdjustOmniboxIndent()
@@ -814,6 +815,7 @@ void LocationBarView::Layout(PassKey) {
@@ -818,6 +819,7 @@ void LocationBarView::Layout(PassKey) {
}
selected_keyword_view_->SetCustomImage(image);
}
@@ -18,7 +18,7 @@ index 5e3f439c1d0f030aa45eb6b097d50ef7cb32e637..3eca2de77b89ea5a4082b8c16fdd0ea1
} else if (location_icon_view_->GetShowText() &&
!ShouldChipOverrideLocationIcon()) {
location_icon_view_->SetVisible(true);
@@ -861,6 +863,7 @@ void LocationBarView::Layout(PassKey) {
@@ -865,6 +867,7 @@ void LocationBarView::Layout(PassKey) {
}
};
@@ -26,7 +26,7 @@ index 5e3f439c1d0f030aa45eb6b097d50ef7cb32e637..3eca2de77b89ea5a4082b8c16fdd0ea1
add_trailing_decoration(page_action_icon_container_,
/*intra_item_padding=*/0);
add_trailing_decoration(page_action_container_,
@@ -876,6 +879,7 @@ void LocationBarView::Layout(PassKey) {
@@ -880,6 +883,7 @@ void LocationBarView::Layout(PassKey) {
}
add_trailing_decoration(clear_all_button_, /*intra_item_padding=*/0);
@@ -1,5 +1,5 @@
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index 2af0adb7138e1474ca95ecc2f9e485e3f8d440dd..12d7bc53782de0bf95680623aef7cf1c652363ff 100644
index 655b2041f9d59f312bd0ae63b663d4348378d465..47272d0f1d66a1e94493e78370d43708572cc935 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -131,6 +131,7 @@ class LocationBarView
@@ -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 76e5d77617474ee33ac77fe950dedb196347a1c4..8d89279935bf00e3ae351b9dda6b52e2e0064a3d 100644
index b51f9c92109822054d1f0a5eb76905ebd99f8521..9e3e008746c9f33ef3a11c8cb28d3083d5af9160 100644
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -3904,6 +3904,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
@@ -3902,6 +3902,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
policy_indicator::AddLocalizedStrings(html_source);
AddSecurityKeysStrings(html_source);
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 5e1202bd2a9118bdefe15be41a53c261c77aca62..3274300ae0f7943b07db0cc3712fae5489dcde6a 100644
index 6d3d642367280e4bc0d3a9e5ee68dca5a5c92f16..e51974ab0cc6993bcf9e5344e68c82861308ebc3 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -690,6 +690,7 @@ static_library("test_support") {
@@ -689,6 +689,7 @@ static_library("test_support") {
"//ui/gl",
]
@@ -1,8 +1,8 @@
diff --git a/components/embedder_support/user_agent_utils.cc b/components/embedder_support/user_agent_utils.cc
index c9338f0d14a0cc3dabf59321749435a3b2e381fc..7f05525db98d207594b06c77c350f30624006db0 100644
index 8c44d2265b3d3d02f507661517218bec8e6a0164..4ae8e395e62d4dcdfcfdd968bcf0cafd02d0579c 100644
--- a/components/embedder_support/user_agent_utils.cc
+++ b/components/embedder_support/user_agent_utils.cc
@@ -210,10 +210,11 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
@@ -205,10 +205,11 @@ const blink::UserAgentBrandList GetUserAgentBrandList(
#if !BUILDFLAG(CHROMIUM_BRANDING)
brand = version_info::GetProductName();
#endif
@@ -15,7 +15,7 @@ index c9338f0d14a0cc3dabf59321749435a3b2e381fc..7f05525db98d207594b06c77c350f306
: major_version;
return GenerateBrandVersionList(major_version_number, brand, brand_version,
@@ -940,6 +941,7 @@ std::string GetAndroidOSInfo(
@@ -946,6 +947,7 @@ std::string GetAndroidOSInfo(
// Send information about the device.
bool semicolon_inserted = false;
@@ -1,8 +1,8 @@
diff --git a/components/omnibox/browser/BUILD.gn b/components/omnibox/browser/BUILD.gn
index 8bd795ab9483f5a77129072da251bec4a19056fc..776b3d1ff6aeae64e6d6bdf63f8454667aff5de0 100644
index ce7b759072e84f0f5864d616fb40a1ba086e22a5..5bbfa6a6881473b2b7f2920ce021cd90e18426bc 100644
--- a/components/omnibox/browser/BUILD.gn
+++ b/components/omnibox/browser/BUILD.gn
@@ -405,6 +405,7 @@ static_library("browser") {
@@ -408,6 +408,7 @@ static_library("browser") {
"//ui/base",
"//ui/gfx",
]
@@ -10,7 +10,7 @@ index 8bd795ab9483f5a77129072da251bec4a19056fc..776b3d1ff6aeae64e6d6bdf63f845466
configs += [ "//build/config/compiler:wexit_time_destructors" ]
@@ -1026,6 +1027,7 @@ fuzzer_test("search_suggestion_parser_fuzzer") {
@@ -1033,6 +1034,7 @@ fuzzer_test("search_suggestion_parser_fuzzer") {
mojom("mojo_bindings") {
sources = [ "omnibox.mojom" ]
@@ -1,5 +1,5 @@
diff --git a/components/omnibox/browser/autocomplete_controller.cc b/components/omnibox/browser/autocomplete_controller.cc
index c308070e9b5f41b38de92725568f592ae362376c..f5e79535a06dc0804186aa1354d90b7e61545be3 100644
index 303d99eecd7c82266577135c6744291349098fa5..5282c5a9541653aff08f4863cd4dd66113957d75 100644
--- a/components/omnibox/browser/autocomplete_controller.cc
+++ b/components/omnibox/browser/autocomplete_controller.cc
@@ -1260,6 +1260,7 @@ void AutocompleteController::InitializeAsyncProviders(int provider_types) {
@@ -1,8 +1,8 @@
diff --git a/components/omnibox/browser/autocomplete_match.h b/components/omnibox/browser/autocomplete_match.h
index 314f749edd0ef19f056f7924b57424e14aba8c2f..bf38198f58b9be2ff1315e55112f2b45d2978396 100644
index dd6e14724bdb807d4c688f0971a7a5cc0f88ca32..b222ba8a3bb0dca298d0da21f55d197c9e795975 100644
--- a/components/omnibox/browser/autocomplete_match.h
+++ b/components/omnibox/browser/autocomplete_match.h
@@ -806,7 +806,7 @@ struct AutocompleteMatch {
@@ -809,7 +809,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).
@@ -1,5 +1,5 @@
diff --git a/components/permissions/BUILD.gn b/components/permissions/BUILD.gn
index b5442b7e564cde4cb4d7bca96dddaf29346d2d3e..a9d2180c052c63912614a9b8b6d71a6e0c63788e 100644
index 6f9f93f2c6339e88dc68de1a2995157237ea2666..9bc4a78dcab9b66083b7b712a155fcdf6a01dfdb 100644
--- a/components/permissions/BUILD.gn
+++ b/components/permissions/BUILD.gn
@@ -6,7 +6,7 @@ import("//components/guest_view/buildflags/buildflags.gni")
@@ -11,7 +11,7 @@ index b5442b7e564cde4cb4d7bca96dddaf29346d2d3e..a9d2180c052c63912614a9b8b6d71a6e
sources = [
"constants.cc",
"constants.h",
@@ -170,6 +170,7 @@ source_set("permissions") {
@@ -171,6 +171,7 @@ source_set("permissions") {
if (enable_guest_view) {
deps += [ "//components/guest_view/browser" ]
}
@@ -1,5 +1,5 @@
diff --git a/content/browser/renderer_host/render_frame_host_impl.cc b/content/browser/renderer_host/render_frame_host_impl.cc
index 0a02467f8dff5278b5cc530f6d08b2402b52098d..b9556073ed2c22c4e6fef6b0175a02aae767a0ac 100644
index 1aec55ce3bbe48bfcc11c7b60eb9039e0f5d9b72..d7b5eefa853fa3160cb8f4094727e4ed2786d1fa 100644
--- a/content/browser/renderer_host/render_frame_host_impl.cc
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
@@ -5263,6 +5263,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal(
@@ -1,5 +1,5 @@
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 2a7958de7e70e60de88d67be33d07194911f4110..a5de23809b0d5976924d87b534d028275d018796 100644
index 250acc1ce30e1d942bea7869c6425f5968ddca76..9ca88e6dd009cecf37fab3e015c8813e3bded9e9 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -907,6 +907,7 @@ void RenderThreadImpl::InitializeRenderer(
+2 -2
View File
@@ -1,8 +1,8 @@
diff --git a/ios/chrome/app/BUILD.gn b/ios/chrome/app/BUILD.gn
index fadba8bac89845f5179c6c1f7b0babdfe27a7e9f..0d481e8c93227ae9b83e7f0604caee939ecd7b25 100644
index 958bebd382b6aae0869755bd27f969ce8758c353..c3a4e38bd68b209ced07b5a93aca762e89aa6f27 100644
--- a/ios/chrome/app/BUILD.gn
+++ b/ios/chrome/app/BUILD.gn
@@ -827,8 +827,7 @@ chrome_app("chrome") {
@@ -828,8 +828,7 @@ chrome_app("chrome") {
# (see https://crbug.com/1394553 for details of the build failure). This
# is a stop-gap solution.
if (target_environment == "catalyst" ||
@@ -1,5 +1,5 @@
diff --git a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
index 77544a1f84731c65b41ed5eff4920a1874025a4d..8d98cd7ef9b1a2d5e3f4ba8118619572ede44f75 100644
index 31ed2da8b26bde35c3dc73801a1a0ed82012ac02..2b77879d565c975ef059b89f3d25024e4c79ac37 100644
--- a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
+++ b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
@@ -680,6 +680,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
@@ -10,7 +10,7 @@ index 77544a1f84731c65b41ed5eff4920a1874025a4d..8d98cd7ef9b1a2d5e3f4ba8118619572
}
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -1119,6 +1120,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
@@ -1120,6 +1121,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
// Deprecated 08/2025.
registry->RegisterDictionaryPref(kInvalidationClientIDCache);
registry->RegisterDictionaryPref(kInvalidationTopicsToHandler);
@@ -1,5 +1,5 @@
diff --git a/tools/metrics/histograms/metadata/page/histograms.xml b/tools/metrics/histograms/metadata/page/histograms.xml
index f9e17925142e67a5f26a4c12c44890fd9ad87c8a..697db003e99c4fec201bfc1dbacc8926742ed8c5 100644
index 46db8d032700e4b85393fdaa713bd6ce10d926f2..07e6c0bc1af084255a8db68dd6a4ba9af7ba4537 100644
--- a/tools/metrics/histograms/metadata/page/histograms.xml
+++ b/tools/metrics/histograms/metadata/page/histograms.xml
@@ -270,6 +270,17 @@ chromium-metrics-reviews@google.com.
@@ -1,5 +1,5 @@
diff --git a/tools/metrics/histograms/metadata/permissions/histograms.xml b/tools/metrics/histograms/metadata/permissions/histograms.xml
index db0401c19093641210734c840e0a1270d80cfc5b..ecc0174c63ca82da35759135a6c38f59d2833bd1 100644
index 11d7010cfca75f364e8286f1c5536b50646bf043..a4b427dda55eb60d9ce04bc44015a9943c0c47d7 100644
--- a/tools/metrics/histograms/metadata/permissions/histograms.xml
+++ b/tools/metrics/histograms/metadata/permissions/histograms.xml
@@ -43,6 +43,7 @@ chromium-metrics-reviews@google.com.