diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java index 1cd4af93e90..f7830897a3c 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java @@ -31,6 +31,7 @@ import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.browser_controls.BrowserControlsSizer; import org.chromium.chrome.browser.compositor.CompositorViewHolder; import org.chromium.chrome.browser.compositor.Invalidator; +import org.chromium.chrome.browser.compositor.bottombar.ephemeraltab.EphemeralTabCoordinator; import org.chromium.chrome.browser.compositor.layouts.LayoutManagerImpl; import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager; import org.chromium.chrome.browser.findinpage.FindToolbarManager; @@ -158,6 +159,7 @@ public class BraveToolbarManager extends ToolbarManager { merchantTrustSignalsCoordinatorSupplier, OneshotSupplier tabReparentingControllerSupplier, @NonNull OmniboxPedalDelegate omniboxPedalDelegate, + Supplier ephemeralTabCoordinatorSupplier, boolean initializeWithIncognitoColors) { super(activity, controlsSizer, fullscreenManager, controlContainer, compositorViewHolder, urlFocusChangedCallback, topUiThemeColorProvider, tabObscuringHandler, @@ -172,7 +174,7 @@ public class BraveToolbarManager extends ToolbarManager { bottomSheetController, isWarmOnResumeSupplier, tabContentManager, tabCreatorManager, snackbarManager, jankTracker, merchantTrustSignalsCoordinatorSupplier, tabReparentingControllerSupplier, omniboxPedalDelegate, - initializeWithIncognitoColors); + ephemeralTabCoordinatorSupplier, initializeWithIncognitoColors); mOmniboxFocusStateSupplier = omniboxFocusStateSupplier; mLayoutStateProviderSupplier = layoutStateProviderSupplier; diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinator.java index 53933224d66..743f9f98240 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTabSwitcherModeTTCoordinator.java @@ -17,11 +17,11 @@ class BraveTabSwitcherModeTTCoordinator extends TabSwitcherModeTTCoordinator { private MenuButtonCoordinator mBraveMenuButtonCoordinator; BraveTabSwitcherModeTTCoordinator(ViewStub tabSwitcherToolbarStub, - MenuButtonCoordinator menuButtonCoordinator, boolean isGridTabSwitcherEnabled, - boolean isTabletGtsPolishEnabled, boolean isTabToGtsAnimationEnabled, - BooleanSupplier isIncognitoModeEnabledSupplier) { - super(tabSwitcherToolbarStub, menuButtonCoordinator, isGridTabSwitcherEnabled, - isTabletGtsPolishEnabled, isTabToGtsAnimationEnabled, + ViewStub tabSwitcherFullscreenToolbarStub, MenuButtonCoordinator menuButtonCoordinator, + boolean isGridTabSwitcherEnabled, boolean isTabletGtsPolishEnabled, + boolean isTabToGtsAnimationEnabled, BooleanSupplier isIncognitoModeEnabledSupplier) { + super(tabSwitcherToolbarStub, tabSwitcherFullscreenToolbarStub, menuButtonCoordinator, + isGridTabSwitcherEnabled, isTabletGtsPolishEnabled, isTabToGtsAnimationEnabled, isIncognitoModeEnabledSupplier); mBraveMenuButtonCoordinator = menuButtonCoordinator; diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java index 411daf436e8..b57840fe1d5 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveTopToolbarCoordinator.java @@ -44,7 +44,7 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { private boolean mIsBottomToolbarVisible; public BraveTopToolbarCoordinator(ToolbarControlContainer controlContainer, - ViewStub toolbarStub, ToolbarLayout toolbarLayout, + ViewStub toolbarStub, ViewStub fullscreenToolbarStub, ToolbarLayout toolbarLayout, ToolbarDataProvider toolbarDataProvider, ToolbarTabController tabController, UserEducationHelper userEducationHelper, List buttonDataProviders, OneshotSupplier layoutStateProviderSupplier, @@ -68,9 +68,9 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { OfflineDownloader offlineDownloader, boolean initializeWithIncognitoColors, ObservableSupplier profileSupplier, Callback startSurfaceLogoClickedCallback) { - super(controlContainer, toolbarStub, toolbarLayout, toolbarDataProvider, tabController, - userEducationHelper, buttonDataProviders, layoutStateProviderSupplier, - normalThemeColorProvider, overviewThemeColorProvider, + super(controlContainer, toolbarStub, fullscreenToolbarStub, toolbarLayout, + toolbarDataProvider, tabController, userEducationHelper, buttonDataProviders, + layoutStateProviderSupplier, normalThemeColorProvider, overviewThemeColorProvider, browsingModeMenuButtonCoordinator, overviewModeMenuButtonCoordinator, appMenuButtonHelperSupplier, tabModelSelectorSupplier, homepageEnabledSupplier, startSurfaceAsHomepageSupplier, homepageManagedByPolicySupplier, @@ -89,9 +89,9 @@ public class BraveTopToolbarCoordinator extends TopToolbarCoordinator { if (!isStartSurfaceEnabled) { mTabSwitcherModeCoordinator = new BraveTabSwitcherModeTTCoordinator( controlContainer.getRootView().findViewById(R.id.tab_switcher_toolbar_stub), - overviewModeMenuButtonCoordinator, isGridTabSwitcherEnabled, - isTabletGtsPolishEnabled, isTabToGtsAnimationEnabled, - isIncognitoModeEnabledSupplier); + fullscreenToolbarStub, overviewModeMenuButtonCoordinator, + isGridTabSwitcherEnabled, isTabletGtsPolishEnabled, + isTabToGtsAnimationEnabled, isIncognitoModeEnabledSupplier); } } }