Rename classes related to top controls

cc/layers/viewport.cc

 // Copyright 2015 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 "cc/layers/viewport.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
-#include "cc/input/top_controls_manager.h"
+#include "cc/input/browser_controls_offset_manager.h"
 #include "cc/trees/layer_tree_host_impl.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/scroll_node.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 #include "ui/gfx/geometry/vector2d_f.h"
 
 namespace cc {
 
 // static
 std::unique_ptr<Viewport> Viewport::Create(LayerTreeHostImpl* host_impl) {
@@ skipping 15 matching lines @@
 
 Viewport::ScrollResult Viewport::ScrollBy(const gfx::Vector2dF& delta,
                                           const gfx::Point& viewport_point,
                                           bool is_direct_manipulation,
                                           bool affect_top_controls) {
   if (!OuterScrollLayer())
     return ScrollResult();
 
   gfx::Vector2dF content_delta = delta;
 
-  if (affect_top_controls && ShouldTopControlsConsumeScroll(delta))
-    content_delta -= ScrollTopControls(delta);
+  if (affect_top_controls && ShouldBrowserControlsConsumeScroll(delta))
+    content_delta -= ScrollBrowserControls(delta);
 
   gfx::Vector2dF pending_content_delta = content_delta;
 
   ScrollTree& scroll_tree =
       host_impl_->active_tree()->property_trees()->scroll_tree;
   ScrollNode* inner_node =
       scroll_tree.Node(InnerScrollLayer()->scroll_tree_index());
   pending_content_delta -= host_impl_->ScrollSingleNode(
       inner_node, pending_content_delta, viewport_point, is_direct_manipulation,
       &scroll_tree);
@@ skipping 134 matching lines @@
 
 void Viewport::PinchEnd() {
   pinch_anchor_adjustment_ = gfx::Vector2d();
   pinch_zoom_active_ = false;
 }
 
 LayerImpl* Viewport::MainScrollLayer() const {
   return OuterScrollLayer();
 }
 
-gfx::Vector2dF Viewport::ScrollTopControls(const gfx::Vector2dF& delta) {
+gfx::Vector2dF Viewport::ScrollBrowserControls(const gfx::Vector2dF& delta) {
   gfx::Vector2dF excess_delta =
-      host_impl_->top_controls_manager()->ScrollBy(delta);
+      host_impl_->browser_controls_manager()->ScrollBy(delta);
 
   return delta - excess_delta;
 }
 
-bool Viewport::ShouldTopControlsConsumeScroll(
+bool Viewport::ShouldBrowserControlsConsumeScroll(
     const gfx::Vector2dF& scroll_delta) const {
-  // Always consume if it's in the direction to show the top controls.
+  // Always consume if it's in the direction to show the browser controls.
   if (scroll_delta.y() < 0)
     return true;
 
   if (TotalScrollOffset().y() < MaxTotalScrollOffset().y())
     return true;
 
   return false;
 }
 
 gfx::Vector2dF Viewport::AdjustOverscroll(const gfx::Vector2dF& delta) const {
@@ skipping 34 matching lines @@
 
 LayerImpl* Viewport::InnerScrollLayer() const {
   return host_impl_->InnerViewportScrollLayer();
 }
 
 LayerImpl* Viewport::OuterScrollLayer() const {
   return host_impl_->OuterViewportScrollLayer();
 }
 
 }  // namespace cc