Allow changing top controls height

content/browser/renderer_host/render_widget_host_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/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 #include <set>
 #include <utility>
 
@@ skipping 559 matching lines @@
   if (!screen_info_) {
     screen_info_.reset(new blink::WebScreenInfo);
     GetWebScreenInfo(screen_info_.get());
   }
   resize_params->screen_info = *screen_info_;
   resize_params->resizer_rect = GetRootWindowResizerRect();
 
   if (view_) {
     resize_params->new_size = view_->GetRequestedRendererSize();
     resize_params->physical_backing_size = view_->GetPhysicalBackingSize();
-    resize_params->top_controls_layout_height =
-        view_->GetTopControlsLayoutHeight();
+    resize_params->top_controls_height = view_->GetTopControlsHeight();
+    resize_params->top_controls_shrink_blink_size =
+        view_->GetTopControlsShrinkBlinkSize();
     resize_params->visible_viewport_size = view_->GetVisibleViewportSize();
     resize_params->is_fullscreen = IsFullscreen();
   }
 }
 
 void RenderWidgetHostImpl::SetInitialRenderSizeParams(
     const ViewMsg_Resize_Params& resize_params) {
   // We don't expect to receive an ACK when the requested size or the physical
   // backing size is empty, or when the main viewport size didn't change.
   if (!resize_params.new_size.IsEmpty() &&
@@ skipping 18 matching lines @@
   scoped_ptr<ViewMsg_Resize_Params> params(new ViewMsg_Resize_Params);
 
   GetResizeParams(params.get());
   if (old_resize_params_) {
     size_changed = old_resize_params_->new_size != params->new_size;
     side_payload_changed =
         side_payload_changed ||
         old_resize_params_->physical_backing_size !=
             params->physical_backing_size ||
         old_resize_params_->is_fullscreen != params->is_fullscreen ||
-        old_resize_params_->top_controls_layout_height !=
-            params->top_controls_layout_height ||
+        old_resize_params_->top_controls_height !=
+            params->top_controls_height ||
+        old_resize_params_->top_controls_shrink_blink_size !=
+            params->top_controls_shrink_blink_size ||
         old_resize_params_->visible_viewport_size !=
             params->visible_viewport_size;
   }
 
   if (!size_changed && !side_payload_changed)
     return;
 
   // We don't expect to receive an ACK when the requested size or the physical
   // backing size is empty, or when the main viewport size didn't change.
   if (!params->new_size.IsEmpty() && !params->physical_backing_size.IsEmpty() &&
@@ skipping 1811 matching lines @@
 }
 #endif
 
 SkColorType RenderWidgetHostImpl::PreferredReadbackFormat() {
   if (view_)
     return view_->PreferredReadbackFormat();
   return kN32_SkColorType;
 }
 
 }  // namespace content