Update patches from Chromium 134.0.6998.24 to Chromium 134.0.6998.39.
This commit is contained in:
+4
-4
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
||||
index 5809857296239a98582242dd34fd62d9b968e09f..bc066980e98e6254157ed885617ca495ea1b662f 100644
|
||||
index 86d47316899b1872d4d6751f5154f3d6f469e25f..9d57752110c2d69538550c05e856054821ed9120 100644
|
||||
--- a/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
||||
+++ b/chrome/android/java/src/org/chromium/chrome/browser/contextmenu/ChromeContextMenuPopulator.java
|
||||
@@ -162,7 +162,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
||||
@@ -172,7 +172,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
||||
Action.SHARE_HIGHLIGHT,
|
||||
Action.REMOVE_HIGHLIGHT,
|
||||
Action.LEARN_MORE,
|
||||
@@ -11,7 +11,7 @@ index 5809857296239a98582242dd34fd62d9b968e09f..bc066980e98e6254157ed885617ca495
|
||||
})
|
||||
@Retention(RetentionPolicy.SOURCE)
|
||||
public @interface Action {
|
||||
@@ -207,7 +207,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
||||
@@ -217,7 +217,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
||||
int LEARN_MORE = 38;
|
||||
int OPEN_IN_NEW_TAB_IN_GROUP = 39;
|
||||
int OPEN_IN_NEW_WINDOW = 40;
|
||||
@@ -20,7 +20,7 @@ index 5809857296239a98582242dd34fd62d9b968e09f..bc066980e98e6254157ed885617ca495
|
||||
}
|
||||
}
|
||||
|
||||
@@ -364,6 +364,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
||||
@@ -374,6 +374,7 @@ public class ChromeContextMenuPopulator implements ContextMenuPopulator {
|
||||
if (!MailTo.isMailTo(mParams.getLinkUrl().getSpec())
|
||||
&& !UrlUtilities.isTelScheme(mParams.getLinkUrl())) {
|
||||
linkGroup.add(createListItem(Item.COPY_LINK_ADDRESS));
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
|
||||
index 9f293f4ddd146e183e50ad3a99f464c10d2aaab5..8f586a970c7f8713d5ceae7162434ab86f0c45a8 100644
|
||||
index ab4deb1a228f512166251cce44aac7138e53c1f8..650636a69ae45b6515d5fb287335b4fe3fd4e066 100644
|
||||
--- a/chrome/browser/BUILD.gn
|
||||
+++ b/chrome/browser/BUILD.gn
|
||||
@@ -2523,6 +2523,7 @@ static_library("browser") {
|
||||
@@ -2529,6 +2529,7 @@ static_library("browser") {
|
||||
} else {
|
||||
sources += [ "net/net_error_diagnostics_dialog_stub.cc" ]
|
||||
}
|
||||
@@ -10,7 +10,7 @@ index 9f293f4ddd146e183e50ad3a99f464c10d2aaab5..8f586a970c7f8713d5ceae7162434ab8
|
||||
|
||||
if (is_android) {
|
||||
sources += [
|
||||
@@ -8363,6 +8364,7 @@ static_library("browser_public_dependencies") {
|
||||
@@ -8373,6 +8374,7 @@ static_library("browser_public_dependencies") {
|
||||
"//rlz:rlz_lib",
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/components/safe_browsing/core/common/safe_browsing_prefs.cc b/components/safe_browsing/core/common/safe_browsing_prefs.cc
|
||||
index b57696fbfa3912ce860f6d2f51bf8edef28f3e58..d825fbaab246c3d9c1029c3bfc06f6645987e66e 100644
|
||||
index 90ec1b9162127253c0da2a0b08ca0f3dddae344d..5e2d27b9a63ae8db40a00e290f1795477e61e13f 100644
|
||||
--- a/components/safe_browsing/core/common/safe_browsing_prefs.cc
|
||||
+++ b/components/safe_browsing/core/common/safe_browsing_prefs.cc
|
||||
@@ -115,6 +115,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) {
|
||||
@@ -118,6 +118,7 @@ bool IsSafeBrowsingEnabled(const PrefService& prefs) {
|
||||
}
|
||||
|
||||
bool IsEnhancedProtectionEnabled(const PrefService& prefs) {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
|
||||
index fec51f705d1a8424fdbff13d33aa6a2b16a650e5..a5ad37106c3df08646ac8df75f0c3bd02994464e 100644
|
||||
index fcb315726a70b150bf2238eef717dafcc8d8efd0..e592df7532ed7cf29e6d17fae6353b9a46b1f723 100644
|
||||
--- a/content/browser/BUILD.gn
|
||||
+++ b/content/browser/BUILD.gn
|
||||
@@ -3616,6 +3616,7 @@ source_set("browser") {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/third_party/blink/renderer/platform/runtime_enabled_features.json5 b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
index 747ab52de6cbdfa39e8e9f97cae29f76448a6580..1dd23e54e8c078d328127208f09681287df7bd30 100644
|
||||
index b6f5a0ec579296b052074b76c42016bfa71fc9da..30a0f38d45d4d59913f131074aa7e63e8b8d938e 100644
|
||||
--- a/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
+++ b/third_party/blink/renderer/platform/runtime_enabled_features.json5
|
||||
@@ -2002,6 +2002,7 @@
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/ui/accessibility/platform/ax_platform_node_cocoa.mm b/ui/accessibility/platform/ax_platform_node_cocoa.mm
|
||||
index 3238bbfa2e1edc33e8d37c4819ae261ce2ecd97f..c021b4cb5bb3f18b9600d636c403bc1d032419c2 100644
|
||||
index 22b6d93a515d961fb665754196f182b6c487ad4e..03e7209c6146380b36e298cb6fc25edd45b7a44a 100644
|
||||
--- a/ui/accessibility/platform/ax_platform_node_cocoa.mm
|
||||
+++ b/ui/accessibility/platform/ax_platform_node_cocoa.mm
|
||||
@@ -3433,6 +3433,7 @@ const ui::CocoaActionList& GetCocoaActionListForTesting() {
|
||||
@@ -3451,6 +3451,7 @@ const ui::CocoaActionList& GetCocoaActionListForTesting() {
|
||||
if (!_node)
|
||||
return nil;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user