Rename BottomToolbarController to BottomToolbarCoordinator

The naming convention is coordinator. The controller is the combination
of the coordinator and mediator.

Change-Id: I80346b7a606cd5e2d86dee0f6d8ef2594a62cbda
Reviewed-on: https://chromium-review.googlesource.com/1103386
Commit-Queue: Pedro Amaral <amaralp@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#568273}

chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarController.java → chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarCoordinator.java

@@ -22,12 +22,12 @@ import org.chromium.ui.resources.ResourceManager;
 import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
 
 /**
- * The controller for the bottom toolbar. This class handles all interactions that the bottom
+ * The coordinator for the bottom toolbar. This class handles all interactions that the bottom
  * toolbar has with the outside world. This class has two primary components, an Android view that
  * handles user actions and a composited texture that draws when the controls are being scrolled
  * off-screen. The Android version does not draw unless the controls offset is 0.
  */
-public class BottomToolbarController {
+public class BottomToolbarCoordinator {
     /** The mediator that handles events from outside the bottom toolbar. */
     private final BottomToolbarMediator mMediator;
 
@@ -41,12 +41,12 @@ public class BottomToolbarController {
     private final ViewResourceAdapter mViewResourceAdapter;
 
     /**
-     * Build the controller that manages the bottom toolbar.
+     * Build the coordinator that manages the bottom toolbar.
      * @param fullscreenManager A {@link ChromeFullscreenManager} to update the bottom controls
      *                          height for the renderer.
      * @param root The root {@link ViewGroup} for locating the vies to inflate.
      */
-    public BottomToolbarController(ChromeFullscreenManager fullscreenManager, ViewGroup root) {
+    public BottomToolbarCoordinator(ChromeFullscreenManager fullscreenManager, ViewGroup root) {
         BottomToolbarModel model = new BottomToolbarModel();
         mMediator = new BottomToolbarMediator(model, fullscreenManager, root.getResources());
 

chrome/android/java/src/org/chromium/chrome/browser/toolbar/BottomToolbarModel.java

@@ -11,7 +11,7 @@ import org.chromium.chrome.browser.compositor.layouts.LayoutManager;
 import org.chromium.chrome.browser.modelutil.PropertyModel;
 
 /**
- * All of the state for the bottom toolbar, updated by the {@link BottomToolbarController}.
+ * All of the state for the bottom toolbar, updated by the {@link BottomToolbarCoordinator}.
  */
 public class BottomToolbarModel extends PropertyModel {
     /** The Y offset of the view in px. */

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

@@ -126,7 +126,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
     private final ToolbarLayout mToolbar;
     private final ToolbarControlContainer mControlContainer;
 
-    private BottomToolbarController mBottomToolbarController;
+    private BottomToolbarCoordinator mBottomToolbarCoordinator;
     private TabModelSelector mTabModelSelector;
     private TabModelSelectorObserver mTabModelSelectorObserver;
     private TabModelObserver mTabModelObserver;
@@ -600,7 +600,7 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
      */
     public void enableBottomToolbar() {
         if (FeatureUtilities.isBottomToolbarEnabled()) {
-            mBottomToolbarController = new BottomToolbarController(
+            mBottomToolbarCoordinator = new BottomToolbarCoordinator(
                     mActivity.getFullscreenManager(), mActivity.findViewById(R.id.coordinator));
         }
     }
@@ -707,10 +707,10 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
             mLayoutManager.addSceneChangeObserver(mSceneChangeObserver);
         }
 
-        if (mBottomToolbarController != null) {
+        if (mBottomToolbarCoordinator != null) {
             final OnClickListener searchAcceleratorListener = v -> setUrlBarFocus(true);
             final OnClickListener homeButtonListener = v -> openHomepage();
-            mBottomToolbarController.initializeWithNative(
+            mBottomToolbarCoordinator.initializeWithNative(
                     mActivity.getCompositorViewHolder().getResourceManager(),
                     mActivity.getCompositorViewHolder().getLayoutManager(), tabSwitcherClickHandler,
                     searchAcceleratorListener, homeButtonListener, mAppMenuButtonHelper,
@@ -727,8 +727,8 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
      */
     public void showAppMenuUpdateBadge() {
         mToolbar.showAppMenuUpdateBadge();
-        if (mBottomToolbarController != null) {
-            mBottomToolbarController.showAppMenuUpdateBadge();
+        if (mBottomToolbarCoordinator != null) {
+            mBottomToolbarCoordinator.showAppMenuUpdateBadge();
         }
     }
 
@@ -738,8 +738,8 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
      */
     public void removeAppMenuUpdateBadge(boolean animate) {
         mToolbar.removeAppMenuUpdateBadge(animate);
-        if (mBottomToolbarController != null) {
-            mBottomToolbarController.removeAppMenuUpdateBadge();
+        if (mBottomToolbarCoordinator != null) {
+            mBottomToolbarCoordinator.removeAppMenuUpdateBadge();
         }
     }
 
@@ -748,8 +748,8 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
      * TODO(amaralp): Only the top or bottom menu should be visible.
      */
     public boolean isShowingAppMenuUpdateBadge() {
-        if (mBottomToolbarController != null
-                && mBottomToolbarController.isShowingAppMenuUpdateBadge()) {
+        if (mBottomToolbarCoordinator != null
+                && mBottomToolbarCoordinator.isShowingAppMenuUpdateBadge()) {
             return true;
         }
         return mToolbar.isShowingAppMenuUpdateBadge();
@@ -853,9 +853,9 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
             mLayoutManager = null;
         }
 
-        if (mBottomToolbarController != null) {
-            mBottomToolbarController.destroy();
-            mBottomToolbarController = null;
+        if (mBottomToolbarCoordinator != null) {
+            mBottomToolbarCoordinator.destroy();
+            mBottomToolbarCoordinator = null;
         }
 
         mLocationBar.removeUrlFocusChangeListener(this);

chrome/android/java_sources.gni

@@ -1342,7 +1342,7 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/tabmodel/document/StorageDelegate.java",
   "java/src/org/chromium/chrome/browser/tabmodel/document/TabDelegate.java",
   "java/src/org/chromium/chrome/browser/toolbar/ActionModeController.java",
-  "java/src/org/chromium/chrome/browser/toolbar/BottomToolbarController.java",
+  "java/src/org/chromium/chrome/browser/toolbar/BottomToolbarCoordinator.java",
   "java/src/org/chromium/chrome/browser/toolbar/BottomToolbarMediator.java",
   "java/src/org/chromium/chrome/browser/toolbar/BottomToolbarModel.java",
   "java/src/org/chromium/chrome/browser/toolbar/BottomToolbarViewBinder.java",