Add switch to provide app window size on startup

chrome/browser/ui/extensions/application_launch.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/extensions/application_launch.h"
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/renderer_preferences.h"
+#include "ui/gfx/rect.h"
 
 using content::WebContents;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 
 namespace {
 
 // Get the launch URL for a given extension, with optional override/fallback.
 // |override_url|, if non-empty, will be preferred over the extension's
 // launch url.
@@ skipping 19 matching lines @@
   }
 
   return url;
 }
 
 WebContents* OpenApplicationWindow(
     Profile* profile,
     const Extension* extension,
     extension_misc::LaunchContainer container,
     const GURL& url_input,
-    Browser** app_browser) {
+    Browser** app_browser,
+    const gfx::Rect& override_bounds) {
   DCHECK(!url_input.is_empty() || extension);
   GURL url = UrlForExtension(extension, url_input);
 
   std::string app_name;
   app_name = extension ?
       web_app::GenerateApplicationNameFromExtensionId(extension->id()) :
       web_app::GenerateApplicationNameFromURL(url);
 
   Browser::Type type = Browser::TYPE_POPUP;
 
   gfx::Rect window_bounds;
   if (extension) {
     window_bounds.set_width(extension->launch_width());
     window_bounds.set_height(extension->launch_height());
+  } else if (!override_bounds.IsEmpty()) {
+    window_bounds = override_bounds;
   }
 
   Browser::CreateParams params(type, profile);
   params.app_name = app_name;
   params.initial_bounds = window_bounds;
 
 #if defined(USE_ASH)
   if (extension &&
       container == extension_misc::LAUNCH_WINDOW) {
     // In ash, LAUNCH_FULLSCREEN launches in a maximized app window and
@@ skipping 152 matching lines @@
   }
 
   switch (container) {
     case extension_misc::LAUNCH_NONE: {
       NOTREACHED();
       break;
     }
     case extension_misc::LAUNCH_PANEL:
     case extension_misc::LAUNCH_WINDOW:
       tab = OpenApplicationWindow(profile, extension, container,
-                                  override_url, NULL);
+                                  override_url, NULL, gfx::Rect());
       break;
     case extension_misc::LAUNCH_TAB: {
       tab = OpenApplicationTab(profile, extension, override_url,
                                params.disposition);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
   return tab;
 }
 
 WebContents* OpenAppShortcutWindow(Profile* profile,
-                                   const GURL& url) {
+                                   const GURL& url,
+                                   const gfx::Rect& override_bounds) {
   Browser* app_browser;
   WebContents* tab = OpenApplicationWindow(
       profile,
       NULL,  // this is a URL app.  No extension.
       extension_misc::LAUNCH_WINDOW,
       url,
-      &app_browser);
+      &app_browser,
+      override_bounds);
 
   if (!tab)
     return NULL;
 
   // Set UPDATE_SHORTCUT as the pending web app action. This action is picked
   // up in LoadingStateChanged to schedule a GetApplicationInfo. And when
   // the web app info is available, extensions::TabHelper notifies Browser via
   // OnDidGetApplicationInfo, which calls
   // web_app::UpdateShortcutForTabContents when it sees UPDATE_SHORTCUT as
   // pending web app action.
   extensions::TabHelper::FromWebContents(tab)->set_pending_web_app_action(
       extensions::TabHelper::UPDATE_SHORTCUT);
 
   return tab;
 }
 
 }  // namespace application_launch