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

chrome/browser/ui/browser.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/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // OS_WIN
@@ skipping 314 matching lines @@
   }
 #endif  // !OS_CHROMEOS || USE_AURA
   return true;
 }
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // 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),
       app_type(APP_TYPE_HOST),
       initial_show_state(ui::SHOW_STATE_DEFAULT),
       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:
 
 Browser::Browser(Type type, Profile* profile)
     : type_(type),
       profile_(profile),
       window_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(
           tab_handler_(TabHandler::CreateTabHandler(this))),
       command_updater_(this),
@@ skipping 164 matching lines @@
   browser->app_name_ = params.app_name;
   browser->app_type_ = params.app_type;
   browser->set_override_bounds(params.initial_bounds);
   browser->set_show_state(params.initial_show_state);
   browser->set_is_session_restore(params.is_session_restore);
 
   browser->InitBrowserWindow();
   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_);
 
   window_ = CreateBrowserWindow();
   fullscreen_controller_ = new FullscreenController(window_, profile_, this);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Set the app user model id for this application to that of the application
   // name.  See http://crbug.com/7028.
   ui::win::SetAppIdForWindow(
@@ skipping 2791 matching lines @@
         TabStripModel::ADD_INHERIT_GROUP |
         (pinned ? TabStripModel::ADD_PINNED : 0);
     tab_handler_->GetTabStripModel()->InsertTabContentsAt(index + 1,
                                                           contents_dupe,
                                                           add_types);
   } else {
     Browser* browser = NULL;
     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
     // been given an offset by the OS, so we shouldn't copy the old bounds.
     BrowserWindow* new_window = browser->window();
     new_window->SetBounds(gfx::Rect(new_window->GetRestoredBounds().origin(),
                           window()->GetRestoredBounds().size()));
 
     // We need to show the browser now.  Otherwise ContainerWin assumes the
     // TabContents is invisible and won't size it.
@@ skipping 496 matching lines @@
 
 bool Browser::IsApplication() const {
   return is_app();
 }
 
 void Browser::ConvertContentsToApplication(WebContents* contents) {
   const GURL& url = contents->GetController().GetActiveEntry()->GetURL();
   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)
     wrapper = new TabContentsWrapper(contents);
   app_browser->tabstrip_model()->AppendTabContents(wrapper, true);
 
   contents->GetMutableRendererPrefs()->can_accept_load_drops = false;
   contents->GetRenderViewHost()->SyncRendererPrefs();
   app_browser->window()->Show();
 }
@@ skipping 1669 matching lines @@
     // If this is a tabbed browser, just create a duplicate tab inside the same
     // window next to the tab being duplicated.
     int index =
         tab_handler_->GetTabStripModel()->GetIndexOfTabContents(contents);
     int add_types = TabStripModel::ADD_ACTIVE |
         TabStripModel::ADD_INHERIT_GROUP;
     tab_handler_->GetTabStripModel()->InsertTabContentsAt(index + 1,
                                                           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.
     BrowserWindow* new_window = browser->window();
     new_window->SetBounds(gfx::Rect(new_window->GetRestoredBounds().origin(),
                           window()->GetRestoredBounds().size()));
 
     // We need to show the browser now. Otherwise ContainerWin assumes the
     // TabContents is invisible and won't size it.
     browser->window()->Show();
@@ skipping 79 matching lines @@
     ShowSingletonTabOverwritingNTP(params);
   } else {
     LoginUIServiceFactory::GetForProfile(
         profile()->GetOriginalProfile())->ShowLoginUI(false);
   }
 }
 
 void Browser::ToggleSpeechInput() {
   GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput();
 }