summaryrefslogtreecommitdiffstats
path: root/components/policy
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-26 12:44:55 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-26 12:44:55 +0000
commit4913d2b2d683298debe0d33e0a16f2aacb83f8ff (patch)
treeee38fd5cb152ef481f04ad89020240a3f3243acb /components/policy
parent339deaffc5e2a3bc9656bff2b4c4f1a650f27347 (diff)
downloadchromium_src-4913d2b2d683298debe0d33e0a16f2aacb83f8ff.zip
chromium_src-4913d2b2d683298debe0d33e0a16f2aacb83f8ff.tar.gz
chromium_src-4913d2b2d683298debe0d33e0a16f2aacb83f8ff.tar.bz2
Enable cloud policy for extensions by default.
This CL replaces the --enable-component-cloud-policy flag with --disable-component-cloud-policy, so that the feature is tentatively enabled by default for M33. BUG=108992 Review URL: https://codereview.chromium.org/86003002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237323 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/policy')
-rw-r--r--components/policy/core/common/policy_switches.cc4
-rw-r--r--components/policy/core/common/policy_switches.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/components/policy/core/common/policy_switches.cc b/components/policy/core/common/policy_switches.cc
index d6491f1..a8cb876 100644
--- a/components/policy/core/common/policy_switches.cc
+++ b/components/policy/core/common/policy_switches.cc
@@ -16,8 +16,8 @@ const char kCloudPolicyInvalidationDelay[] = "cloud-policy-invalidation-delay";
// Disables pushing cloud policy to Chrome using an invalidation service.
const char kDisableCloudPolicyPush[] = "disable-cloud-policy-push";
-// Enables fetching and storing cloud policy for components.
-const char kEnableComponentCloudPolicy[] = "enable-component-cloud-policy";
+// Disables fetching and storing cloud policy for components.
+const char kDisableComponentCloudPolicy[] = "disable-component-cloud-policy";
#if defined(OS_ANDROID) || defined(OS_IOS)
// Registers for cloud policy using the BROWSER client type instead of the
diff --git a/components/policy/core/common/policy_switches.h b/components/policy/core/common/policy_switches.h
index f9ea1cb..b17f880 100644
--- a/components/policy/core/common/policy_switches.h
+++ b/components/policy/core/common/policy_switches.h
@@ -14,7 +14,7 @@ namespace switches {
POLICY_EXPORT extern const char kCloudPolicyInvalidationDelay[];
POLICY_EXPORT extern const char kDisableCloudPolicyPush[];
-POLICY_EXPORT extern const char kEnableComponentCloudPolicy[];
+POLICY_EXPORT extern const char kDisableComponentCloudPolicy[];
#if defined(OS_ANDROID) || defined(OS_IOS)
POLICY_EXPORT extern const char kFakeCloudPolicyType[];