Skip to content

Commit

Permalink
Merge pull request #27823 from brave/cr134.0.6998.x-on-1.76.x
Browse files Browse the repository at this point in the history
[1.76.x] Update from Chromium 134.0.6998.24 to Chromium 134.0.6998.39
  • Loading branch information
kjozwiak authored Feb 26, 2025
2 parents 0f92e80 + ceeb8ad commit b598582
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 25 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
package org.chromium.chrome.browser.tabbed_mode;

import android.os.Bundle;
import android.view.View;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand Down Expand Up @@ -107,8 +106,7 @@ public BraveTabbedRootUiCoordinator(
@NonNull BackPressManager backPressManager,
@Nullable Bundle savedInstanceState,
@Nullable MultiInstanceManager multiInstanceManager,
@Nullable ObservableSupplier<Integer> overviewColorSupplier,
@Nullable View baseChromeLayout,
@NonNull ObservableSupplier<Integer> overviewColorSupplier,
@NonNull ManualFillingComponentSupplier manualFillingComponentSupplier,
@NonNull EdgeToEdgeManager edgeToEdgeManager) {
super(
Expand Down Expand Up @@ -156,7 +154,6 @@ public BraveTabbedRootUiCoordinator(
savedInstanceState,
multiInstanceManager,
overviewColorSupplier,
baseChromeLayout,
manualFillingComponentSupplier,
edgeToEdgeManager);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,6 @@ public BraveToolbarManager(
boolean initializeWithIncognitoColors,
@Nullable BackPressManager backPressManager,
@Nullable ObservableSupplier<Integer> overviewColorSupplier,
@Nullable View baseChromeLayout,
ObservableSupplier<ReadAloudController> readAloudControllerSupplier,
@Nullable DesktopWindowStateManager desktopWindowStateManager) {
super(
Expand Down Expand Up @@ -223,7 +222,6 @@ public BraveToolbarManager(
initializeWithIncognitoColors,
backPressManager,
overviewColorSupplier,
baseChromeLayout,
readAloudControllerSupplier,
desktopWindowStateManager);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,6 @@ public void testConstructorsExistAndMatch() throws Exception {
boolean.class,
BackPressManager.class,
ObservableSupplier.class,
View.class,
ObservableSupplier.class,
DesktopWindowStateManager.class));
Assert.assertTrue(
Expand Down Expand Up @@ -1587,7 +1586,6 @@ public void testConstructorsExistAndMatch() throws Exception {
Bundle.class,
MultiInstanceManager.class,
ObservableSupplier.class,
View.class,
ManualFillingComponentSupplier.class,
EdgeToEdgeManager.class));
Assert.assertTrue(
Expand Down
3 changes: 3 additions & 0 deletions app/generated_resources.grd
Original file line number Diff line number Diff line change
Expand Up @@ -8154,6 +8154,9 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_NTP_MODULES_MICROSOFT_FILES_DISABLE_BUTTON_TEXT" desc="Text shown on the disable button of a NTP Microsoft files card.">
Don't show SharePoint and OneDrive files
</message>
<message name="IDS_NTP_MODULES_MICROSOFT_FILES_TRENDING_JUSTIFICATION_TEXT" desc="Text shown on the NTP Microsoft files card.">
Suggested for you
</message>
<message name="IDS_NTP_MODULES_DISMISS_FOR_HOURS_BUTTON_TEXT" desc="Text shown on the dismiss button of an NTP module that specifies length of time in hours.">
Hide for <ph name="MODULE_TITLE">$1<ex>5</ex></ph> hours
</message>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 20 00:03:02 2025
# Last updated: Wed Feb 26 16:06:53 2025
PinsListTimestamp
1740009782
1740586013
# =====BEGIN BRAVE ROOTS ASC=====
#From https://www.amazontrust.com/repository/
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"projects": {
"chrome": {
"dir": "src",
"tag": "134.0.6998.24",
"tag": "134.0.6998.39",
"repository": {
"url": "https://github.com/brave/chromium"
}
Expand Down Expand Up @@ -225,4 +225,4 @@
"elliptic": "6.6.1",
"esbuild": "0.25.0"
}
}
}
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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;
Expand All @@ -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));
Expand Down
6 changes: 3 additions & 3 deletions patches/chrome-browser-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
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" ]
}
+ import("//brave/browser/sources.gni") sources += brave_chrome_browser_sources deps += brave_chrome_browser_deps public_deps += brave_chrome_browser_public_deps allow_circular_includes_from += brave_chrome_browser_allow_circular_includes_from

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",
]
}
Expand Down
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion patches/content-browser-BUILD.gn.patch
Original file line number Diff line number Diff line change
@@ -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") {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down

0 comments on commit b598582

Please sign in to comment.