Rename classes related to top controls

content/public/renderer/render_view.h

 // Copyright (c) 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.
 
 #ifndef CONTENT_PUBLIC_RENDERER_RENDER_VIEW_H_
 #define CONTENT_PUBLIC_RENDERER_RENDER_VIEW_H_
 
 #include <stddef.h>
 
 #include <string>
 
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
-#include "content/public/common/top_controls_state.h"
+#include "content/public/common/browser_controls_state.h"
 #include "ipc/ipc_sender.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace blink {
 class WebElement;
 class WebFrame;
 class WebFrameWidget;
 class WebLocalFrame;
 class WebNode;
@@ skipping 86 matching lines @@
   // should be removed from RenderView and instead be plumbed through the
   // target frame and WebFrameTestProxy.
   virtual void SetEditCommandForNextKeyEvent(const std::string& name,
                                              const std::string& value) = 0;
   virtual void ClearEditCommands() = 0;
 
   // Returns |renderer_preferences_.accept_languages| value.
   virtual const std::string& GetAcceptLanguages() const = 0;
 
 #if defined(OS_ANDROID)
-  virtual void UpdateTopControlsState(TopControlsState constraints,
-                                      TopControlsState current,
+  virtual void UpdateTopControlsState(BrowserControlsState constraints,
+                                      BrowserControlsState current,
                                       bool animate) = 0;
 #endif
 
   // Converts the |rect| from Viewport coordinates to Window coordinates.
   // See blink::WebWidgetClient::convertViewportToWindow for more details.
   virtual void ConvertViewportToWindowViaWidget(blink::WebRect* rect) = 0;
 
   // Returns the bounds of |element| in Window coordinates. The bounds have been
   // adjusted to include any transformations, including page scale.
   // This function will update the layout if required.
   virtual gfx::RectF ElementBoundsInWindow(const blink::WebElement& element)
       = 0;
 
   virtual bool HasAddedInputHandler() const = 0;
 
  protected:
   ~RenderView() override {}
 
  private:
   // This interface should only be implemented inside content.
   friend class RenderViewImpl;
   RenderView() {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_RENDERER_RENDER_VIEW_H_