Rename classes related to top controls

chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java

Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java
index d22241bc396ec07b32e79eb88f027c19c17032aa..94c6fffd7d800f8b1b59e6b345d8d263b55fb724 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ToolbarSceneLayer.java
@@ -64,17 +64,17 @@ public class ToolbarSceneLayer extends SceneOverlayLayer implements SceneOverlay
     /**
      * Update the toolbar and progress bar layers.
      *
-     * @param topControlsBackgroundColor The background color of the top controls.
-     * @param topControlsUrlBarAlpha The alpha of the URL bar.
+     * @param browserControlsBackgroundColor The background color of the browser controls.
+     * @param browserControlsUrlBarAlpha The alpha of the URL bar.
      * @param fullscreenManager A ChromeFullscreenManager instance.
      * @param resourceManager A ResourceManager for loading static resources.
-     * @param forceHideAndroidTopControls True if the Android top controls are being hidden.
+     * @param forceHideAndroidBrowserControls True if the Android browser controls are being hidden.
      * @param sizingFlags The sizing flags for the toolbar.
      * @param isTablet If the device is a tablet.
      */
-    private void update(int topControlsBackgroundColor, float topControlsUrlBarAlpha,
+    private void update(int browserControlsBackgroundColor, float browserControlsUrlBarAlpha,
             ChromeFullscreenManager fullscreenManager, ResourceManager resourceManager,
-            boolean forceHideAndroidTopControls, int sizingFlags, boolean isTablet) {
+            boolean forceHideAndroidBrowserControls, int sizingFlags, boolean isTablet) {
         if (!DeviceClassManager.enableFullscreen()) return;
 
         if (fullscreenManager == null) return;
@@ -90,9 +90,9 @@ public class ToolbarSceneLayer extends SceneOverlayLayer implements SceneOverlay
 
         float offset = fullscreenManager.getControlOffset();
         boolean useTexture = fullscreenManager.drawControlsAsTexture() || offset == 0
-                || forceHideAndroidTopControls;
+                || forceHideAndroidBrowserControls;
 
-        fullscreenManager.setHideTopControlsAndroidView(forceHideAndroidTopControls);
+        fullscreenManager.setHideBrowserControlsAndroidView(forceHideAndroidBrowserControls);
 
         if ((sizingFlags & SizingFlags.REQUIRE_FULLSCREEN_SIZE) != 0
                 && (sizingFlags & SizingFlags.ALLOW_TOOLBAR_HIDE) == 0
@@ -101,8 +101,8 @@ public class ToolbarSceneLayer extends SceneOverlayLayer implements SceneOverlay
         }
 
         nativeUpdateToolbarLayer(mNativePtr, resourceManager, R.id.control_container,
-                topControlsBackgroundColor, R.drawable.textbox, topControlsUrlBarAlpha, offset,
-                mViewport.height(), useTexture, forceHideAndroidTopControls);
+                browserControlsBackgroundColor, R.drawable.textbox, browserControlsUrlBarAlpha,
+                offset, mViewport.height(), useTexture, forceHideAndroidBrowserControls);
 
         if (mProgressBarDrawingInfo == null) return;
         nativeUpdateProgressBar(mNativePtr,
@@ -145,13 +145,14 @@ public class ToolbarSceneLayer extends SceneOverlayLayer implements SceneOverlay
     @Override
     public SceneOverlayLayer getUpdatedSceneOverlayTree(LayerTitleCache layerTitleCache,
             ResourceManager resourceManager, float yOffset) {
-        boolean forceHideTopControlsAndroidView =
-                mLayoutProvider.getActiveLayout().forceHideTopControlsAndroidView();
+        boolean forceHideBrowserControlsAndroidView =
+                mLayoutProvider.getActiveLayout().forceHideBrowserControlsAndroidView();
         int flags = mLayoutProvider.getActiveLayout().getSizingFlags();
 
-        update(mRenderHost.getTopControlsBackgroundColor(), mRenderHost.getTopControlsUrlBarAlpha(),
-                mLayoutProvider.getFullscreenManager(), resourceManager,
-                forceHideTopControlsAndroidView, flags, DeviceFormFactor.isTablet(mContext));
+        update(mRenderHost.getBrowserControlsBackgroundColor(),
+                mRenderHost.getBrowserControlsUrlBarAlpha(), mLayoutProvider.getFullscreenManager(),
+                resourceManager, forceHideBrowserControlsAndroidView, flags,
+                DeviceFormFactor.isTablet(mContext));
 
         return this;
     }
@@ -174,7 +175,7 @@ public class ToolbarSceneLayer extends SceneOverlayLayer implements SceneOverlay
     public void getVirtualViews(List<VirtualView> views) {}
 
     @Override
-    public boolean shouldHideAndroidTopControls() {
+    public boolean shouldHideAndroidBrowserControls() {
         return false;
     }