diff --git a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java index 0b397c5d006..84dd5c83b4b 100644 --- a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java +++ b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabGroupUiCoordinator.java @@ -14,9 +14,12 @@ import androidx.annotation.NonNull; import org.chromium.base.Callback; import org.chromium.base.supplier.ObservableSupplier; import org.chromium.base.supplier.OneshotSupplier; +import org.chromium.base.supplier.Supplier; +import org.chromium.chrome.browser.bookmarks.TabBookmarker; import org.chromium.chrome.browser.browser_controls.BrowserControlsStateProvider; import org.chromium.chrome.browser.data_sharing.DataSharingTabManager; import org.chromium.chrome.browser.layouts.LayoutStateProvider; +import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.tab_ui.TabContentManager; import org.chromium.chrome.browser.tabmodel.TabCreatorManager; import org.chromium.chrome.browser.tabmodel.TabModelSelector; @@ -51,7 +54,9 @@ public class BraveTabGroupUiCoordinator extends TabGroupUiCoordinator { @NonNull OneshotSupplier layoutStateProviderSupplier, @NonNull ModalDialogManager modalDialogManager, @NonNull ThemeColorProvider themeColorProvider, - UndoBarThrottle undoBarThrottle) { + UndoBarThrottle undoBarThrottle, + ObservableSupplier tabBookmarkerSupplier, + Supplier shareDelegateSupplier) { super( activity, parentView, @@ -66,7 +71,9 @@ public class BraveTabGroupUiCoordinator extends TabGroupUiCoordinator { layoutStateProviderSupplier, modalDialogManager, themeColorProvider, - undoBarThrottle); + undoBarThrottle, + tabBookmarkerSupplier, + shareDelegateSupplier); mTabModelSelector = tabModelSelector; diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index d0a7221d1c3..f4d1b85d049 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -30,6 +30,7 @@ import org.chromium.chrome.browser.app.BraveActivity; import org.chromium.chrome.browser.app.ChromeActivity; import org.chromium.chrome.browser.back_press.BackPressManager; import org.chromium.chrome.browser.bookmarks.BookmarkModel; +import org.chromium.chrome.browser.bookmarks.TabBookmarker; import org.chromium.chrome.browser.browser_controls.BottomControlsStacker; import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; import org.chromium.chrome.browser.browser_controls.BrowserStateBrowserControlsVisibilityDelegate; @@ -148,6 +149,8 @@ public class BraveToolbarManager extends ToolbarManager private ObservableSupplier mTabModelSelectorSupplier; private LayoutStateProvider.LayoutStateObserver mLayoutStateObserver; private Runnable mOpenGridTabSwitcherHandler; + private final ObservableSupplier mTabBookmarkerSupplier; + private final Supplier mShareDelegateSupplier; public BraveToolbarManager( AppCompatActivity activity, @@ -194,7 +197,8 @@ public class BraveToolbarManager extends ToolbarManager @Nullable ObservableSupplier overviewColorSupplier, ObservableSupplier readAloudControllerSupplier, @Nullable DesktopWindowStateManager desktopWindowStateManager, - @Nullable MultiInstanceManager multiInstanceManager) { + @Nullable MultiInstanceManager multiInstanceManager, + @NonNull ObservableSupplier tabBookmarkerSupplier) { super( activity, bottomControlsStacker, @@ -238,7 +242,8 @@ public class BraveToolbarManager extends ToolbarManager overviewColorSupplier, readAloudControllerSupplier, desktopWindowStateManager, - multiInstanceManager); + multiInstanceManager, + tabBookmarkerSupplier); mOmniboxFocusStateSupplier = omniboxFocusStateSupplier; mLayoutStateProviderSupplier = layoutStateProviderSupplier; @@ -250,6 +255,8 @@ public class BraveToolbarManager extends ToolbarManager mBrowserControlsSizer = controlsSizer; mDataSharingTabManager = dataSharingTabManager; mTabModelSelectorSupplier = tabModelSelectorSupplier; + mTabBookmarkerSupplier = tabBookmarkerSupplier; + mShareDelegateSupplier = shareDelegateSupplier; if (isToolbarPhone()) { updateBraveBottomControlsVisibility(); @@ -310,7 +317,9 @@ public class BraveToolbarManager extends ToolbarManager mLayoutStateProviderSupplier, mModalDialogManagerSupplier.get(), bottomUiThemeColorProvider, - mUndoBarThrottle); + mUndoBarThrottle, + mTabBookmarkerSupplier, + mShareDelegateSupplier); var bottomControlsContentDelegateSupplier = (OneshotSupplier) ((OneshotSupplier) diff --git a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java index 3245b56931b..a045dbc9a57 100644 --- a/android/javatests/org/chromium/chrome/browser/BytecodeTest.java +++ b/android/javatests/org/chromium/chrome/browser/BytecodeTest.java @@ -1203,7 +1203,8 @@ public class BytecodeTest { ObservableSupplier.class, ObservableSupplier.class, DesktopWindowStateManager.class, - MultiInstanceManager.class)); + MultiInstanceManager.class, + ObservableSupplier.class)); Assert.assertTrue( constructorsMatch( "org/chromium/chrome/browser/toolbar/bottom/BottomControlsMediator", @@ -1253,7 +1254,9 @@ public class BytecodeTest { OneshotSupplier.class, ModalDialogManager.class, ThemeColorProvider.class, - UndoBarThrottle.class)); + UndoBarThrottle.class, + ObservableSupplier.class, + Supplier.class)); Assert.assertTrue( constructorsMatch( "org/chromium/chrome/browser/site_settings/ChromeSiteSettingsDelegate",