Add switch to provide app window size on startup

chrome/browser/ui/startup/startup_browser_creator_impl.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/startup/startup_browser_creator_impl.h"
 
+#include <algorithm>
+#include <vector>
+
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/event_recorder.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 61 matching lines @@
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "grit/locale_settings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/rect.h"
+#include "ui/gfx/screen.h"
+
+#if defined(USE_ASH)
+#include "ash/launcher/launcher_types.h"
+#endif
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "chrome/browser/ui/cocoa/keystone_infobar_delegate.h"
 #endif
 
 #if defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/gtk_util.h"
 #endif
 
@@ skipping 104 matching lines @@
   // preference is set, launch as a window.
   extension_misc::LaunchContainer launch_container =
       extensions_service->extension_prefs()->GetLaunchContainer(
           extension, extensions::ExtensionPrefs::LAUNCH_WINDOW);
 
   *out_extension = extension;
   *out_launch_container = launch_container;
   return true;
 }
 
+// Parse two comma-separated integers from string. Return true on success.
+bool ParseCommaSeparatedIntegers(const std::string& str,
+                                 int* ret_num1,
+                                 int* ret_num2) {
+  std::vector<std::string> dimensions;
+  base::SplitString(str, ',', &dimensions);
+  if (dimensions.size() != 2)
+    return false;
+
+  int num1, num2;
+  if (!base::StringToInt(dimensions[0], &num1) ||
+      !base::StringToInt(dimensions[1], &num2))
+    return false;
+
+  *ret_num1 = num1;
+  *ret_num2 = num2;
+  return true;
+}
+
 void RecordCmdLineAppHistogram() {
   AppLauncherHandler::RecordAppLaunchType(
       extension_misc::APP_LAUNCH_CMD_LINE_APP);
 }
 
 void RecordAppLaunches(Profile* profile,
                        const std::vector<GURL>& cmd_line_urls,
                        StartupTabs& autolaunch_tabs) {
   ExtensionService* extension_service = profile->GetExtensionService();
   DCHECK(extension_service);
@@ skipping 174 matching lines @@
   }
 
 #if defined(OS_WIN)
   if (process_startup)
     ShellIntegration::MigrateChromiumShortcuts();
 #endif  // defined(OS_WIN)
 
   return true;
 }
 
+void StartupBrowserCreatorImpl::ExtractOptionalAppWindowSize(
+    gfx::Rect* bounds) {
+  if (command_line_.HasSwitch(switches::kAppWindowSize)) {
+    int width, height;
+    width = height = 0;
+    std::string switch_value =
+        command_line_.GetSwitchValueASCII(switches::kAppWindowSize);
+    if (ParseCommaSeparatedIntegers(switch_value, &width, &height)) {
+      const gfx::Rect work_area = gfx::Screen::GetPrimaryDisplay().work_area();
+      width = std::min(width, work_area.width());
+      height = std::min(height, work_area.height());
+      bounds->set_size(gfx::Size(width, height));
+      bounds->set_x((work_area.width() - bounds->width()) / 2);
+      // TODO(nkostylev): work_area does include launcher but should not.
+      // Launcher auto hide pref is synced and is most likely not applied here.
+      bounds->set_y((work_area.height() - bounds->height()) / 2);
+    }
+  }
+}
+
 bool StartupBrowserCreatorImpl::IsAppLaunch(std::string* app_url,
                                             std::string* app_id) {
   if (command_line_.HasSwitch(switches::kApp)) {
     if (app_url)
       *app_url = command_line_.GetSwitchValueASCII(switches::kApp);
     return true;
   }
   if (command_line_.HasSwitch(switches::kAppId)) {
     if (app_id)
       *app_id = command_line_.GetSwitchValueASCII(switches::kAppId);
@@ skipping 86 matching lines @@
         ChildProcessSecurityPolicy::GetInstance();
     if (policy->IsWebSafeScheme(url.scheme()) ||
         url.SchemeIs(chrome::kFileScheme)) {
       if (profile->GetExtensionService()->IsInstalledApp(url)) {
         RecordCmdLineAppHistogram();
       } else {
         AppLauncherHandler::RecordAppLaunchType(
             extension_misc::APP_LAUNCH_CMD_LINE_APP_LEGACY);
       }
 
+      gfx::Rect override_bounds;
+      ExtractOptionalAppWindowSize(&override_bounds);
+
       WebContents* app_tab = application_launch::OpenAppShortcutWindow(
           profile,
-          url);
+          url,
+          override_bounds);
 
       if (out_app_contents)
         *out_app_contents = app_tab;
 
       return (app_tab != NULL);
     }
   }
   return false;
 }
 
@@ skipping 417 matching lines @@
         // New:
         prefs->GetString(prefs::kHomePage),
         prefs->GetBoolean(prefs::kHomePageIsNewTabPage),
         prefs->GetBoolean(prefs::kShowHomeButton),
         // Backup:
         backup_homepage,
         backup_homepage_is_ntp,
         backup_show_home_button));
   }
 }