diff options
| author | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 01:18:07 +0000 |
|---|---|---|
| committer | aa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-13 01:18:07 +0000 |
| commit | 2bce5e17baa53ab9547a0dd8bb4c5eb005277264 (patch) | |
| tree | a39552d4d2fa97b3781cf7331b9b8ad96c5cceb4 /chrome/browser/shell_integration.cc | |
| parent | f6f2073d8c8fff901501eb4cc3f3e30a5467d608 (diff) | |
| download | chromium_src-2bce5e17baa53ab9547a0dd8bb4c5eb005277264.zip chromium_src-2bce5e17baa53ab9547a0dd8bb4c5eb005277264.tar.gz chromium_src-2bce5e17baa53ab9547a0dd8bb4c5eb005277264.tar.bz2 | |
Re-land r47079: Shorten several appsrelated flags.
TBR=rafaelw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47104 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, 2 insertions, 3 deletions
diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc index 9590cbb..23d9fcb 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc @@ -39,11 +39,10 @@ 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::kEnableExtensionApps) && - !extension_app_id.empty()) { + if (cmd.HasSwitch(switches::kEnableApps) && !extension_app_id.empty()) { arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kAppId) + L"=\"" + ASCIIToWide(UTF16ToASCII(extension_app_id)) + L"\" --" + - ASCIIToWide(switches::kEnableExtensionApps); + ASCIIToWide(switches::kEnableApps); } else { // Use '--app=url' instead of just 'url' to launch the browser with minimal // chrome. |