Add a way to fetch window frame metrics from NativeShellWindow

chrome/browser/ui/views/extensions/shell_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/shell_window_views.h"
 
 #include "base/utf_string_conversions.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"
@@ skipping 391 matching lines @@
       is_fullscreen_(false),
       frameless_(win_params.frame == ShellWindow::CreateParams::FRAME_NONE) {
   window_ = new views::Widget;
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_WINDOW);
   params.delegate = this;
   params.remove_standard_frame = true;
   params.use_system_default_icon = true;
   minimum_size_ = win_params.minimum_size;
   maximum_size_ = win_params.maximum_size;
   window_->Init(params);
-  gfx::Rect window_bounds =
-      window_->non_client_view()->GetWindowBoundsForClientBounds(
-          win_params.bounds);
+  gfx::Rect window_bounds = win_params.bounds;
+  window_bounds.Inset(-GetFrameInsets());
   // Center window if no position was specified.
   if (win_params.bounds.x() == INT_MIN || win_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(
       extension()->id());
   ui::win::SetAppIdForWindow(
@@ skipping 142 matching lines @@
 }
 
 void ShellWindowViews::FlashFrame(bool flash) {
   window_->FlashFrame(flash);
 }
 
 bool ShellWindowViews::IsAlwaysOnTop() const {
   return false;
 }
 
+gfx::Insets ShellWindowViews::GetFrameInsets() const {
+  if (frameless())
+    return gfx::Insets();
+
+  gfx::Rect client_bounds = gfx::Rect(100, 100);

[stevenjb, 2012/11/27 01:12:47]

I take it 100 x 100 is arbitrary? I assume it just has to be larger than the max
inset size? We should add a comment here stating as such and/or use constants.

[jeremya, 2012/11/27 02:50:16]

it just needs to be large enough that GetWindowBoundsForClientBounds isn't going
to decide that it's too small and return something larger than the real insets,
in trying to enforce that the window size be large enough for the frame controls
to fit. Perhaps it should actually be (1000,1000).

I've upped the size and added a comment.

+  gfx::Rect window_bounds =
+      window_->non_client_view()->GetWindowBoundsForClientBounds(
+          client_bounds);
+  return window_bounds.InsetsFrom(client_bounds);
+}
+
 void ShellWindowViews::DeleteDelegate() {
   shell_window_->OnNativeClose();
 }
 
 bool ShellWindowViews::CanResize() const {
   return maximum_size_.IsEmpty() || minimum_size_ != maximum_size_;
 }
 
 bool ShellWindowViews::CanMaximize() const {
   return CanResize();
@@ skipping 147 matching lines @@
                                            ui::WindowShowState show_state) {
   views::WidgetDelegate::SaveWindowPlacement(bounds, show_state);
   shell_window_->SaveWindowPosition();
 }
 
 // static
 NativeShellWindow* NativeShellWindow::Create(
     ShellWindow* shell_window, const ShellWindow::CreateParams& params) {
   return new ShellWindowViews(shell_window, params);
 }