Update patches from Chromium 140.0.7339.26 to Chromium 140.0.7339.41.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
index ecd7d789613f16c272494525bf6795dfed7bac5f..9698b3d0938a159e726e57f671f96e81d2a1ada9 100644
|
||||
index ae70ded0b977e4f11430a583554ec99378c1bc34..a19551c76e7d90a8d7e57760b43c840ca29869b1 100644
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4910,6 +4910,7 @@ constexpr char kWebiumFlag[] = "webium";
|
||||
@@ -4926,6 +4926,7 @@ constexpr char kWebiumFlag[] = "webium";
|
||||
//
|
||||
// When adding a new choice, add it to the end of the list.
|
||||
const FeatureEntry kFeatureEntries[] = {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
index a8a3e3d67ef0d1d23d80068eca352fbd1dfa7c85..61d6f8aafe69c77ac6f5587193612b8577edf98d 100644
|
||||
index c5f6bf0cb79bb0ce671e0365617320b646566ef0..06df5d55db728da95e5ae6c86e007e069b263fc1 100644
|
||||
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
@@ -2335,6 +2335,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
|
||||
@@ -10,7 +10,7 @@ index a8a3e3d67ef0d1d23d80068eca352fbd1dfa7c85..61d6f8aafe69c77ac6f5587193612b85
|
||||
|
||||
std::u16string printable_selection_text = PrintableSelectionText();
|
||||
EscapeAmpersands(&printable_selection_text);
|
||||
@@ -4860,29 +4861,32 @@ void RenderViewContextMenu::OpenLinkInSplitView() {
|
||||
@@ -4872,29 +4873,32 @@ void RenderViewContextMenu::OpenLinkInSplitView() {
|
||||
if (tab != source_tab) {
|
||||
// Navigate the tab that wasn't the source of the context menu to the
|
||||
// URL
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
index ead97b7634ab102af10618935b0192162de4fd68..20e326292669dfe2ff6bbc4a3b5abddd9491400a 100644
|
||||
index 08ed584f529f787e4a19240fe7627441fd0f2d8a..519aa74da7169474bac95135a729573dd544d084 100644
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -747,6 +747,7 @@ static_library("ui") {
|
||||
@@ -748,6 +748,7 @@ static_library("ui") {
|
||||
# from //chrome/browser/ui/webui, which are not modularized yet.
|
||||
"//chrome/browser/ui/webui/about:impl",
|
||||
]
|
||||
@@ -10,7 +10,7 @@ index ead97b7634ab102af10618935b0192162de4fd68..20e326292669dfe2ff6bbc4a3b5abddd
|
||||
|
||||
if (enable_vr && is_win) {
|
||||
deps += [ "//chrome/browser/vr:vr_base" ]
|
||||
@@ -3369,7 +3370,10 @@ static_library("ui") {
|
||||
@@ -3370,7 +3371,10 @@ static_library("ui") {
|
||||
"//chrome/updater/app/server/win:updater_legacy_idl",
|
||||
]
|
||||
} else {
|
||||
@@ -22,7 +22,7 @@ index ead97b7634ab102af10618935b0192162de4fd68..20e326292669dfe2ff6bbc4a3b5abddd
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5535,6 +5539,7 @@ static_library("ui_public_dependencies") {
|
||||
@@ -5536,6 +5540,7 @@ static_library("ui_public_dependencies") {
|
||||
if (enable_extensions_core) {
|
||||
public_deps += [ "//extensions/browser" ]
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/ui/android/toolbar/BUILD.gn b/chrome/browser/ui/android/toolbar/BUILD.gn
|
||||
index 53b2a319149e003462c34d7f6c02369ddd65a61a..b29aedf0b6c152945fb4c43607f7cb11bfcc63d7 100644
|
||||
index 6f74e4e33637ec09ebdc586ad407a2ebbbdf4af3..1cd0e8450ed03fa0f2e577cea937e992ce1f404b 100644
|
||||
--- a/chrome/browser/ui/android/toolbar/BUILD.gn
|
||||
+++ b/chrome/browser/ui/android/toolbar/BUILD.gn
|
||||
@@ -138,6 +138,7 @@ android_library("java") {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/ui/tabs/tab_strip_model.h b/chrome/browser/ui/tabs/tab_strip_model.h
|
||||
index 2f09a4f136216d6b00e87184d0b28b0cc255a3a2..3832763ad5fae3f476e54264dba2fdd5a2a5809f 100644
|
||||
index 06b4aee0bc6ad70fa8618612eda80fdad575ea36..fdd54a0ffd77e45a29d4f1931810d46b05b6dad9 100644
|
||||
--- a/chrome/browser/ui/tabs/tab_strip_model.h
|
||||
+++ b/chrome/browser/ui/tabs/tab_strip_model.h
|
||||
@@ -202,6 +202,7 @@ class TabStripModel {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
index f0ea7d2eabe61d586901918420defe0640330654..6cd6fc3734200cf3b4402cce84dead76785864d5 100644
|
||||
index d2dfb815c086f63f4d08af82a900f46565069637..8b3242f5309ce640df8841328933ca121f2e2b51 100644
|
||||
--- a/chrome/browser/ui/views/frame/browser_view.cc
|
||||
+++ b/chrome/browser/ui/views/frame/browser_view.cc
|
||||
@@ -708,6 +708,7 @@ bool ConvertedHitTest(views::View* src, views::View* dst, gfx::Point* point) {
|
||||
|
||||
@@ -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 17880bc0b8ecf9a5c18400ee97f2b2f9c0fb88f2..732508fb6c3122fcceda0c68e870a34a6bca438a 100644
|
||||
index 42c8e0a00c7c1dc1324da956bc49db2322099c35..a7e7c02096559b538f7877ae90effa31c6ce08f2 100644
|
||||
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
|
||||
@@ -732,6 +732,7 @@ void LocationBarView::Layout(PassKey) {
|
||||
@@ -729,6 +729,7 @@ void LocationBarView::Layout(PassKey) {
|
||||
.indent_input_when_popup_closed) &&
|
||||
!location_icon_view_->ShouldShowLabel() &&
|
||||
!ShouldShowKeywordBubble();
|
||||
@@ -10,7 +10,7 @@ index 17880bc0b8ecf9a5c18400ee97f2b2f9c0fb88f2..732508fb6c3122fcceda0c68e870a34a
|
||||
if (should_indent) {
|
||||
icon_left += 7 /*icon_indent*/;
|
||||
icon_left += omnibox_feature_configs::AdjustOmniboxIndent()
|
||||
@@ -818,6 +819,7 @@ void LocationBarView::Layout(PassKey) {
|
||||
@@ -815,6 +816,7 @@ void LocationBarView::Layout(PassKey) {
|
||||
}
|
||||
selected_keyword_view_->SetCustomImage(image);
|
||||
}
|
||||
@@ -18,7 +18,7 @@ index 17880bc0b8ecf9a5c18400ee97f2b2f9c0fb88f2..732508fb6c3122fcceda0c68e870a34a
|
||||
} else if (location_icon_view_->GetShowText() &&
|
||||
!ShouldChipOverrideLocationIcon()) {
|
||||
location_icon_view_->SetVisible(true);
|
||||
@@ -865,6 +867,7 @@ void LocationBarView::Layout(PassKey) {
|
||||
@@ -862,6 +864,7 @@ void LocationBarView::Layout(PassKey) {
|
||||
}
|
||||
};
|
||||
|
||||
@@ -26,7 +26,7 @@ index 17880bc0b8ecf9a5c18400ee97f2b2f9c0fb88f2..732508fb6c3122fcceda0c68e870a34a
|
||||
add_trailing_decoration(page_action_icon_container_,
|
||||
/*intra_item_padding=*/0);
|
||||
add_trailing_decoration(page_action_container_,
|
||||
@@ -880,6 +883,7 @@ void LocationBarView::Layout(PassKey) {
|
||||
@@ -877,6 +880,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 655b2041f9d59f312bd0ae63b663d4348378d465..47272d0f1d66a1e94493e78370d43708572cc935 100644
|
||||
index dc9c8fb3ff2de86704d2298ddfb1c39c4bf695e3..310374c79470344b5fcebde74317d1cb5fd6f2a0 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/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
|
||||
index 2d15968db4a872adcfa6d13a458b83ea2d0cd98e..2f95b5fc8d984132bb821ec885e3bc79b3f8be8f 100644
|
||||
index 32cd4c7b7ed0d0e788862e9470048171f6cd7fd2..026bc270fd54e453ab19c50e86af60e4e7cae009 100644
|
||||
--- a/chrome/browser/ui/views/tabs/tab.cc
|
||||
+++ b/chrome/browser/ui/views/tabs/tab.cc
|
||||
@@ -361,6 +361,7 @@ void Tab::Layout(PassKey) {
|
||||
@@ -364,6 +364,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 2d15968db4a872adcfa6d13a458b83ea2d0cd98e..2f95b5fc8d984132bb821ec885e3bc79
|
||||
if (center_icon_) {
|
||||
// When centering the favicon, the favicon is allowed to escape the normal
|
||||
// contents rect.
|
||||
@@ -459,6 +460,7 @@ void Tab::Layout(PassKey) {
|
||||
@@ -462,6 +463,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 2d15968db4a872adcfa6d13a458b83ea2d0cd98e..2f95b5fc8d984132bb821ec885e3bc79
|
||||
} else if (showing_close_button_) {
|
||||
// Allow the title to overlay the close button's empty border padding.
|
||||
title_right = close_x - after_title_padding;
|
||||
@@ -1181,6 +1183,7 @@ void Tab::UpdateIconVisibility() {
|
||||
@@ -1184,6 +1186,7 @@ void Tab::UpdateIconVisibility() {
|
||||
!controller_->IsLockedForOnTask() &&
|
||||
#endif
|
||||
large_enough_for_close_button;
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/components/omnibox/browser/featured_search_provider.cc b/components/omnibox/browser/featured_search_provider.cc
|
||||
index 0f553dc87f01c02cac5ef8835b6bc8f30395ab18..bf29bc050e061570c7b042d03316a8ac02cd5c58 100644
|
||||
index 0e8fbc5f7e031c213c59a47a3c340ace6d7dd3d9..66fc35f0cfb4d92ebb64ee47e68ffc6dd3811bc5 100644
|
||||
--- a/components/omnibox/browser/featured_search_provider.cc
|
||||
+++ b/components/omnibox/browser/featured_search_provider.cc
|
||||
@@ -289,6 +289,7 @@ void FeaturedSearchProvider::AddFeaturedKeywordMatches(
|
||||
@@ -290,6 +290,7 @@ void FeaturedSearchProvider::AddFeaturedKeywordMatches(
|
||||
for (TemplateURL* turl : turls) {
|
||||
if (turl->starter_pack_id() > 0 &&
|
||||
turl->is_active() == TemplateURLData::ActiveStatus::kTrue) {
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
||||
index adce27e6feaed7172cac9bdcd1b2e83930eb0a77..d83426d65ce612d01fb15c5da58e0072923b73be 100644
|
||||
index dfc54c87eabbb33277ed145e78f8eef592da9ea2..3092c4983ac99f4cba184f430b7e360b31c0e7e6 100644
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -3673,6 +3673,7 @@ source_set("browser") {
|
||||
@@ -3674,6 +3674,7 @@ source_set("browser") {
|
||||
if (is_chromeos) {
|
||||
deps += [ "//ash/constants" ]
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/content/browser/renderer_host/navigation_request.cc b/content/browser/renderer_host/navigation_request.cc
|
||||
index 24d2fc92266d1d398ee43e08a56cc05d9ff6eca3..b140877784043f8a9bde91bef0298d189376fa0e 100644
|
||||
index 4288bf261741e4260b7a3117618fa19d39b20d2c..fa9807bee630193b9ef4f0ad9e887138dafab452 100644
|
||||
--- a/content/browser/renderer_host/navigation_request.cc
|
||||
+++ b/content/browser/renderer_host/navigation_request.cc
|
||||
@@ -3646,6 +3646,7 @@ void NavigationRequest::OnRequestRedirected(
|
||||
@@ -3648,6 +3648,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 24d2fc92266d1d398ee43e08a56cc05d9ff6eca3..b140877784043f8a9bde91bef0298d18
|
||||
common_params_->referrer = Referrer::SanitizeForRequest(
|
||||
common_params_->url, *common_params_->referrer);
|
||||
|
||||
@@ -5487,6 +5488,7 @@ void NavigationRequest::OnStartChecksComplete(
|
||||
@@ -5489,6 +5490,7 @@ void NavigationRequest::OnStartChecksComplete(
|
||||
headers.MergeFrom(TakeModifiedRequestHeaders());
|
||||
begin_params_->headers = headers.ToString();
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/ios/chrome/browser/shared/model/prefs/browser_prefs.mm b/ios/chrome/browser/shared/model/prefs/browser_prefs.mm
|
||||
index 31ed2da8b26bde35c3dc73801a1a0ed82012ac02..2b77879d565c975ef059b89f3d25024e4c79ac37 100644
|
||||
index 7d88b0ae8b22a4b329c1e9e9c7e89ad7a49e0ee3..4fb1468cff9b0538d0fc938a5fe9fe4013010f09 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) {
|
||||
@@ -681,6 +681,7 @@ void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
|
||||
prefs::kNTPHomeCustomizationNewBadgeImpressionCount, 0);
|
||||
|
||||
registry->RegisterBooleanPref(prefs::kWidgetsForMultiProfile, false);
|
||||
@@ -10,7 +10,7 @@ index 31ed2da8b26bde35c3dc73801a1a0ed82012ac02..2b77879d565c975ef059b89f3d25024e
|
||||
}
|
||||
|
||||
void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
@@ -1120,6 +1121,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
@@ -1124,6 +1125,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry) {
|
||||
// Deprecated 08/2025.
|
||||
registry->RegisterDictionaryPref(kInvalidationClientIDCache);
|
||||
registry->RegisterDictionaryPref(kInvalidationTopicsToHandler);
|
||||
|
||||
Reference in New Issue
Block a user