Rename classes related to top controls

content/renderer/render_view_impl.cc

 // 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.
 
 #include "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <memory>
 
@@ skipping 662 matching lines @@
       enabled_bindings_(0),
       send_preferred_size_changes_(false),
       navigation_gesture_(NavigationGestureUnknown),
       opened_by_user_gesture_(true),
       history_list_offset_(-1),
       history_list_length_(0),
       frames_in_progress_(0),
       target_url_status_(TARGET_NONE),
       uses_temporary_zoom_level_(false),
 #if defined(OS_ANDROID)
-      top_controls_constraints_(TOP_CONTROLS_STATE_BOTH),
+      top_controls_constraints_(BROWSER_CONTROLS_STATE_BOTH),
 #endif
-      top_controls_shrink_blink_size_(false),
+      browser_controls_shrink_blink_size_(false),
       top_controls_height_(0.f),
       webview_(nullptr),
       has_scrolled_focused_editable_node_into_rect_(false),
       page_zoom_level_(params.page_zoom_level),
       main_render_frame_(nullptr),
       frame_widget_(nullptr),
       speech_recognition_dispatcher_(NULL),
 #if defined(OS_ANDROID)
       expected_content_intent_id_(0),
 #endif
@@ skipping 659 matching lines @@
     IPC_MESSAGE_HANDLER(PageMsg_UpdateWindowScreenRect,
                         OnUpdateWindowScreenRect)
     IPC_MESSAGE_HANDLER(PageMsg_SetZoomLevel, OnSetZoomLevel)
     IPC_MESSAGE_HANDLER(PageMsg_SetDeviceScaleFactor, OnSetDeviceScaleFactor);
     IPC_MESSAGE_HANDLER(PageMsg_WasHidden, OnPageWasHidden)
     IPC_MESSAGE_HANDLER(PageMsg_WasShown, OnPageWasShown)
     IPC_MESSAGE_HANDLER(PageMsg_SetHistoryOffsetAndLength,
                         OnSetHistoryOffsetAndLength)
 
 #if defined(OS_ANDROID)
-    IPC_MESSAGE_HANDLER(ViewMsg_UpdateTopControlsState,
-                        OnUpdateTopControlsState)
+    IPC_MESSAGE_HANDLER(ViewMsg_UpdateBrowserControlsState,
+                        OnUpdateBrowserControlsState)
     IPC_MESSAGE_HANDLER(ViewMsg_ExtractSmartClipData, OnExtractSmartClipData)
 #elif defined(OS_MACOSX)
     IPC_MESSAGE_HANDLER(ViewMsg_GetRenderedText,
                         OnGetRenderedText)
     IPC_MESSAGE_HANDLER(ViewMsg_Close, OnClose)
 #endif
     // Adding a new message? Add platform independent ones first, then put the
     // platform specific ones at the end.
 
     // Have the super handle all other messages.
@@ skipping 1010 matching lines @@
   if (!webview())
     return;
   auto_resize_mode_ = false;
   webview()->disableAutoResizeMode();
 
   if (!new_size.IsEmpty()) {
     ResizeParams resize_params;
     resize_params.screen_info = screen_info_;
     resize_params.new_size = new_size;
     resize_params.physical_backing_size = physical_backing_size_;
-    resize_params.top_controls_shrink_blink_size =
-        top_controls_shrink_blink_size_;
+    resize_params.browser_controls_shrink_blink_size =
+        browser_controls_shrink_blink_size_;
     resize_params.top_controls_height = top_controls_height_;
     resize_params.visible_viewport_size = visible_viewport_size_;
     resize_params.is_fullscreen_granted = is_fullscreen_granted();
     resize_params.display_mode = display_mode_;
     resize_params.needs_resize_ack = false;
     Resize(resize_params);
   }
 }
 
 void RenderViewImpl::OnEnablePreferredSizeChangedMode() {
@@ skipping 79 matching lines @@
     RenderThread::Get()->Send(new ViewHostMsg_Close_ACK(GetRoutingID()));
   RenderWidget::OnClose();
 }
 
 void RenderViewImpl::OnMoveOrResizeStarted() {
   if (webview())
     webview()->hidePopups();
 }
 
 void RenderViewImpl::ResizeWebWidget() {
-    webview()->resizeWithTopControls(GetSizeForWebWidget(),
-                                     top_controls_height_,
-                                     top_controls_shrink_blink_size_);
+  webview()->resizeWithBrowserControls(GetSizeForWebWidget(),
+                                       top_controls_height_,
+                                       browser_controls_shrink_blink_size_);
 }
 
 void RenderViewImpl::OnResize(const ResizeParams& params) {
   TRACE_EVENT0("renderer", "RenderViewImpl::OnResize");
   if (webview()) {
     webview()->hidePopups();
     if (send_preferred_size_changes_ &&
         webview()->mainFrame()->isWebLocalFrame()) {
       webview()->mainFrame()->setCanHaveScrollbars(
           ShouldDisplayScrollbars(params.new_size.width(),
                                   params.new_size.height()));
     }
     if (display_mode_ != params.display_mode) {
       display_mode_ = params.display_mode;
       webview()->setDisplayMode(display_mode_);
     }
   }
 
   gfx::Size old_visible_viewport_size = visible_viewport_size_;
 
-  top_controls_shrink_blink_size_ = params.top_controls_shrink_blink_size;
+  browser_controls_shrink_blink_size_ =
+      params.browser_controls_shrink_blink_size;
   top_controls_height_ = params.top_controls_height;
 
   RenderWidget::OnResize(params);
 
   if (old_visible_viewport_size != visible_viewport_size_)
     has_scrolled_focused_editable_node_into_rect_ = false;
 }
 
 void RenderViewImpl::RenderWidgetDidFlushPaint() {
   // If the RenderWidget is closing down then early-exit, otherwise we'll crash.
@@ skipping 415 matching lines @@
   }
 }
 
 void RenderViewImpl::SetDeviceScaleFactorForTesting(float factor) {
   ResizeParams params;
   params.screen_info = screen_info_;
   params.screen_info.device_scale_factor = factor;
   params.new_size = size();
   params.visible_viewport_size = visible_viewport_size_;
   params.physical_backing_size = gfx::ScaleToCeiledSize(size(), factor);
-  params.top_controls_shrink_blink_size = false;
+  params.browser_controls_shrink_blink_size = false;
   params.top_controls_height = 0.f;
   params.is_fullscreen_granted = is_fullscreen_granted();
   params.display_mode = display_mode_;
   OnResize(params);
 }
 
 void RenderViewImpl::ForceResizeForTesting(const gfx::Size& new_size) {
   gfx::Rect new_window_rect(rootWindowRect().x,
                             rootWindowRect().y,
                             new_size.width(),
@@ skipping 63 matching lines @@
   if (IsUseZoomForDSFEnabled()) {
     webview()->setZoomFactorForDeviceScaleFactor(device_scale_factor_);
   } else {
     webview()->setDeviceScaleFactor(device_scale_factor_);
   }
   webview()->settings()->setPreferCompositingToLCDTextEnabled(
       PreferCompositingToLCDText(compositor_deps_, device_scale_factor_));
 }
 
 }  // namespace content