diff options
| author | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 22:56:38 +0000 |
|---|---|---|
| committer | erikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 22:56:38 +0000 |
| commit | 385e5b56919c8e55dffb814c19edd33839dd7b50 (patch) | |
| tree | 13b9cbb785e109e5f7f43552aab7b09ac0b9e229 /chrome/browser/shell_integration.cc | |
| parent | 15197f69d61f786fd953dd44ac417100c055433c (diff) | |
| download | chromium_src-385e5b56919c8e55dffb814c19edd33839dd7b50.zip chromium_src-385e5b56919c8e55dffb814c19edd33839dd7b50.tar.gz chromium_src-385e5b56919c8e55dffb814c19edd33839dd7b50.tar.bz2 | |
enable apps by default
BUG=none
TEST=run Chrome with no command line flags, apps should be enabled
Review URL: http://codereview.chromium.org/3015043
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54624 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 49c311e..1c54eca 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc @@ -42,10 +42,9 @@ 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::kDisableApps) && !extension_app_id.empty()) { arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kAppId) + - L"=\"" + ASCIIToWide(UTF16ToASCII(extension_app_id)) + L"\" --" + - ASCIIToWide(switches::kEnableApps); + L"=\"" + ASCIIToWide(UTF16ToASCII(extension_app_id)); } else { // Use '--app=url' instead of just 'url' to launch the browser with minimal // chrome. |