[Android CustomTabs] Introduce BaseCustomTabRootUiCoordinator

This CL introduces a CCT/WebAPK specific RootUICoordinator -
BaseCustomTabRootUiCoordinator

BUG=1020324, 1015627

Change-Id: I5ec73d189cc0016cbfc73734fd27ba962d9d1fb9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1938833
Commit-Queue: Peter Kotwicz <pkotwicz@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#719860}

chrome/android/chrome_java_sources.gni

@@ -363,6 +363,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/crash/PureJavaExceptionHandler.java",
   "java/src/org/chromium/chrome/browser/crash/PureJavaExceptionReporter.java",
   "java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabActivity.java",
+  "java/src/org/chromium/chrome/browser/customtabs/BaseCustomTabRootUiCoordinator.java",
   "java/src/org/chromium/chrome/browser/customtabs/ClientManager.java",
   "java/src/org/chromium/chrome/browser/customtabs/CloseButtonNavigator.java",
   "java/src/org/chromium/chrome/browser/customtabs/CustomButtonParams.java",

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

@@ -389,7 +389,7 @@ public abstract class ChromeActivity<C extends ChromeActivityComponent>
         // to the RootUiCoordinator, passing the activity is an easy way to get access to a
         // number of objects that will ultimately be owned by the RootUiCoordinator. This is not
         // a recommended pattern.
-        return new RootUiCoordinator(this, null, null, getShareDelegateSupplier());
+        return new RootUiCoordinator(this, null, getShareDelegateSupplier());
     }
 
     private C createComponent() {

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

@@ -1584,8 +1584,8 @@ public class ChromeTabbedActivity extends ChromeActivity implements ScreenshotMo
 
     @Override
     protected RootUiCoordinator createRootUiCoordinator() {
-        return new TabbedRootUiCoordinator(this, null, this::onOmniboxFocusChanged,
-                mIntentWithEffect, getShareDelegateSupplier());
+        return new TabbedRootUiCoordinator(
+                this, this::onOmniboxFocusChanged, mIntentWithEffect, getShareDelegateSupplier());
     }
 
     @Override

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

@@ -48,12 +48,8 @@ public abstract class BaseCustomTabActivity<C extends ChromeActivityComponent>
 
     @Override
     protected RootUiCoordinator createRootUiCoordinator() {
-        // TODO(https://crbug.com/1020324): Move this logic into a CustomTabRootUICoordinator that
-        // can synchronously orchestrate the creation of child coordinators.
-        return new RootUiCoordinator(this, (toolbarManager) -> {
-            mToolbarCoordinator.onToolbarInitialized(toolbarManager);
-            mNavigationController.onToolbarInitialized(toolbarManager);
-        }, null, getShareDelegateSupplier());
+        return new BaseCustomTabRootUiCoordinator(
+                this, getShareDelegateSupplier(), mToolbarCoordinator, mNavigationController);
     }
 
     /**

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

+// Copyright 2019 The Chromium Authors. All rights reserved.
+// 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;
+
+import org.chromium.base.ObservableSupplier;
+import org.chromium.chrome.browser.ChromeActivity;
+import org.chromium.chrome.browser.customtabs.content.CustomTabActivityNavigationController;
+import org.chromium.chrome.browser.customtabs.features.toolbar.CustomTabToolbarCoordinator;
+import org.chromium.chrome.browser.share.ShareDelegate;
+import org.chromium.chrome.browser.ui.RootUiCoordinator;
+
+/**
+ * A {@link RootUiCoordinator} variant that controls UI for {@link BaseCustomTabActivity}.
+ */
+public class BaseCustomTabRootUiCoordinator extends RootUiCoordinator {
+    private final CustomTabToolbarCoordinator mToolbarCoordinator;
+    private final CustomTabActivityNavigationController mNavigationController;
+
+    public BaseCustomTabRootUiCoordinator(ChromeActivity activity,
+            ObservableSupplier<ShareDelegate> shareDelegateSupplier,
+            CustomTabToolbarCoordinator customTabToolbarCoordinator,
+            CustomTabActivityNavigationController customTabNavigationController) {
+        super(activity, null, shareDelegateSupplier);
+
+        mToolbarCoordinator = customTabToolbarCoordinator;
+        mNavigationController = customTabNavigationController;
+    }
+
+    @Override
+    protected void initializeToolbar() {
+        super.initializeToolbar();
+
+        mToolbarCoordinator.onToolbarInitialized(mToolbarManager);
+        mNavigationController.onToolbarInitialized(mToolbarManager);
+    }
+}

chrome/android/java/src/org/chromium/chrome/browser/tabbed_mode/TabbedRootUiCoordinator.java

@@ -28,7 +28,6 @@ import org.chromium.chrome.browser.share.ShareDelegate;
 import org.chromium.chrome.browser.signin.SigninPromoUtil;
 import org.chromium.chrome.browser.status_indicator.StatusIndicatorCoordinator;
 import org.chromium.chrome.browser.toolbar.ToolbarButtonInProductHelpController;
-import org.chromium.chrome.browser.toolbar.ToolbarManager;
 import org.chromium.chrome.browser.ui.ImmersiveModeManager;
 import org.chromium.chrome.browser.ui.RootUiCoordinator;
 import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler;
@@ -54,19 +53,15 @@ public class TabbedRootUiCoordinator extends RootUiCoordinator implements Native
     /**
      * Construct a new TabbedRootUiCoordinator.
      * @param activity The activity whose UI the coordinator is responsible for.
-     * @param toolbarManagerCallback callback to invoke when the
-     *         ToolbarManager is created.
      * @param onOmniboxFocusChangedListener callback to invoke when Omnibox focus
      *         changes.
      * @param intentWithEffect Whether or not {@code activity} was launched with an
      *         intent to open a single tab.
      */
     public TabbedRootUiCoordinator(ChromeActivity activity,
-            Callback<ToolbarManager> toolbarManagerCallback,
             Callback<Boolean> onOmniboxFocusChangedListener, boolean intentWithEffect,
             ObservableSupplier<ShareDelegate> shareDelegateSupplier) {
-        super(activity, toolbarManagerCallback, onOmniboxFocusChangedListener,
-                shareDelegateSupplier);
+        super(activity, onOmniboxFocusChangedListener, shareDelegateSupplier);
         mIntentWithEffect = intentWithEffect;
     }
 

chrome/android/java/src/org/chromium/chrome/browser/ui/RootUiCoordinator.java

@@ -73,9 +73,7 @@ public class RootUiCoordinator
     private TabThemeColorProvider mTabThemeColorProvider;
     @Nullable
     private Callback<Boolean> mOnOmniboxFocusChangedListener;
-    private ToolbarManager mToolbarManager;
-    @Nullable
-    private Callback<ToolbarManager> mToolbarManagerCallback;
+    protected ToolbarManager mToolbarManager;
     private ModalDialogManagerObserver mModalDialogManagerObserver;
 
     private VrModeObserver mVrModeObserver;
@@ -84,18 +82,14 @@ public class RootUiCoordinator
      * Create a new {@link RootUiCoordinator} for the given activity.
      * @param activity The containing {@link ChromeActivity}. TODO(https://crbug.com/931496):
      *         Remove this in favor of passing in direct dependencies.
-     * @param toolbarManagerCallback Callback<ToolbarManager> callback to invoke when the
-     *         ToolbarManager is created.
      * @param onOmniboxFocusChangedListener Callback<Boolean> callback to invoke when Omnibox focus
      *         changes.
      */
     public RootUiCoordinator(ChromeActivity activity,
-            @Nullable Callback<ToolbarManager> toolbarManagerCallback,
             @Nullable Callback<Boolean> onOmniboxFocusChangedListener,
             ObservableSupplier<ShareDelegate> shareDelegateSupplier) {
         mActivity = activity;
         mOnOmniboxFocusChangedListener = onOmniboxFocusChangedListener;
-        mToolbarManagerCallback = toolbarManagerCallback;
         mActivity.getLifecycleDispatcher().register(this);
 
         mMenuOrKeyboardActionController = mActivity.getMenuOrKeyboardActionController();
@@ -306,10 +300,6 @@ public class RootUiCoordinator
             if (!mActivity.supportsAppMenu()) {
                 mToolbarManager.getToolbar().disableMenuButton();
             }
-
-            if (mToolbarManagerCallback != null) {
-                mToolbarManagerCallback.onResult(mToolbarManager);
-            }
         }
     }
 

chrome/android/javatests/src/org/chromium/chrome/browser/ShareIntentTest.java

@@ -164,7 +164,7 @@ public class ShareIntentTest {
         });
         RootUiCoordinator rootUiCoordinator = TestThreadUtils.runOnUiThreadBlocking(() -> {
             return new RootUiCoordinator(
-                    mockActivity, null, null, mockActivity.getShareDelegateSupplier());
+                    mockActivity, null, mockActivity.getShareDelegateSupplier());
         });
         ShareHelper.setLastShareComponentName(
                 new ComponentName("test.package", "test.activity"), null);