Introduce LaunchParams struct for opening chrome apps.

chrome/browser/ui/webui/ntp/app_launcher_handler.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/webui/ntp/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 35 matching lines @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "ui/base/animation/animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/codec/png_codec.h"
 
+using application_launch::LaunchParams;
+using application_launch::OpenApplication;
 using content::WebContents;
 using extensions::Extension;
 using extensions::ExtensionPrefs;
 
 namespace {
 
 const net::UnescapeRule::Type kUnescapeRules =
     net::UnescapeRule::NORMAL | net::UnescapeRule::URL_SPECIAL_CHARS;
 
 extension_misc::AppLaunchBucket ParseLaunchSource(
@@ skipping 461 matching lines @@
 
   WindowOpenDisposition disposition = args->GetSize() > 3 ?
         web_ui_util::GetDispositionFromClick(args, 3) : CURRENT_TAB;
   if (extension_id != extension_misc::kWebStoreAppId) {
     RecordAppLaunchByID(launch_bucket);
     extension_service_->apps_promo()->ExpireDefaultApps();
   } else {
     RecordWebStoreLaunch(url.find("chrome-ntp-promo") != std::string::npos);
   }
 
-  if (disposition == NEW_FOREGROUND_TAB || disposition == NEW_BACKGROUND_TAB) {
+  if (disposition == NEW_FOREGROUND_TAB || disposition == NEW_BACKGROUND_TAB ||
+      disposition == NEW_WINDOW) {
     // TODO(jamescook): Proper support for background tabs.
-    application_launch::OpenApplication(
-        profile, extension, extension_misc::LAUNCH_TAB, GURL(url), disposition,
-        NULL);
-  } else if (disposition == NEW_WINDOW) {
-    // Force a new window open.
-    application_launch::OpenApplication(
-        profile, extension, extension_misc::LAUNCH_WINDOW, GURL(url),
-        disposition, NULL);
+    LaunchParams params(profile, extension,
+                        disposition == NEW_WINDOW ?
+                            extension_misc::LAUNCH_WINDOW :
+                            extension_misc::LAUNCH_TAB,
+                        disposition);
+    params.override_url = GURL(url);
+    OpenApplication(params);
   } else {
     // Look at preference to find the right launch container.  If no preference
     // is set, launch as a regular tab.
     extension_misc::LaunchContainer launch_container =
         extension_service_->extension_prefs()->GetLaunchContainer(
             extension, ExtensionPrefs::LAUNCH_REGULAR);
 
     // To give a more "launchy" experience when using the NTP launcher, we close
     // it automatically.
     Browser* browser = browser::FindBrowserWithWebContents(
         web_ui()->GetWebContents());
     WebContents* old_contents = NULL;
     if (browser)
       old_contents = chrome::GetActiveWebContents(browser);
 
-    WebContents* new_contents = application_launch::OpenApplication(
-        profile, extension, launch_container, GURL(url),
-        old_contents ? CURRENT_TAB : NEW_FOREGROUND_TAB, NULL);
+    LaunchParams params(profile, extension, launch_container,
+                        old_contents ? CURRENT_TAB : NEW_FOREGROUND_TAB);
+    params.override_url = GURL(url);
+    WebContents* new_contents = OpenApplication(params);
 
     // This will also destroy the handler, so do not perform any actions after.
     if (new_contents != old_contents && browser && browser->tab_count() > 1)
       chrome::CloseWebContents(browser, old_contents);
   }
 }
 
 void AppLauncherHandler::HandleSetLaunchType(const ListValue* args) {
   std::string extension_id;
   double launch_type;
@@ skipping 407 matching lines @@
 
 void AppLauncherHandler::UninstallDefaultApps() {
   AppsPromo* apps_promo = extension_service_->apps_promo();
   const extensions::ExtensionIdSet& app_ids = apps_promo->old_default_apps();
   for (extensions::ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
     if (extension_service_->GetExtensionById(*iter, true))
       extension_service_->UninstallExtension(*iter, false, NULL);
   }
 }