Add a way to fetch window frame metrics from NativeShellWindow

chrome/browser/ui/views/extensions/shell_window_views.cc

Index: chrome/browser/ui/views/extensions/shell_window_views.cc
diff --git a/chrome/browser/ui/views/extensions/shell_window_views.cc b/chrome/browser/ui/views/extensions/shell_window_views.cc
index 677359bffd5f0c4f9b48729e6ada8f56afd6d062..d2cf79169668f5edc984b6db9a6a66e28c3be40e 100644
--- a/chrome/browser/ui/views/extensions/shell_window_views.cc
+++ b/chrome/browser/ui/views/extensions/shell_window_views.cc
@@ -409,9 +409,8 @@ ShellWindowViews::ShellWindowViews(ShellWindow* shell_window,
   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());
@@ -574,6 +573,13 @@ bool ShellWindowViews::IsAlwaysOnTop() const {
   return false;
 }
 
+gfx::Insets ShellWindowViews::GetFrameInsets() const {
+  if (frameless())
+    return gfx::Insets();
+
+  return gfx::Insets(kCaptionHeight, 0, 0, 0);
+}
+
 void ShellWindowViews::DeleteDelegate() {
   shell_window_->OnNativeClose();
 }