Fixed extension/app window maximum size calculation on Windows.

chrome/browser/ui/views/extensions/shell_window_frame_view.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 "chrome/browser/ui/views/extensions/shell_window_frame_view.h"
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/extensions/native_app_window_views.h"
 #include "extensions/common/draggable_region.h"
 #include "grit/theme_resources.h"
@@ skipping 327 matching lines @@
   int closeButtonOffsetX =
       (kCaptionHeight - close_button_->height()) / 2;
   int header_width = close_button_->width() + closeButtonOffsetX * 2;
   if (header_width > min_size.width())
     min_size.set_width(header_width);
   return min_size;
 }
 
 gfx::Size ShellWindowFrameView::GetMaximumSize() {
   gfx::Size max_size = frame_->client_view()->GetMaximumSize();
-  if (window_->frameless())
-    return max_size;
 
-  if (!max_size.IsEmpty()) {
-    gfx::Rect client_bounds = GetBoundsForClientView();
-    max_size.Enlarge(0, client_bounds.y());
-  }
+  // 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;
 }
 
 // views::ButtonListener implementation.
 
 void ShellWindowFrameView::ButtonPressed(views::Button* sender,
                                          const ui::Event& event) {
   DCHECK(!window_->frameless());
   if (sender == close_button_)
     frame_->Close();
   else if (sender == maximize_button_)
     frame_->Maximize();
   else if (sender == restore_button_)
     frame_->Restore();
   else if (sender == minimize_button_)
     frame_->Minimize();
 }