Update patches from Chromium 137.0.7151.16 to Chromium 137.0.7151.27.
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/features/tab_ui/BUILD.gn b/chrome/android/features/tab_ui/BUILD.gn
|
||||
index e06b1360b910cc88b63b21519985e4c2a51419c5..1a8d807e79780e89ac192b9ec0b724b11bc96654 100644
|
||||
index faf9c9b51a1f2e42244daafe03b7c594d052696c..cf8b8db1eb11b82cf476bed82c0faec2150d7db1 100644
|
||||
--- a/chrome/android/features/tab_ui/BUILD.gn
|
||||
+++ b/chrome/android/features/tab_ui/BUILD.gn
|
||||
@@ -127,6 +127,7 @@ android_resources("java_resources") {
|
||||
@@ -125,6 +125,7 @@ android_resources("java_resources") {
|
||||
"java/res/xml/tab_archive_time_delta_preference.xml",
|
||||
"java/res/xml/tabs_settings.xml",
|
||||
]
|
||||
|
||||
+2
-2
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
|
||||
index 1c5b565f035e1004177c6624457337ec4db5739f..8ad02391e7a34d0ba689cb1fbfc1afcfc093a694 100644
|
||||
index 6427bd3d6ded54ccf921a8b4b229f8a03c1c7d96..a7f4fdfc2b791cef28898581eb8975affb89c431 100644
|
||||
--- a/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
|
||||
+++ b/chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/FeedSurfaceMediator.java
|
||||
@@ -380,7 +380,7 @@ public class FeedSurfaceMediator
|
||||
@@ -392,7 +392,7 @@ public class FeedSurfaceMediator
|
||||
// Start is showing, update the value of Pref.ENABLE_SNIPPETS_BY_DSE here. The
|
||||
// value should be updated before adding an observer to prevent an extra call of
|
||||
// updateContent().
|
||||
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
|
||||
index 545b9ee31756d533eba47e406835b0829b0ae81c..863e6d59a1ff924dcf2e0388d61dff4f5eaff69b 100644
|
||||
index a326a5b1e637afefe28214e83ac43b0614bacada..6c6329e43acef8b67f3341c47c0b3ca00e6d172c 100644
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenHtmlApiHandlerBase.java
|
||||
@@ -300,6 +300,7 @@ public abstract class FullscreenHtmlApiHandlerBase
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
|
||||
index af2e3e406aeceab0a1c0b55a07ef663232dd9110..e5681e0a88ab93094abb539cb2975902727862df 100644
|
||||
index 855d316c6a89dd783114f24ef073820b9a68670c..e68f43605897843bbc99cf1909cc8fbb3e03a72b 100644
|
||||
--- a/chrome/browser/about_flags.cc
|
||||
+++ b/chrome/browser/about_flags.cc
|
||||
@@ -4609,6 +4609,7 @@ const FeatureEntry::FeatureVariation
|
||||
@@ -4616,6 +4616,7 @@ const FeatureEntry::FeatureVariation
|
||||
//
|
||||
// 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/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
index a333dcbe56bd283c67d025b8ff4e4d2716ef8b5f..d7ce000d76f6cc3898128712dd2aa3fa60f7f32c 100644
|
||||
index 49c051ea6eabc0d708c630c38b05cd9996fdaab5..2441e800e3dfc5ff0d489d8358234373d6e92108 100644
|
||||
--- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
|
||||
@@ -2396,6 +2396,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
|
||||
@@ -2397,6 +2397,7 @@ void RenderViewContextMenu::AppendSearchProvider() {
|
||||
if (!selection_navigation_url_.is_valid()) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
|
||||
index 7a075931cc1467283ac599b06399386917ead790..fe0272bffe8331f69b17b8691eb6cf6aeb526a56 100644
|
||||
index 93096ad92c1a36ca4bd964e87365c01f62a523a3..db8998b43d0ea6595af67425f54e6ac5da22da7f 100644
|
||||
--- a/chrome/browser/ui/BUILD.gn
|
||||
+++ b/chrome/browser/ui/BUILD.gn
|
||||
@@ -759,6 +759,7 @@ static_library("ui") {
|
||||
@@ -22,7 +22,7 @@ index 7a075931cc1467283ac599b06399386917ead790..fe0272bffe8331f69b17b8691eb6cf6a
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5774,6 +5778,7 @@ static_library("ui_public_dependencies") {
|
||||
@@ -5772,6 +5776,7 @@ static_library("ui_public_dependencies") {
|
||||
if (enable_extensions_core) {
|
||||
public_deps += [ "//extensions/browser" ]
|
||||
}
|
||||
|
||||
+2
-2
@@ -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 8d0dd058f2909da32289e583c6911165f0593e55..eeaf0c939feb11f460539e16321c68c635b6eb99 100644
|
||||
index 5804f8e923a97feb5d6b58534da11d5edb3e82d1..ca105f3d3fe1fd5e202987aa5f830362acd16db4 100644
|
||||
--- a/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
+++ b/chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
|
||||
@@ -3823,6 +3823,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
|
||||
@@ -3831,6 +3831,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
|
||||
policy_indicator::AddLocalizedStrings(html_source);
|
||||
AddSecurityKeysStrings(html_source);
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm b/content/app_shim_remote_cocoa/render_widget_host_view_cocoa.mm
|
||||
index a6b6917ee2c02c091aa51b55449d93fa55e06ac2..e323fb95df8213239d6f3f8ccbd17a441c38a4fe 100644
|
||||
index 1b458cd3bfc444fd380b4c426bb7844d5ac1b47a..240e427655ba418c777667982c4e46ffdffd07df 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
|
||||
@@ -2038,6 +2038,7 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
@@ -2047,6 +2047,7 @@ void ExtractUnderlines(NSAttributedString* string,
|
||||
}
|
||||
|
||||
- (id)accessibilityParent {
|
||||
|
||||
@@ -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 ebf407904b9b9bc7f60a9c13a5c39ce64640189d..8e6cf02c418639b4e93beecf7ce8ae3be96c7d6d 100644
|
||||
index 8ec8da33fe2ba85e4689102375a2ba8d94aac2de..272f8708eb0bd17a8afc51b941484c3d1cd738eb 100644
|
||||
--- a/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
+++ b/content/browser/renderer_host/render_frame_host_impl.cc
|
||||
@@ -5235,6 +5235,7 @@ net::IsolationInfo RenderFrameHostImpl::ComputeIsolationInfoInternal(
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/net/BUILD.gn b/net/BUILD.gn
|
||||
index 46a8062a7b4b8f8d863ba4ff4068ca0731ff40ce..2d349a1463b3fe6707b532f4bf7abbd300a33428 100644
|
||||
index 4afb45ca68ae26bdbfd9814e28e4755d519dd309..5ed25dd6e8163553180e76105202264bac95eb65 100644
|
||||
--- a/net/BUILD.gn
|
||||
+++ b/net/BUILD.gn
|
||||
@@ -1203,6 +1203,7 @@ component("net") {
|
||||
@@ -1205,6 +1205,7 @@ component("net") {
|
||||
"reporting/reporting_uploader.h",
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user