diff options
| author | jackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-30 06:31:36 +0000 |
|---|---|---|
| committer | jackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-30 06:31:36 +0000 |
| commit | a9397d683bdd0e2509462ad9688ca577178d3f7e (patch) | |
| tree | 65095236b9b76b2a96ad6a9857cb5accb420e314 /apps/app_shim | |
| parent | b7ac4e6eb81f6b43d10fdea0d1837cf3c3ab4c8a (diff) | |
| download | chromium_src-a9397d683bdd0e2509462ad9688ca577178d3f7e.zip chromium_src-a9397d683bdd0e2509462ad9688ca577178d3f7e.tar.gz chromium_src-a9397d683bdd0e2509462ad9688ca577178d3f7e.tar.bz2 | |
Change --enable-app-shims to --disable-app-shims
Since app shims are now enabled in stable, invert the function of this
switch.
BUG=168080
Review URL: https://codereview.chromium.org/105923005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242711 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps/app_shim')
| -rw-r--r-- | apps/app_shim/app_shim_mac.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/app_shim/app_shim_mac.cc b/apps/app_shim/app_shim_mac.cc index 553f07c..becce61 100644 --- a/apps/app_shim/app_shim_mac.cc +++ b/apps/app_shim/app_shim_mac.cc @@ -5,14 +5,13 @@ #include "apps/app_shim/app_shim_mac.h" #include "base/command_line.h" -#include "chrome/browser/ui/app_list/app_list_util.h" #include "chrome/common/chrome_switches.h" namespace apps { bool IsAppShimsEnabled() { - return IsAppLauncherEnabled() || - CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableAppShims); + return !CommandLine::ForCurrentProcess()->HasSwitch( + switches::kDisableAppShims); } } // namespace apps |