summaryrefslogtreecommitdiffstats
path: root/chrome/common/extensions
diff options
context:
space:
mode:
authorerikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 22:56:38 +0000
committererikkay@chromium.org <erikkay@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-02 22:56:38 +0000
commit385e5b56919c8e55dffb814c19edd33839dd7b50 (patch)
tree13b9cbb785e109e5f7f43552aab7b09ac0b9e229 /chrome/common/extensions
parent15197f69d61f786fd953dd44ac417100c055433c (diff)
downloadchromium_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/common/extensions')
-rw-r--r--chrome/common/extensions/extension.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 82cfe9f..d1a2d79 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -953,11 +953,7 @@ GURL Extension::GetBaseURLFromExtensionId(const std::string& extension_id) {
// static
bool Extension::AppsAreEnabled() {
-#if defined(OS_CHROMEOS)
- return true;
-#else
- return CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableApps);
-#endif
+ return !CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableApps);
}
bool Extension::InitFromValue(const DictionaryValue& source, bool require_key,