Honor window size for chrome.windows.create when parent window is maximized.

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 19eff086f996188cdd436aabd7d901461081d730..559dd5522d626d33a17ae1de3a29f27592034ca6 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -332,6 +332,13 @@ bool AllowPanels(const std::string& app_name) {
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, CreateParams:
 
+Browser::CreateParams::CreateParams()
+    : type(TYPE_TABBED),
+      profile(NULL),
+      initial_show_state(ui::SHOW_STATE_DEFAULT),
+      is_session_restore(false) {
+}
+
 Browser::CreateParams::CreateParams(Type type, Profile* profile)
     : type(type),
       profile(profile),
@@ -340,6 +347,38 @@ Browser::CreateParams::CreateParams(Type type, Profile* profile)
       is_session_restore(false) {
 }
 
+// static
+Browser::CreateParams Browser::CreateParams::CreateForApp(
+    Type type,
+    const std::string& app_name,
+    const gfx::Rect& window_bounds,
+    Profile* profile) {
+  DCHECK(type != TYPE_TABBED);
+  DCHECK(!app_name.empty());
+
+  if (type == TYPE_PANEL && !AllowPanels(app_name))
+    type = TYPE_POPUP;
+
+  CreateParams params(type, profile);
+  params.app_name = app_name;
+  params.app_type = APP_TYPE_CHILD;
+  params.initial_bounds = window_bounds;
+
+  return params;
+}
+
+// static
+Browser::CreateParams Browser::CreateParams::CreateForDevTools(
+    Profile* profile) {
+#if defined(OS_CHROMEOS)

[Ben Goodger (Google), 2012/04/04 16:14:42]

I think you can just do the same code for both platforms now that that cros has
a proper window manager that can deal with popups.

[Aaron Boodman, 2012/04/04 18:46:58]

Done.

+  CreateParams params(TYPE_TABBED, profile);
+#else
+  CreateParams params(TYPE_POPUP, profile);
+#endif
+  params.app_name = DevToolsWindow::kDevToolsApp;
+  return params;
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // Browser, Constructors, Creation, Showing:
 
@@ -524,41 +563,6 @@ Browser* Browser::CreateWithParams(const CreateParams& params) {
   return browser;
 }
 
-// static
-Browser* Browser::CreateForType(Type type, Profile* profile) {
-  CreateParams params(type, profile);
-  return CreateWithParams(params);
-}
-
-// static
-Browser* Browser::CreateForApp(Type type,
-                               const std::string& app_name,
-                               const gfx::Rect& window_bounds,
-                               Profile* profile) {
-  DCHECK(type != TYPE_TABBED);
-  DCHECK(!app_name.empty());
-
-  if (type == TYPE_PANEL && !AllowPanels(app_name))
-    type = TYPE_POPUP;
-
-  CreateParams params(type, profile);
-  params.app_name = app_name;
-  params.app_type = APP_TYPE_CHILD;
-  params.initial_bounds = window_bounds;
-  return CreateWithParams(params);
-}
-
-// static
-Browser* Browser::CreateForDevTools(Profile* profile) {
-#if defined(OS_CHROMEOS)
-  CreateParams params(TYPE_TABBED, profile);
-#else
-  CreateParams params(TYPE_POPUP, profile);
-#endif
-  params.app_name = DevToolsWindow::kDevToolsApp;
-  return CreateWithParams(params);
-}
-
 void Browser::InitBrowserWindow() {
   DCHECK(!window_);
 
@@ -3370,10 +3374,12 @@ void Browser::DuplicateContentsAt(int index) {
     if (is_app()) {
       CHECK(!is_type_popup());
       CHECK(!is_type_panel());
-      browser = Browser::CreateForApp(TYPE_POPUP, app_name_, gfx::Rect(),
-                                      profile_);
+      browser = Browser::CreateWithParams(
+          Browser::CreateParams::CreateForApp(
+              TYPE_POPUP, app_name_, gfx::Rect(),profile_));
     } else if (is_type_popup()) {
-      browser = Browser::CreateForType(TYPE_POPUP, profile_);
+      browser = Browser::CreateWithParams(
+          Browser::CreateParams(TYPE_POPUP, profile_));
     }
 
     // Preserve the size of the original window. The new window has already
@@ -3890,8 +3896,9 @@ void Browser::ConvertContentsToApplication(WebContents* contents) {
   std::string app_name = web_app::GenerateApplicationNameFromURL(url);
 
   DetachContents(contents);
-  Browser* app_browser = Browser::CreateForApp(
-      TYPE_POPUP, app_name, gfx::Rect(), profile_);
+  Browser* app_browser = Browser::CreateWithParams(
+      Browser::CreateParams::CreateForApp(
+          TYPE_POPUP, app_name, gfx::Rect(), profile_));
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(contents);
   if (!wrapper)
@@ -5581,7 +5588,8 @@ void Browser::ViewSource(TabContentsWrapper* contents,
                                                           view_source_contents,
                                                           add_types);
   } else {
-    Browser* browser = Browser::CreateForType(TYPE_TABBED, profile_);
+    Browser* browser = Browser::CreateWithParams(
+        Browser::CreateParams(TYPE_TABBED, profile_));
 
     // Preserve the size of the original window. The new window has already
     // been given an offset by the OS, so we shouldn't copy the old bounds.