Fix omnibox height when less than 64 pixels tall.

ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

Index: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
diff --git a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
index 46f01770605c6fb4d276422309f4e7ff42fea1be..25fa7745333b93bf804d129f81ffad80dcd7be4d 100644
--- a/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
+++ b/ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
@@ -240,11 +240,14 @@ void DesktopWindowTreeHostWin::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(
@@ -453,13 +456,7 @@ void DesktopWindowTreeHostWin::ToggleFullScreen() {
 // 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
@@ -478,6 +475,9 @@ 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(),
@@ -492,6 +492,11 @@ void DesktopWindowTreeHostWin::SetBounds(const gfx::Rect& bounds) {
       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 {