Rename classes related to top controls

content/renderer/render_view_impl_android.cc

Index: content/renderer/render_view_impl_android.cc
diff --git a/content/renderer/render_view_impl_android.cc b/content/renderer/render_view_impl_android.cc
index 5f87b0487056479da6f78e4f2d7932d4d582dde6..c16bd1aa42d960aa53b5effe037e0d64278a4bb0 100644
--- a/content/renderer/render_view_impl_android.cc
+++ b/content/renderer/render_view_impl_android.cc
@@ -13,20 +13,20 @@
 
 namespace content {
 
-// Check content::TopControlsState, and blink::WebWidget::TopControlsState
+// Check content::BrowserControlsState, and blink::WebWidget::TopControlsState
 // are kept in sync.
 static_assert(
-    int(TOP_CONTROLS_STATE_SHOWN) == int(blink::WebTopControlsShown),
+    int(BROWSER_CONTROLS_STATE_SHOWN) == int(blink::WebTopControlsShown),
     "mismatching enums: SHOWN");
 static_assert(
-    int(TOP_CONTROLS_STATE_HIDDEN) == int(blink::WebTopControlsHidden),
+    int(BROWSER_CONTROLS_STATE_HIDDEN) == int(blink::WebTopControlsHidden),
     "mismatching enums: HIDDEN");
 static_assert(
-    int(TOP_CONTROLS_STATE_BOTH) == int(blink::WebTopControlsBoth),
+    int(BROWSER_CONTROLS_STATE_BOTH) == int(blink::WebTopControlsBoth),
     "mismatching enums: BOTH");
 
 blink::WebTopControlsState ContentToBlink(
-    TopControlsState state) {
+    BrowserControlsState state) {
   return static_cast<blink::WebTopControlsState>(state);
 }
 
@@ -38,18 +38,18 @@ void RenderViewImpl::OnUpdateTopControlsState(bool enable_hiding,
   // TODO(tedchoc): Investigate why messages are getting here before the
   //                compositor has been initialized.
   LOG_IF(WARNING, !compositor_) << "OnUpdateTopControlsState was unhandled.";

[aelias_OOO_until_Jul13, 2016/10/21 18:44:21]

OnUpdateBrowserControlsState

-  TopControlsState constraints = TOP_CONTROLS_STATE_BOTH;
+  BrowserControlsState constraints = BROWSER_CONTROLS_STATE_BOTH;
   if (!enable_showing)
-    constraints = TOP_CONTROLS_STATE_HIDDEN;
+    constraints = BROWSER_CONTROLS_STATE_HIDDEN;
   if (!enable_hiding)
-    constraints = TOP_CONTROLS_STATE_SHOWN;
-  TopControlsState current = TOP_CONTROLS_STATE_BOTH;
+    constraints = BROWSER_CONTROLS_STATE_SHOWN;
+  BrowserControlsState current = BROWSER_CONTROLS_STATE_BOTH;
 
   UpdateTopControlsState(constraints, current, animate);
 }
 
-void RenderViewImpl::UpdateTopControlsState(TopControlsState constraints,
-                                            TopControlsState current,
+void RenderViewImpl::UpdateTopControlsState(BrowserControlsState constraints,
+                                            BrowserControlsState current,
                                             bool animate) {
   if (GetWebWidget())
     GetWebWidget()->updateTopControlsState(ContentToBlink(constraints),
@@ -62,8 +62,8 @@ void RenderViewImpl::didScrollWithKeyboard(const blink::WebSize& delta) {
   if (delta.height == 0)
     return;
 
-  TopControlsState current = delta.height < 0 ? TOP_CONTROLS_STATE_SHOWN
-                                              : TOP_CONTROLS_STATE_HIDDEN;
+  BrowserControlsState current = delta.height < 0 ? BROWSER_CONTROLS_STATE_SHOWN
+                                              : BROWSER_CONTROLS_STATE_HIDDEN;
 
   UpdateTopControlsState(top_controls_constraints_, current, true);
 }