summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 20:02:11 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-25 20:02:11 +0000
commit51bdc2112610ec039b7245941a8fac58671ac156 (patch)
treef09329ff6901f576a3b55dc4b923e64015f45a7e /extensions
parent5ddd570f54265775e13274edb7bd868fb9c3bf47 (diff)
downloadchromium_src-51bdc2112610ec039b7245941a8fac58671ac156.zip
chromium_src-51bdc2112610ec039b7245941a8fac58671ac156.tar.gz
chromium_src-51bdc2112610ec039b7245941a8fac58671ac156.tar.bz2
Enable the Commands API.
Enabling on all desktop platforms except ChromeOS, where it will remain behind a feature flag until feature complete (http://crbug.com/336761). Also removing the channel restriction. BUG=302437, 336761 Review URL: https://codereview.chromium.org/197783005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/common/feature_switch.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/extensions/common/feature_switch.cc b/extensions/common/feature_switch.cc
index 83a4107..e97f270 100644
--- a/extensions/common/feature_switch.cc
+++ b/extensions/common/feature_switch.cc
@@ -25,7 +25,11 @@ class CommonSwitches {
FeatureSwitch::DEFAULT_DISABLED),
global_commands(
switches::kGlobalCommands,
+#if defined(OS_CHROMEOS)
FeatureSwitch::DEFAULT_DISABLED),
+#else
+ FeatureSwitch::DEFAULT_ENABLED),
+#endif
prompt_for_external_extensions(
NULL,
#if defined(OS_WIN)