Rename classes related to top controls

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java
index d202dbffbe05f6b86e1c8dffb1548cdfefa197f2..fec65b8410af7fa647b541338b2db2941d8d7bea 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/OverlayPanel.java
@@ -29,7 +29,7 @@ import org.chromium.chrome.browser.multiwindow.MultiWindowUtils;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.content.browser.ContentViewClient;
 import org.chromium.content.browser.ContentViewCore;
-import org.chromium.content_public.common.TopControlsState;
+import org.chromium.content_public.common.BrowserControlsState;
 import org.chromium.ui.base.LocalizationUtils;
 import org.chromium.ui.resources.ResourceManager;
 
@@ -289,9 +289,9 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
     }
 
     /**
-     * @return The absolute amount in DP that the top controls have shifted off screen.
+     * @return The absolute amount in DP that the browser controls have shifted off screen.
      */
-    protected float getTopControlsOffsetDp() {
+    protected float getBrowserControlsOffsetDp() {
         if (mActivity == null || mActivity.getFullscreenManager() == null) return 0.0f;
         return -mActivity.getFullscreenManager().getControlOffset() * mPxToDp;
     }
@@ -430,25 +430,25 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
     }
 
     /**
-     * Updates the top controls state for the base tab.  As these values are set at the renderer
+     * Updates the browser controls state for the base tab.  As these values are set at the renderer
      * level, there is potential for this impacting other tabs that might share the same
-     * process. See {@link Tab#updateTopControlsState(int current, boolean animate)}
+     * process. See {@link Tab#updateBrowserControlsState(int current, boolean animate)}
      * @param current The desired current state for the controls.  Pass
-     *                {@link TopControlsState#BOTH} to preserve the current position.
+     *                {@link BrowserControlsState#BOTH} to preserve the current position.
      * @param animate Whether the controls should animate to the specified ending condition or
      *                should jump immediately.
      */
-    public void updateTopControlsState(int current, boolean animate) {
+    public void updateBrowserControlsState(int current, boolean animate) {
         Tab currentTab = mActivity.getActivityTab();
         if (currentTab != null) {
-            currentTab.updateTopControlsState(current, animate);
+            currentTab.updateBrowserControlsState(current, animate);
         }
     }
 
     /**
      * Sets the top control state based on the internals of the panel.
      */
-    public void updateTopControlsState() {
+    public void updateBrowserControlsState() {
         if (mContent == null) return;
 
         if (isFullWidthSizePanel()) {
@@ -459,9 +459,9 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
             // minus the Toolbar height.
             //
             // This is necessary to fix the bugs: crbug.com/510205 and crbug.com/510206
-            mContent.updateTopControlsState(false, true, false);
+            mContent.updateBrowserControlsState(false, true, false);
         } else {
-            mContent.updateTopControlsState(true, false, false);
+            mContent.updateBrowserControlsState(true, false, false);
         }
     }
 
@@ -823,17 +823,17 @@ public class OverlayPanel extends OverlayPanelAnimation implements ActivityState
     public boolean handlesTabCreating() {
         // If the panel is not opened, do not handle tab creating.
         if (!isPanelOpened()) return false;
-        // Updates TopControls' State so the Toolbar becomes visible.
+        // Updates BrowserControls' State so the Toolbar becomes visible.
         // TODO(pedrosimonetti): The transition when promoting to a new tab is only smooth
         // if the SearchContentView's vertical scroll position is zero. Otherwise the
         // ContentView will appear to jump in the screen. Coordinate with @dtrainor to solve
         // this problem.
-        updateTopControlsState(TopControlsState.BOTH, false);
+        updateBrowserControlsState(BrowserControlsState.BOTH, false);
         return true;
     }
 
     @Override
-    public boolean shouldHideAndroidTopControls() {
+    public boolean shouldHideAndroidBrowserControls() {
         return isPanelOpened();
     }