Fix omnibox height when less than 64 pixels tall.

ui/views/widget/desktop_aura/desktop_root_window_host_win.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 "ui/views/widget/desktop_aura/desktop_root_window_host_win.h"
 
 #include "base/win/metro.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRegion.h"
 #include "ui/aura/client/aura_constants.h"
@@ skipping 222 matching lines @@
       gfx::Vector2d(expanded.width() - size_in_pixels.width(),
                     expanded.height() - size_in_pixels.height());
   message_handler_->SetSize(expanded);
 }
 
 void DesktopWindowTreeHostWin::StackAtTop() {
   message_handler_->StackAtTop();
 }
 
 void DesktopWindowTreeHostWin::CenterWindow(const gfx::Size& size) {
+  gfx::Size size_in_pixels = gfx::win::DIPToScreenSize(size);
   gfx::Size expanded_size;
-  expanded_size = GetExpandedWindowSize(
-      message_handler_->window_ex_style(), size);
-  gfx::Size size_in_pixels = gfx::win::DIPToScreenSize(expanded_size);
-  message_handler_->CenterWindow(size_in_pixels);
+  expanded_size = GetExpandedWindowSize(message_handler_->window_ex_style(),
+                                        size_in_pixels);
+  window_enlargement_ =
+      gfx::Vector2d(expanded_size.width() - size_in_pixels.width(),
+                    expanded_size.height() - size_in_pixels.height());
+  message_handler_->CenterWindow(expanded_size);
 }
 
 void DesktopWindowTreeHostWin::GetWindowPlacement(
     gfx::Rect* bounds,
     ui::WindowShowState* show_state) const {
   message_handler_->GetWindowPlacement(bounds, show_state);
   InsetBottomRight(bounds, window_enlargement_);
   *bounds = gfx::win::ScreenToDIPRect(*bounds);
 }
 
@@ skipping 188 matching lines @@
 }
 
 void DesktopWindowTreeHostWin::ToggleFullScreen() {
   SetWindowTransparency();
 }
 
 // GetBounds and SetBounds work in pixel coordinates, whereas other get/set
 // methods work in DIP.
 
 gfx::Rect DesktopWindowTreeHostWin::GetBounds() const {
-  // Match the logic in HWNDMessageHandler::ClientAreaSizeChanged().
-  if (IsMinimized())
-    return gfx::Rect();
-  gfx::Rect bounds(WidgetSizeIsClientSize() ?
-      message_handler_->GetClientAreaBoundsInScreen() :
-      message_handler_->GetWindowBoundsInScreen());
-
+  gfx::Rect bounds(message_handler_->GetClientAreaBounds());
   // If the window bounds were expanded we need to return the original bounds
   // To achieve this we do the reverse of the expansion, i.e. add the
   // window_expansion_top_left_delta_ to the origin and subtract the
   // window_expansion_bottom_right_delta_ from the width and height.
   gfx::Rect without_expansion(
       bounds.x() + window_expansion_top_left_delta_.x(),
       bounds.y() + window_expansion_top_left_delta_.y(),
       bounds.width() - window_expansion_bottom_right_delta_.x() -
           window_enlargement_.x(),
       bounds.height() - window_expansion_bottom_right_delta_.y() -
           window_enlargement_.y());
   return without_expansion;
 }
 
 void DesktopWindowTreeHostWin::SetBounds(const gfx::Rect& bounds) {
   // If the window bounds have to be expanded we need to subtract the
   // window_expansion_top_left_delta_ from the origin and add the
   // window_expansion_bottom_right_delta_ to the width and height
+  gfx::Size old_hwnd_size(message_handler_->GetClientAreaBounds().size());
+  gfx::Size old_content_size = GetBounds().size();
+
   gfx::Rect expanded(
       bounds.x() - window_expansion_top_left_delta_.x(),
       bounds.y() - window_expansion_top_left_delta_.y(),
       bounds.width() + window_expansion_bottom_right_delta_.x(),
       bounds.height() + window_expansion_bottom_right_delta_.y());
 
   gfx::Rect new_expanded(
       expanded.origin(),
       GetExpandedWindowSize(message_handler_->window_ex_style(),
                             expanded.size()));
   window_enlargement_ =
       gfx::Vector2d(new_expanded.width() - expanded.width(),
                     new_expanded.height() - expanded.height());
   message_handler_->SetBounds(new_expanded);
+
+  // The client area size may have changed even though the window bounds have
+  // not, if the window bounds were expanded to 64 pixels both times.
+  if (old_hwnd_size == new_expanded.size() && old_content_size != bounds.size())
+    HandleClientSizeChanged(new_expanded.size());
 }
 
 gfx::Insets DesktopWindowTreeHostWin::GetInsets() const {
   return gfx::Insets();
 }
 
 void DesktopWindowTreeHostWin::SetInsets(const gfx::Insets& insets) {
 }
 
 gfx::Point DesktopWindowTreeHostWin::GetLocationOnNativeScreen() const {
@@ skipping 485 matching lines @@
 
 // static
 DesktopWindowTreeHost* DesktopWindowTreeHost::Create(
     internal::NativeWidgetDelegate* native_widget_delegate,
     DesktopNativeWidgetAura* desktop_native_widget_aura) {
   return new DesktopWindowTreeHostWin(native_widget_delegate,
                                       desktop_native_widget_aura);
 }
 
 }  // namespace views