diff --git a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java index c7ac84e05638..19d9e8c0c9f6 100644 --- a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java +++ b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabActivity.java @@ -112,7 +112,6 @@ protected RootUiCoordinator createRootUiCoordinator() { () -> mTabController, () -> mMinimizationManagerHolder.getMinimizationManager(), () -> mCustomTabFeatureOverridesManager, - getBaseChromeLayout(), getEdgeToEdgeManager()); return mBaseCustomTabRootUiCoordinator; } diff --git a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java index b28a53c0143f..e5b360844b4b 100644 --- a/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java +++ b/android/java/org/chromium/chrome/browser/customtabs/FullScreenCustomTabRootUiCoordinator.java @@ -5,10 +5,7 @@ package org.chromium.chrome.browser.customtabs; -import android.view.View; - import androidx.annotation.NonNull; -import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; import org.chromium.base.supplier.ObservableSupplier; @@ -84,7 +81,6 @@ public FullScreenCustomTabRootUiCoordinator( @NonNull Supplier tabController, @NonNull Supplier minimizeDelegateSupplier, @NonNull Supplier featureOverridesManagerSupplier, - @Nullable View baseChromeLayout, @NonNull EdgeToEdgeManager edgeToEdgeManager) { super( activity, @@ -121,7 +117,6 @@ public FullScreenCustomTabRootUiCoordinator( tabController, minimizeDelegateSupplier, featureOverridesManagerSupplier, - baseChromeLayout, edgeToEdgeManager); } diff --git a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java index 82105b23935c..36afd835b4fd 100644 --- a/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java +++ b/android/java/org/chromium/chrome/browser/tabbed_mode/BraveTabbedRootUiCoordinator.java @@ -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; @@ -107,8 +106,7 @@ public BraveTabbedRootUiCoordinator( @NonNull BackPressManager backPressManager, @Nullable Bundle savedInstanceState, @Nullable MultiInstanceManager multiInstanceManager, - @Nullable ObservableSupplier overviewColorSupplier, - @Nullable View baseChromeLayout, + @NonNull ObservableSupplier overviewColorSupplier, @NonNull ManualFillingComponentSupplier manualFillingComponentSupplier, @NonNull EdgeToEdgeManager edgeToEdgeManager) { super( @@ -156,7 +154,6 @@ public BraveTabbedRootUiCoordinator( savedInstanceState, multiInstanceManager, overviewColorSupplier, - baseChromeLayout, manualFillingComponentSupplier, edgeToEdgeManager); diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 77ca9dab3a58..83dd5b8ce50b 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -181,7 +181,6 @@ public BraveToolbarManager( boolean initializeWithIncognitoColors, @Nullable BackPressManager backPressManager, @Nullable ObservableSupplier overviewColorSupplier, - @Nullable View baseChromeLayout, ObservableSupplier readAloudControllerSupplier, @Nullable DesktopWindowStateManager desktopWindowStateManager) { super( @@ -225,7 +224,6 @@ public BraveToolbarManager( initializeWithIncognitoColors, backPressManager, overviewColorSupplier, - baseChromeLayout, readAloudControllerSupplier, desktopWindowStateManager); diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index d1baa3a4650c..5bc3bf969fbc 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -1154,7 +1154,6 @@ public void testConstructorsExistAndMatch() throws Exception { boolean.class, BackPressManager.class, ObservableSupplier.class, - View.class, ObservableSupplier.class, DesktopWindowStateManager.class)); Assert.assertTrue( @@ -1563,7 +1562,6 @@ public void testConstructorsExistAndMatch() throws Exception { Bundle.class, MultiInstanceManager.class, ObservableSupplier.class, - View.class, ManualFillingComponentSupplier.class, EdgeToEdgeManager.class)); Assert.assertTrue( diff --git a/app/generated_resources.grd b/app/generated_resources.grd index 2d8c2971cb64..480a03880051 100644 --- a/app/generated_resources.grd +++ b/app/generated_resources.grd @@ -8154,6 +8154,9 @@ Keep your key file in a safe place. You will need it to create new versions of y Don't show SharePoint and OneDrive files + + Suggested for you + Hide for $15 hours diff --git a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc index 16c3434cd9b8..80e90c5eff89 100644 --- a/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc +++ b/chromium_src/net/tools/transport_security_state_generator/input_file_parsers.cc @@ -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 19:52:05 2025 PinsListTimestamp -1740009782 +1740599525 # =====BEGIN BRAVE ROOTS ASC===== #From https://www.amazontrust.com/repository/ diff --git a/package.json b/package.json index a92954089175..8035dc013f38 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "134.0.6998.24", + "tag": "134.0.6998.39", "repository": { "url": "https://github.com/brave/chromium" } @@ -230,4 +230,4 @@ "elliptic": "6.6.1", "esbuild": "0.25.0" } -} +} \ No newline at end of file diff --git a/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch index 5da6ac760ebd..273d5f4797af 100644 --- a/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch +++ b/patches/chrome-android-java-src-org-chromium-chrome-browser-contextmenu-ChromeContextMenuPopulator.java.patch @@ -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)); diff --git a/patches/chrome-browser-BUILD.gn.patch b/patches/chrome-browser-BUILD.gn.patch index 9423aa40cab2..b398ed49b409 100644 --- a/patches/chrome-browser-BUILD.gn.patch +++ b/patches/chrome-browser-BUILD.gn.patch @@ -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", ] } diff --git a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch index 445cff78cad4..2e95aa71a609 100644 --- a/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch +++ b/patches/components-safe_browsing-core-common-safe_browsing_prefs.cc.patch @@ -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) { diff --git a/patches/content-browser-BUILD.gn.patch b/patches/content-browser-BUILD.gn.patch index ca699927104e..af58e8efd0b4 100644 --- a/patches/content-browser-BUILD.gn.patch +++ b/patches/content-browser-BUILD.gn.patch @@ -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") { diff --git a/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch b/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch index 61260b9e4944..a679d4e75ebe 100644 --- a/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch +++ b/patches/third_party-blink-renderer-platform-runtime_enabled_features.json5.patch @@ -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 @@ diff --git a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch index 531689ec2f0e..511b85ba3098 100644 --- a/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch +++ b/patches/ui-accessibility-platform-ax_platform_node_cocoa.mm.patch @@ -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;