| Index: chrome/browser/ui/extensions/application_launch.cc
|
| diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc
|
| index 0c55569fbc06afed7b82b97b9a0af5269c3bec79..a2a86b69bf9c5ad6928c01c650b564c060edca41 100644
|
| --- a/chrome/browser/ui/extensions/application_launch.cc
|
| +++ b/chrome/browser/ui/extensions/application_launch.cc
|
| @@ -81,12 +81,23 @@ bool AllowPanels(const std::string& app_name) {
|
|
|
| namespace application_launch {
|
|
|
| -WebContents* OpenApplication(Profile* profile,
|
| - const Extension* extension,
|
| - extension_misc::LaunchContainer container,
|
| - const GURL& override_url,
|
| - WindowOpenDisposition disposition,
|
| - const CommandLine* command_line) {
|
| +LaunchParams::LaunchParams(Profile* profile,
|
| + const extensions::Extension* extension,
|
| + extension_misc::LaunchContainer container,
|
| + WindowOpenDisposition disposition)
|
| + : profile(profile),
|
| + extension(extension),
|
| + container(container),
|
| + disposition(disposition),
|
| + override_url(),
|
| + command_line(NULL) {}
|
| +
|
| +WebContents* OpenApplication(const LaunchParams& params) {
|
| + Profile* profile = params.profile;
|
| + const extensions::Extension* extension = params.extension;
|
| + extension_misc::LaunchContainer container = params.container;
|
| + const GURL& override_url = params.override_url;
|
| +
|
| WebContents* tab = NULL;
|
| ExtensionPrefs* prefs = profile->GetExtensionService()->extension_prefs();
|
| prefs->SetActiveBit(extension->id(), true);
|
| @@ -98,7 +109,7 @@ WebContents* OpenApplication(Profile* profile,
|
| #endif
|
|
|
| if (extension->is_platform_app()) {
|
| - extensions::LaunchPlatformApp(profile, extension, command_line);
|
| + extensions::LaunchPlatformApp(profile, extension, params.command_line);
|
| return NULL;
|
| }
|
|
|
| @@ -128,7 +139,7 @@ WebContents* OpenApplication(Profile* profile,
|
| break;
|
| case extension_misc::LAUNCH_TAB: {
|
| tab = OpenApplicationTab(profile, extension, override_url,
|
| - disposition);
|
| + params.disposition);
|
| break;
|
| }
|
| default:
|
|
|