summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authormpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-15 00:07:35 +0000
committermpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-15 00:07:35 +0000
commit416868c318169408219bfd6f56cfb915f61637ea (patch)
treee666250902f5adb02fcbd93f524783fe0b0ea9be /chrome/common
parent871c8b7558f8581a80394418f34f8d062e7632bd (diff)
downloadchromium_src-416868c318169408219bfd6f56cfb915f61637ea.zip
chromium_src-416868c318169408219bfd6f56cfb915f61637ea.tar.gz
chromium_src-416868c318169408219bfd6f56cfb915f61637ea.tar.bz2
Revert 49739 - Reenable InstallApps.
Don't cache the value of the CommandLine, since unit_tests can modify it while the process is running. BUG=41280 Review URL: http://codereview.chromium.org/2632001 TBR=mpcomplete@chromium.org Review URL: http://codereview.chromium.org/2861001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49745 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/extensions/extension.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 4a6bac3..8736c79 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -934,7 +934,9 @@ bool Extension::AppsAreEnabled() {
#if defined(OS_CHROMEOS)
return true;
#else
- return CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps);
+ static bool apps_enabled_mode =
+ CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps);
+ return apps_enabled_mode;
#endif
}