diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-12 22:18:28 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-12 22:18:28 +0000 |
| commit | 5ebc4b2de52f4eab4c814066ea4ac67b8992d06c (patch) | |
| tree | e65e2f34ae4981e5d2f8b527d29fbd6ae525f793 /chrome/browser/shell_integration.cc | |
| parent | c90ce8463d6e839010bf0b17ef1b4c0c54c8f067 (diff) | |
| download | chromium_src-5ebc4b2de52f4eab4c814066ea4ac67b8992d06c.zip chromium_src-5ebc4b2de52f4eab4c814066ea4ac67b8992d06c.tar.gz chromium_src-5ebc4b2de52f4eab4c814066ea4ac67b8992d06c.tar.bz2 | |
Revert 47079 - Shorten several appsrelated flags. "256 characters should be enough for anyone's shortcut flags!"
Review URL: http://codereview.chromium.org/1991009
TBR=aa@chromium.org
Review URL: http://codereview.chromium.org/2010013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/shell_integration.cc')
| -rw-r--r-- | chrome/browser/shell_integration.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc index 23d9fcb..9590cbb 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc @@ -39,10 +39,11 @@ std::string ShellIntegration::GetCommandLineArgumentsCommon(const GURL& url, // If |extension_app_id| is present, we use the kAppId switch rather than // the kApp switch (the launch url will be read from the extension app // during launch. - if (cmd.HasSwitch(switches::kEnableApps) && !extension_app_id.empty()) { + if (cmd.HasSwitch(switches::kEnableExtensionApps) && + !extension_app_id.empty()) { arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kAppId) + L"=\"" + ASCIIToWide(UTF16ToASCII(extension_app_id)) + L"\" --" + - ASCIIToWide(switches::kEnableApps); + ASCIIToWide(switches::kEnableExtensionApps); } else { // Use '--app=url' instead of just 'url' to launch the browser with minimal // chrome. |