| Index: chrome/browser/ui/browser.cc
|
| diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
|
| index f596aa13462e5b6c9fd2db850b355ada4b73b04f..d9465e1f55ca056884516af4eff16e5493674bce 100644
|
| --- a/chrome/browser/ui/browser.cc
|
| +++ b/chrome/browser/ui/browser.cc
|
| @@ -48,7 +48,6 @@
|
| #include "chrome/browser/download/download_shelf.h"
|
| #include "chrome/browser/download/download_started_animation.h"
|
| #include "chrome/browser/download/download_util.h"
|
| -#include "chrome/browser/extensions/api/app/app_api.h"
|
| #include "chrome/browser/extensions/browser_extension_window_controller.h"
|
| #include "chrome/browser/extensions/crx_installer.h"
|
| #include "chrome/browser/extensions/default_apps_trial.h"
|
| @@ -56,6 +55,7 @@
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_tab_helper.h"
|
| #include "chrome/browser/extensions/extension_tabs_module.h"
|
| +#include "chrome/browser/extensions/platform_app_launcher.h"
|
| #include "chrome/browser/favicon/favicon_tab_helper.h"
|
| #include "chrome/browser/file_select_helper.h"
|
| #include "chrome/browser/first_run/first_run.h"
|
| @@ -693,7 +693,8 @@ WebContents* Browser::OpenApplication(
|
| const Extension* extension,
|
| extension_misc::LaunchContainer container,
|
| const GURL& override_url,
|
| - WindowOpenDisposition disposition) {
|
| + WindowOpenDisposition disposition,
|
| + const CommandLine* command_line) {
|
| WebContents* tab = NULL;
|
| ExtensionPrefs* prefs = profile->GetExtensionService()->extension_prefs();
|
| prefs->SetActiveBit(extension->id(), true);
|
| @@ -701,7 +702,7 @@ WebContents* Browser::OpenApplication(
|
| UMA_HISTOGRAM_ENUMERATION("Extensions.AppLaunchContainer", container, 100);
|
|
|
| if (extension->is_platform_app()) {
|
| - extensions::AppEventRouter::DispatchOnLaunchedEvent(profile, extension);
|
| + extensions::LaunchPlatformApp(profile, extension, command_line);
|
| return NULL;
|
| }
|
|
|
|
|