From ac454132ef8a274d11054cb77160684e2192a75a Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Thu, 28 Aug 2025 13:35:43 -0400 Subject: [PATCH] [cr141][Android] New params for MenuButtonCoordinator c-tor Chromium changes: https://chromium.googlesource.com/chromium/src/+/a897a4e519ebb2a6480cda54f2e42f70dd837ede commit a897a4e519ebb2a6480cda54f2e42f70dd837ede Author: Charles Hager Date: Wed Aug 27 10:31:50 2025 -0700 Have MenuButtonCoordinator extend ToolbarChildButton Bug: 427260734 Change-Id: I27c0e074fa78f4f0e91a7300700c3ec3c0ca2282 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6886473 Reviewed-by: Sirisha Kavuluru Commit-Queue: Charles Hager Cr-Commit-Position: refs/heads/main@{#1507190} --- .../toolbar/menu_button/BraveMenuButtonCoordinator.java | 5 +++++ .../javatests/org/chromium/chrome/browser/BytecodeTest.java | 2 ++ 2 files changed, 7 insertions(+) diff --git a/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java index 1b580c5486e..ae015259d53 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator.java @@ -18,6 +18,7 @@ import org.chromium.build.annotations.Nullable; import org.chromium.chrome.R; import org.chromium.chrome.browser.browser_controls.BrowserStateBrowserControlsVisibilityDelegate; import org.chromium.chrome.browser.preferences.ChromeSharedPreferences; +import org.chromium.chrome.browser.tabmodel.IncognitoStateProvider; import org.chromium.chrome.browser.theme.ThemeColorProvider; import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; import org.chromium.chrome.browser.toolbar.top.BraveToolbarLayoutImpl; @@ -30,6 +31,7 @@ public class BraveMenuButtonCoordinator extends MenuButtonCoordinator { private final Activity mActivity; public BraveMenuButtonCoordinator( + Activity activity, OneshotSupplier appMenuCoordinatorSupplier, BrowserStateBrowserControlsVisibilityDelegate controlsVisibilityDelegate, WindowAndroid windowAndroid, @@ -38,11 +40,13 @@ public class BraveMenuButtonCoordinator extends MenuButtonCoordinator { boolean canShowAppUpdateBadge, Supplier isInOverviewModeSupplier, ThemeColorProvider themeColorProvider, + IncognitoStateProvider incognitoStateProvider, Supplier menuButtonStateSupplier, Runnable onMenuButtonClicked, @IdRes int menuButtonId, @Nullable VisibilityDelegate visibilityDelegate) { super( + activity, appMenuCoordinatorSupplier, controlsVisibilityDelegate, windowAndroid, @@ -51,6 +55,7 @@ public class BraveMenuButtonCoordinator extends MenuButtonCoordinator { canShowAppUpdateBadge, isInOverviewModeSupplier, themeColorProvider, + incognitoStateProvider, menuButtonStateSupplier, onMenuButtonClicked, menuButtonId, diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 19c55a13f39..470b2e0f53e 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -1440,6 +1440,7 @@ public class BytecodeTest { constructorsMatch( "org/chromium/chrome/browser/toolbar/menu_button/MenuButtonCoordinator", // presubmit: ignore-long-line "org/chromium/chrome/browser/toolbar/menu_button/BraveMenuButtonCoordinator", // presubmit: ignore-long-line + Activity.class, OneshotSupplier.class, BrowserStateBrowserControlsVisibilityDelegate.class, WindowAndroid.class, @@ -1448,6 +1449,7 @@ public class BytecodeTest { boolean.class, Supplier.class, ThemeColorProvider.class, + IncognitoStateProvider.class, Supplier.class, Runnable.class, int.class,