Add a way to fetch window frame metrics from NativeShellWindow

chrome/browser/ui/views/extensions/native_app_window_views.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/native_app_window_views.h"
 
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
 #include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
 #include "chrome/browser/ui/views/extensions/shell_window_frame_view.h"
@@ skipping 60 matching lines @@
   web_view_->SetWebContents(NULL);
 }
 
 void NativeAppWindowViews::InitializeDefaultWindow(
     const ShellWindow::CreateParams& create_params) {
   views::Widget::InitParams init_params(views::Widget::InitParams::TYPE_WINDOW);
   init_params.delegate = this;
   init_params.remove_standard_frame = true;
   init_params.use_system_default_icon = true;
   window_->Init(init_params);
-  gfx::Rect window_bounds =
-      window_->non_client_view()->GetWindowBoundsForClientBounds(
-          create_params.bounds);
+  gfx::Rect window_bounds = create_params.bounds;
+  window_bounds.Inset(-GetFrameInsets());
   // Center window if no position was specified.
   if (create_params.bounds.x() == INT_MIN ||
       create_params.bounds.y() == INT_MIN) {
     window_->CenterWindow(window_bounds.size());
   } else {
     window_->SetBounds(window_bounds);
   }
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   std::string app_name = web_app::GenerateApplicationNameFromExtensionId(
@@ skipping 109 matching lines @@
 }
 
 void NativeAppWindowViews::FlashFrame(bool flash) {
   window_->FlashFrame(flash);
 }
 
 bool NativeAppWindowViews::IsAlwaysOnTop() const {
   return shell_window_->window_type() == ShellWindow::WINDOW_TYPE_PANEL;
 }
 
+gfx::Insets NativeAppWindowViews::GetFrameInsets() const {
+  if (frameless())
+    return gfx::Insets();
+
+  // The pretend client_bounds passed in need to be large enough to ensure that
+  // GetWindowBoundsForClientBounds() doesn't decide that it needs more than
+  // the specified amount of space to fit the window controls in, and return a
+  // number larger than the real frame insets. Most window controls are smaller
+  // than 1000x1000px, so this should be big enough.
+  gfx::Rect client_bounds = gfx::Rect(1000, 1000);
+  gfx::Rect window_bounds =
+      window_->non_client_view()->GetWindowBoundsForClientBounds(
+          client_bounds);
+  return window_bounds.InsetsFrom(client_bounds);
+}
+
 // Private method. TODO(stevenjb): Move this below InitializePanelWindow()
 // to match declaration order.
 void NativeAppWindowViews::OnViewWasResized() {
   // TODO(jeremya): this doesn't seem like a terribly elegant way to keep the
   // window shape in sync.
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Set the window shape of the RWHV.
   DCHECK(window_);
   DCHECK(web_view_);
   gfx::Size sz = web_view_->size();
@@ skipping 238 matching lines @@
 }
 
 //------------------------------------------------------------------------------
 // NativeAppWindow::Create
 
 // static
 NativeAppWindow* NativeAppWindow::Create(
     ShellWindow* shell_window, const ShellWindow::CreateParams& params) {
   return new NativeAppWindowViews(shell_window, params);
 }