Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6525)

Unified Diff: chrome/browser/ui/extensions/application_launch.cc

Issue 10332071: Pass command line arguments onto platform apps which provide the right intent. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Windows tests fixed Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 05d59f1ddc6e0ebe594851997844e3d9e0688423..3446c05a4e4a0c32dda8467dc5738a1d935fa1f9 100644
--- a/chrome/browser/ui/extensions/application_launch.cc
+++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -4,13 +4,14 @@
#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/api/app/app_api.h"
#include "chrome/browser/extensions/default_apps_trial.h"
#include "chrome/browser/extensions/extension_prefs.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_tab_helper.h"
+#include "chrome/browser/extensions/platform_app_launcher.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/ui/browser.h"
@@ -81,7 +82,8 @@ WebContents* OpenApplication(Profile* profile,
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);
@@ -93,7 +95,7 @@ WebContents* OpenApplication(Profile* profile,
#endif
if (extension->is_platform_app()) {
- extensions::AppEventRouter::DispatchOnLaunchedEvent(profile, extension);
+ extensions::LaunchPlatformApp(profile, extension, command_line);
return NULL;
}
« no previous file with comments | « chrome/browser/ui/extensions/application_launch.h ('k') | chrome/browser/ui/panels/panel_app_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698