From 28375ae7d27179af48386d37e78ca47a2563e0d0 Mon Sep 17 00:00:00 2001 From: "rafaelw@chromium.org" Date: Fri, 5 Feb 2010 04:45:50 +0000 Subject: Implement launch disposition for extension-apps. This change adds an --app-id command switch that signifies that the extension-app with the given id should be launched according to its configuration. It also adds parsing for app.window_type in the manifest and the behavior that when installed and a desktop shortcut is created, the --app-id switch is used rather than the --app switch. BUG=32361 Review URL: http://codereview.chromium.org/573016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38184 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/web_applications/web_app.cc | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'chrome/browser/web_applications/web_app.cc') diff --git a/chrome/browser/web_applications/web_app.cc b/chrome/browser/web_applications/web_app.cc index 192c04d..b85035d 100644 --- a/chrome/browser/web_applications/web_app.cc +++ b/chrome/browser/web_applications/web_app.cc @@ -345,13 +345,9 @@ bool CreateShortcutTask::CreateShortcut() { // Working directory. std::wstring chrome_folder = file_util::GetDirectoryFromPath(chrome_exe); - // Gets the command line switches. - std::string switches; - if (CPB_GetCommandLineArgumentsCommon(shortcut_info_.url.spec().c_str(), - &switches) != CPERR_SUCCESS) { - NOTREACHED(); - return false; - } + std::string switches = + ShellIntegration::GetCommandLineArgumentsCommon(shortcut_info_.url, + shortcut_info_.extension_id); std::wstring wide_switchs(UTF8ToWide(switches)); // Generates app id from web app url and profile path. -- cgit v1.1