diff options
| author | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 04:45:50 +0000 |
|---|---|---|
| committer | rafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-05 04:45:50 +0000 |
| commit | 28375ae7d27179af48386d37e78ca47a2563e0d0 (patch) | |
| tree | eeda16c75ff2651afe1cc1738f19226e9cd7ec96 /chrome/browser/web_applications/web_app.cc | |
| parent | 65b6cf331fd6bebe125635cffd01b595f58638c0 (diff) | |
| download | chromium_src-28375ae7d27179af48386d37e78ca47a2563e0d0.zip chromium_src-28375ae7d27179af48386d37e78ca47a2563e0d0.tar.gz chromium_src-28375ae7d27179af48386d37e78ca47a2563e0d0.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/web_applications/web_app.cc')
| -rw-r--r-- | chrome/browser/web_applications/web_app.cc | 10 |
1 files changed, 3 insertions, 7 deletions
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. |