From 85df82caffe2ac133b8f260a84ab892cf83733ef Mon Sep 17 00:00:00 2001 From: samartnik Date: Mon, 16 May 2022 11:58:10 -0400 Subject: [PATCH] [Android] New c-tor signatures for top toolbar classes Chromium change: https://github.com/chromium/chromium/commit/c93a4543bd360aa2ca31f2bccee6bd1381427eb8 AboutThisSite: Launch ephemeral tabs from PageInfo Pass EphemeralTabCoordinator to PageInfo in order to open source info and the "more about this page" link on top of the current tab instead of in a new tab. Add EphemeralTabCoordinatorSupplier to RootUiCoordinator to make it available to all the places that create PageInfo. Screen recording: https://crbug.com/1318000#c5 Bug: 1318000 --- .../browser/toolbar/BraveToolbarManager.java | 4 +++- .../top/BraveTabSwitcherModeTTCoordinator.java | 10 +++++----- .../toolbar/top/BraveTopToolbarCoordinator.java | 14 +++++++------- 3 files changed, 15 insertions(+), 13 deletions(-) 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); } } }