Extract toolbar code out of CustomTabActivity

Bug: 916531
Change-Id: I802b01621be55b440fd3624764a51b63f087d81d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1638458
Commit-Queue: Pavel Shmakov <pshmakov@chromium.org>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665958}

chrome/android/chrome_java_sources.gni

@@ -378,7 +378,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabActivityLifecycleUmaTracker.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabAppMenuPropertiesDelegate.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabBottomBarDelegate.java",
-  "java/src/org/chromium/chrome/browser/customtabs/CustomTabBrowserControlsVisibilityDelegate.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomTabStatusBarColorProvider.java",
@@ -431,6 +430,8 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ModuleMetrics.java",
   "java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/ObjectWrapper.java",
   "java/src/org/chromium/chrome/browser/customtabs/features/CustomTabNavigationBarController.java",
+  "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabBrowserControlsVisibilityDelegate.java",
+  "java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabToolbarCoordinator.java",
   "java/src/org/chromium/chrome/browser/database/SQLiteCursor.java",
   "java/src/org/chromium/chrome/browser/datareduction/DataReductionMainMenuItem.java",
   "java/src/org/chromium/chrome/browser/datareduction/DataReductionPromoScreen.java",

chrome/android/java/src/org/chromium/chrome/browser/ChromeActivity.java

@@ -274,6 +274,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
     private boolean mTabModelsInitialized;
     private boolean mNativeInitialized;
     private boolean mRemoveWindowBackgroundDone;
+    private boolean mToolbarInitialized;
 
     // The class cannot implement TouchExplorationStateChangeListener,
     // because it is only available for Build.VERSION_CODES.KITKAT and later.
@@ -297,6 +298,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
     private SnackbarManager mSnackbarManager;
     @Nullable
     private ToolbarManager mToolbarManager;
+    @Nullable
     private FindToolbarManager mFindToolbarManager;
     private BottomSheetController mBottomSheetController;
     private UpdateNotificationController mUpdateNotificationController;
@@ -499,7 +501,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
                     mCompositorViewHolder.getCompositorView());
 
             initializeTabModels();
-            initializeToolbar();
+            initializeToolbarIfNecessary();
             if (!isFinishing() && getFullscreenManager() != null) {
                 getFullscreenManager().initialize(
                         (ControlContainer) findViewById(R.id.control_container),
@@ -642,6 +644,15 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
         return true;
     }
 
+    private void initializeToolbarIfNecessary() {
+        // TODO(pshmakov): make ToolbarManager and FindToolbarManager lazy, don't create them unless
+        // getToolbarManager() or getFindToolbarManager() is called.
+        if (!mToolbarInitialized) {
+            mToolbarInitialized = true;
+            initializeToolbar();
+        }
+    }
+
     /**
      * Constructs {@link ToolbarManager} and the handler necessary for controlling the menu on the
      * {@link Toolbar}. Extending classes can override this call to avoid creating the toolbar.
@@ -732,13 +743,20 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      */
     @Nullable
     public ToolbarManager getToolbarManager() {
+        if (isInitialLayoutInflationComplete()) {
+            initializeToolbarIfNecessary();
+        }
         return mToolbarManager;
     }
 
     /**
      * @return {@link FindToolbarManager} that belongs to this activity.
      */
+    @Nullable
     public FindToolbarManager getFindToolbarManager() {
+        if (isInitialLayoutInflationComplete()) {
+            initializeToolbarIfNecessary();
+        }
         return mFindToolbarManager;
     }
 
@@ -1843,7 +1861,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
      *                                  {@link Layout}s.
      * @param controlContainer          A {@link ControlContainer} instance to draw.
      */
-    protected void initializeCompositorContent(LayoutManager layoutManager, View urlBar,
+    public void initializeCompositorContent(LayoutManager layoutManager, View urlBar,
             ViewGroup contentContainer, ControlContainer controlContainer) {
         if (mContextualSearchManager != null) {
             mContextualSearchManager.initialize(contentContainer);

chrome/android/java/src/org/chromium/chrome/browser/browserservices/trustedwebactivityui/view/TrustedWebActivityToolbarView.java

@@ -8,36 +8,32 @@ import static org.chromium.chrome.browser.browserservices.trustedwebactivityui.T
 
 import org.chromium.chrome.browser.ChromeActivity;
 import org.chromium.chrome.browser.browserservices.trustedwebactivityui.TrustedWebActivityModel;
-import org.chromium.chrome.browser.customtabs.CustomTabBrowserControlsVisibilityDelegate;
+import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarCoordinator;
 import org.chromium.chrome.browser.dependency_injection.ActivityScope;
-import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
-import org.chromium.chrome.browser.fullscreen.FullscreenManager;
 import org.chromium.ui.modelutil.PropertyKey;
 import org.chromium.ui.modelutil.PropertyObservable;
 
 import javax.inject.Inject;
 
-import dagger.Lazy;
-
 /**
  * Hides and shows the toolbar according to the state of the Trusted Web Activity.
+ *
+ * TODO(pshmakov): Since we now have CustomTabToolbarCoordinator representing toolbar as a separate
+ * feature, this class doesn't make sense any more. Remove it, and let TrustedWebActivityCoordinator
+ * talk to CustomTabToolbarCoordinator.
  */
 @ActivityScope
 public class TrustedWebActivityToolbarView implements
         PropertyObservable.PropertyObserver<PropertyKey> {
-    private final Lazy<ChromeFullscreenManager> mFullscreenManager;
-    private final CustomTabBrowserControlsVisibilityDelegate mControlsVisibilityDelegate;
+    private final CustomTabToolbarCoordinator mCustomTabToolbarCoordinator;
     private final TrustedWebActivityModel mModel;
     private final ChromeActivity mActivity;
 
-    private int mControlsHidingToken = FullscreenManager.INVALID_TOKEN;
-
     @Inject
-    public TrustedWebActivityToolbarView(Lazy<ChromeFullscreenManager> fullscreenManager,
-            CustomTabBrowserControlsVisibilityDelegate controlsVisibilityDelegate,
-            TrustedWebActivityModel model, ChromeActivity activity) {
-        mFullscreenManager = fullscreenManager;
-        mControlsVisibilityDelegate = controlsVisibilityDelegate;
+    public TrustedWebActivityToolbarView(CustomTabToolbarCoordinator customTabToolbarCoordinator,
+            TrustedWebActivityModel model,
+            ChromeActivity activity) {
+        mCustomTabToolbarCoordinator = customTabToolbarCoordinator;
         mModel = model;
         mActivity = activity;
         mModel.addObserver(this);
@@ -53,16 +49,11 @@ public class TrustedWebActivityToolbarView implements
 
         boolean hide = mModel.get(TOOLBAR_HIDDEN);
 
-        mControlsVisibilityDelegate.setTrustedWebActivityMode(hide);
+        mCustomTabToolbarCoordinator.setToolbarHidden(hide);
 
-        ChromeFullscreenManager fullscreenManager = mFullscreenManager.get();
-        if (hide) {
-            mControlsHidingToken =
-                    fullscreenManager.hideAndroidControlsAndClearOldToken(mControlsHidingToken);
-        } else {
-            fullscreenManager.releaseAndroidControlsHidingToken(mControlsHidingToken);
+        if (!hide) {
             // Force showing the controls for a bit when leaving Trusted Web Activity mode.
-            fullscreenManager.getBrowserVisibilityDelegate().showControlsTransient();
+            mCustomTabToolbarCoordinator.showToolbarTemporarily();
         }
     }
 }

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomButtonParams.java

@@ -87,7 +87,7 @@ public class CustomButtonParams {
     /**
      * @return The drawable for the customized button.
      */
-    Drawable getIcon(Context context) {
+    public Drawable getIcon(Context context) {
         if (mShouldTint) {
             return new TintedDrawable(context, mIcon);
         } else {
@@ -98,7 +98,7 @@ public class CustomButtonParams {
     /**
      * @return The content description for the customized button.
      */
-    String getDescription() {
+    public String getDescription() {
         return mDescription;
     }
 
@@ -274,7 +274,11 @@ public class CustomButtonParams {
     /**
      * @return Whether the given icon's size is suitable to put on toolbar.
      */
-    static boolean doesIconFitToolbar(Context context, Bitmap bitmap) {
+    public boolean doesIconFitToolbar(Context context) {
+        return doesIconFitToolbar(context, mIcon);
+    }
+
+    private static boolean doesIconFitToolbar(Context context, Bitmap bitmap) {
         int height = context.getResources().getDimensionPixelSize(R.dimen.toolbar_icon_height);
         if (bitmap.getHeight() < height) return false;
         int scaledWidth = bitmap.getWidth() / bitmap.getHeight() * height;

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabDelegateFactory.java

@@ -16,6 +16,7 @@ import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.browser.contextmenu.ChromeContextMenuPopulator;
 import org.chromium.chrome.browser.contextmenu.ContextMenuPopulator;
+import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabBrowserControlsVisibilityDelegate;
 import org.chromium.chrome.browser.dependency_injection.ActivityScope;
 import org.chromium.chrome.browser.externalauth.ExternalAuthUtils;
 import org.chromium.chrome.browser.externalnav.ExternalNavigationDelegateImpl;

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabIntentDataProvider.java

@@ -767,7 +767,7 @@ public class CustomTabIntentDataProvider extends BrowserSessionDataProvider {
     /**
      * @return See {@link #EXTRA_UI_TYPE}.
      */
-    boolean isMediaViewer() {
+    public boolean isMediaViewer() {
         return mUiType == CustomTabsUiType.MEDIA_VIEWER;
     }
 

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabStatusBarColorProvider.java

@@ -108,4 +108,11 @@ public class CustomTabStatusBarColorProvider {
 
         return false;
     }
+
+    /**
+     * Called when toolbar color is changed so that the status bar can adapt.
+     */
+    public void onToolbarColorChanged() {
+        mStatusBarColorController.updateStatusBarColor(false);
+    }
 }

chrome/android/java/src/org/chromium/chrome/browser/customtabs/content/CustomTabActivityTabController.java

@@ -44,6 +44,7 @@ import org.chromium.chrome.browser.tab.TabRedirectHandler;
 import org.chromium.chrome.browser.tabmodel.AsyncTabParams;
 import org.chromium.chrome.browser.tabmodel.AsyncTabParamsManager;
 import org.chromium.chrome.browser.tabmodel.TabModel;
+import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelSelectorImpl;
 import org.chromium.chrome.browser.tabmodel.TabReparentingParams;
 import org.chromium.chrome.browser.translate.TranslateBridge;
@@ -178,6 +179,11 @@ public class CustomTabActivityTabController implements InflationObserver, Native
         mTabFactory.getTabModelSelector().saveState();
     }
 
+    /** Returns {@link TabModelSelector}. Should be called after postInflationStartup. */
+    public TabModelSelector getTabModelSelector() {
+        return mTabFactory.getTabModelSelector();
+    }
+
     @Override
     public void onPreInflationStartup() {
         // This must be requested before adding content.

chrome/android/java/src/org/chromium/chrome/browser/customtabs/dependency_injection/CustomTabActivityComponent.java

@@ -9,7 +9,6 @@ import org.chromium.chrome.browser.customtabs.CustomTabActivityLifecycleUmaTrack
 import org.chromium.chrome.browser.customtabs.CustomTabBottomBarDelegate;
 import org.chromium.chrome.browser.customtabs.CustomTabStatusBarColorProvider;
 import org.chromium.chrome.browser.customtabs.CustomTabTabPersistencePolicy;
-import org.chromium.chrome.browser.customtabs.CustomTabTopBarDelegate;
 import org.chromium.chrome.browser.customtabs.content.CustomTabActivityInitialPageLoader;
 import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigationController;
 import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabController;
@@ -17,10 +16,10 @@ import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabFactor
 import org.chromium.chrome.browser.customtabs.content.CustomTabActivityTabProvider;
 import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleCoordinator;
 import org.chromium.chrome.browser.customtabs.dynamicmodule.DynamicModuleToolbarController;
+import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarCoordinator;
 import org.chromium.chrome.browser.dependency_injection.ActivityScope;
 import org.chromium.chrome.browser.dependency_injection.ChromeActivityCommonsModule;
 import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent;
-import org.chromium.chrome.browser.tab.TabObserverRegistrar;
 
 import dagger.Subcomponent;
 
@@ -35,8 +34,6 @@ public interface CustomTabActivityComponent extends ChromeActivityComponent {
     DynamicModuleToolbarController resolveDynamicModuleToolbarController();
     DynamicModuleCoordinator resolveDynamicModuleCoordinator();
 
-    TabObserverRegistrar resolveTabObserverRegistrar();
-    CustomTabTopBarDelegate resolveTobBarDelegate();
     CustomTabBottomBarDelegate resolveBottomBarDelegate();
     CustomTabActivityTabController resolveTabController();
     CustomTabActivityTabFactory resolveTabFactory();
@@ -45,6 +42,7 @@ public interface CustomTabActivityComponent extends ChromeActivityComponent {
     CustomTabActivityNavigationController resolveNavigationController();
     CustomTabActivityTabProvider resolveTabProvider();
     CustomTabStatusBarColorProvider resolveCustomTabStatusBarColorProvider();
+    CustomTabToolbarCoordinator resolveToolbarCoordinator();
 
     CustomTabTabPersistencePolicy resolveTabPersistencePolicy(); // For testing
 }

chrome/android/java/src/org/chromium/chrome/browser/customtabs/dynamicmodule/DynamicModuleToolbarController.java

@@ -5,8 +5,8 @@
 package org.chromium.chrome.browser.customtabs.dynamicmodule;
 
 import org.chromium.base.VisibleForTesting;
-import org.chromium.chrome.browser.customtabs.CustomTabBrowserControlsVisibilityDelegate;
 import org.chromium.chrome.browser.customtabs.CustomTabIntentDataProvider;
+import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarCoordinator;
 import org.chromium.chrome.browser.dependency_injection.ActivityScope;
 import org.chromium.chrome.browser.fullscreen.ChromeFullscreenManager;
 import org.chromium.chrome.browser.fullscreen.FullscreenManager;
@@ -24,7 +24,7 @@ import dagger.Lazy;
 @ActivityScope
 public class DynamicModuleToolbarController implements InflationObserver, NativeInitObserver {
     private final Lazy<ChromeFullscreenManager> mFullscreenManager;
-    private final CustomTabBrowserControlsVisibilityDelegate mControlsVisibilityDelegate;
+    private final CustomTabToolbarCoordinator mToolbarCoordinator;
     private final CustomTabIntentDataProvider mIntentDataProvider;
 
     private int mControlsHidingToken = FullscreenManager.INVALID_TOKEN;
@@ -32,12 +32,12 @@ public class DynamicModuleToolbarController implements InflationObserver, Native
 
     @Inject
     public DynamicModuleToolbarController(Lazy<ChromeFullscreenManager> fullscreenManager,
-            CustomTabBrowserControlsVisibilityDelegate controlsVisibilityDelegate,
             CustomTabIntentDataProvider intentDataProvider,
-            ActivityLifecycleDispatcher activityLifecycleDispatcher) {
-        this.mFullscreenManager = fullscreenManager;
-        this.mControlsVisibilityDelegate = controlsVisibilityDelegate;
-        this.mIntentDataProvider = intentDataProvider;
+            ActivityLifecycleDispatcher activityLifecycleDispatcher,
+            CustomTabToolbarCoordinator toolbarCoordinator) {
+        mFullscreenManager = fullscreenManager;
+        mToolbarCoordinator = toolbarCoordinator;
+        mIntentDataProvider = intentDataProvider;
 
         activityLifecycleDispatcher.register(this);
     }
@@ -47,7 +47,7 @@ public class DynamicModuleToolbarController implements InflationObserver, Native
 
     @Override
     public void onPostInflationStartup() {
-        mControlsVisibilityDelegate.setModuleLoadingMode(true);
+        mToolbarCoordinator.setToolbarHidden(true);
         mControlsHidingToken =
                 mFullscreenManager.get().hideAndroidControlsAndClearOldToken(mControlsHidingToken);
         mHasReleasedToken = false;
@@ -61,7 +61,7 @@ public class DynamicModuleToolbarController implements InflationObserver, Native
     }
 
     /* package */ void releaseAndroidControlsHidingToken() {
-        mControlsVisibilityDelegate.setModuleLoadingMode(false);
+        mToolbarCoordinator.setToolbarHidden(false);
         mFullscreenManager.get().releaseAndroidControlsHidingToken(mControlsHidingToken);
         mHasReleasedToken = true;
     }

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabBrowserControlsVisibilityDelegate.java → chrome/android/java/src/org/chromium/chrome/browser/customtabs/features/toolbar/CustomTabBrowserControlsVisibilityDelegate.java

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.chrome.browser.customtabs;
+package org.chromium.chrome.browser.customtabs.features.toolbar;
 
 import org.chromium.chrome.browser.ActivityTabProvider;
 import org.chromium.chrome.browser.dependency_injection.ActivityScope;
@@ -23,8 +23,7 @@ public class CustomTabBrowserControlsVisibilityDelegate
         implements BrowserControlsVisibilityDelegate {
     private final Lazy<ChromeFullscreenManager> mFullscreenManagerDelegate;
     private final ActivityTabProvider mTabProvider;
-    private boolean mIsInTwaMode;
-    private boolean mIsInModuleLoadingMode;
+    private boolean mHidden;
 
     @Inject
     public CustomTabBrowserControlsVisibilityDelegate(
@@ -34,32 +33,18 @@ public class CustomTabBrowserControlsVisibilityDelegate
     }
 
     /**
-     * Sets trusted web activity mode. In trusted web activity mode browser controls should be
-     * hidden.
+     * Sets browser controls hidden. Note: this is not enough to completely hide the toolbar, use
+     * {@link CustomTabToolbarCoordinator#setToolbarHidden} for that.
      */
-    public void setTrustedWebActivityMode(boolean isInTwaMode) {
-        if (mIsInTwaMode == isInTwaMode) {
-            return;
-        }
-        mIsInTwaMode = isInTwaMode;
-        updateActiveTabFullscreenEnabledState();
-    }
-
-    /**
-     * Sets module loading mode. In module loading mode browser controls should be hidden.
-     */
-    public void setModuleLoadingMode(boolean isInModuleLoadingMode) {
-        if (mIsInModuleLoadingMode == isInModuleLoadingMode) {
-            return;
-        }
-        mIsInModuleLoadingMode = isInModuleLoadingMode;
+    public void setControlsHidden(boolean hidden) {
+        if (hidden == mHidden) return;
+        mHidden = hidden;
         updateActiveTabFullscreenEnabledState();
     }
 
     @Override
     public boolean canShowBrowserControls() {
-        return !mIsInTwaMode && !mIsInModuleLoadingMode
-                && getDefaultVisibilityDelegate().canShowBrowserControls();
+        return !mHidden && getDefaultVisibilityDelegate().canShowBrowserControls();
     }
 
     @Override

chrome/android/java/src/org/chromium/chrome/browser/dependency_injection/ChromeActivityCommonsModule.java

@@ -24,6 +24,7 @@ import org.chromium.chrome.browser.toolbar.ToolbarManager;
 import org.chromium.chrome.browser.ui.system.StatusBarColorController;
 import org.chromium.chrome.browser.widget.bottomsheet.BottomSheetController;
 import org.chromium.content_public.browser.ScreenOrientationProvider;
+import org.chromium.chrome.browser.widget.findinpage.FindToolbarManager;
 import org.chromium.ui.base.ActivityWindowAndroid;
 
 import javax.inject.Named;
@@ -143,4 +144,9 @@ public class ChromeActivityCommonsModule {
     public ScreenOrientationProvider provideScreenOrientationProvider() {
         return ScreenOrientationProvider.getInstance();
     }
+
+    @Provides
+    public FindToolbarManager provideFindToolbarManager() {
+        return mActivity.getFindToolbarManager();
+    }
 }

chrome/android/java/src/org/chromium/chrome/browser/init/AsyncInitializationActivity.java

@@ -92,6 +92,7 @@ public abstract class AsyncInitializationActivity
     private boolean mFirstDrawComplete;
 
     private Runnable mOnInflationCompleteCallback;
+    private boolean mInitialLayoutInflationComplete;
 
     public AsyncInitializationActivity() {
         mHandler = new Handler();
@@ -761,6 +762,14 @@ public abstract class AsyncInitializationActivity
         if (mOnInflationCompleteCallback == null) return;
         mOnInflationCompleteCallback.run();
         mOnInflationCompleteCallback = null;
+        mInitialLayoutInflationComplete = true;
+    }
+
+    /**
+     * Returns whether initial inflation is complete.
+     */
+    public boolean isInitialLayoutInflationComplete() {
+        return mInitialLayoutInflationComplete;
     }
 
     /**