[Win Aero] Correctly set the minimum window size.

chrome/browser/ui/views/apps/glass_app_window_frame_view_win.cc

 // Copyright 2014 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 "chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h"
 
 #include "apps/ui/native_app_window.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/win/dpi.h"
 #include "ui/views/widget/widget.h"
@@ skipping 38 matching lines @@
   gfx::Insets insets = GetGlassInsets();
   return gfx::Rect(insets.left(),
                    insets.top(),
                    std::max(0, width() - insets.left() - insets.right()),
                    std::max(0, height() - insets.top() - insets.bottom()));
 }
 
 gfx::Rect GlassAppWindowFrameViewWin::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   gfx::Insets insets = GetGlassInsets();
+  // Our bounds are not the same as the window's due to the offset added by
+  // AppWindowDesktopWindowTreeHostWin::GetClientAreaInsets. So account for it
+  // here.
+  insets += gfx::Insets(0, 0, 1, 1);
   return gfx::Rect(client_bounds.x() - insets.left(),
                    client_bounds.y() - insets.top(),
                    client_bounds.width() + insets.left() + insets.right(),
                    client_bounds.height() + insets.top() + insets.bottom());
 }
 
 int GlassAppWindowFrameViewWin::NonClientHitTest(const gfx::Point& point) {
   if (widget_->IsFullscreen())
     return HTCLIENT;
 
@@ skipping 38 matching lines @@
       ->GetWindowBoundsForClientBounds(bounds)
       .size();
 }
 
 const char* GlassAppWindowFrameViewWin::GetClassName() const {
   return kViewClassName;
 }
 
 gfx::Size GlassAppWindowFrameViewWin::GetMinimumSize() const {
   gfx::Size min_size = widget_->client_view()->GetMinimumSize();
+
   gfx::Rect client_bounds = GetBoundsForClientView();
-  min_size.Enlarge(0, client_bounds.y());
+  min_size.Enlarge(width() - client_bounds.width(),
+                   height() - client_bounds.height());
   return min_size;
 }
 
 gfx::Size GlassAppWindowFrameViewWin::GetMaximumSize() const {
   gfx::Size max_size = widget_->client_view()->GetMaximumSize();
 
   // Add to the client maximum size the height of any title bar and borders.
   gfx::Size client_size = GetBoundsForClientView().size();
   if (max_size.width())
     max_size.Enlarge(width() - client_size.width(), 0);
   if (max_size.height())
     max_size.Enlarge(0, height() - client_size.height());
 
   return max_size;
 }