Rename classes related to top controls

chrome/browser/android/tab_android.cc

 // Copyright 2012 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.
 
 #include "chrome/browser/android/tab_android.h"
 
 #include <stddef.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 63 matching lines @@
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/browser_controls_state.h"
 #include "content/public/common/resource_request_body.h"
-#include "content/public/common/top_controls_state.h"
 #include "jni/Tab_jni.h"
 #include "net/base/escape.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/window_open_disposition.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
@@ skipping 648 matching lines @@
 void TabAndroid::CreateHistoricalTab(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj) {
   TabAndroid::CreateHistoricalTabFromContents(web_contents());
 }
 
 void TabAndroid::UpdateTopControlsState(JNIEnv* env,
                                         const JavaParamRef<jobject>& obj,
                                         jint constraints,
                                         jint current,
                                         jboolean animate) {
-  content::TopControlsState constraints_state =
-      static_cast<content::TopControlsState>(constraints);
-  content::TopControlsState current_state =
-      static_cast<content::TopControlsState>(current);
+  content::BrowserControlsState constraints_state =
+      static_cast<content::BrowserControlsState>(constraints);
+  content::BrowserControlsState current_state =
+      static_cast<content::BrowserControlsState>(current);
   WebContents* sender = web_contents();
   sender->Send(new ChromeViewMsg_UpdateTopControlsState(
       sender->GetRoutingID(), constraints_state, current_state, animate));
 
   if (sender->ShowingInterstitialPage()) {
     content::RenderViewHost* interstitial_view_host =
         sender->GetInterstitialPage()->GetMainFrame()->GetRenderViewHost();
     interstitial_view_host->Send(new ChromeViewMsg_UpdateTopControlsState(
         interstitial_view_host->GetRoutingID(), constraints_state,
         current_state, animate));
@@ skipping 114 matching lines @@
 static void Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   TRACE_EVENT0("native", "TabAndroid::Init");
   // This will automatically bind to the Java object and pass ownership there.
   new TabAndroid(env, obj);
 }
 
 // static
 bool TabAndroid::RegisterTabAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }