diff options
| author | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-17 15:33:46 +0000 |
|---|---|---|
| committer | joaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-17 15:33:46 +0000 |
| commit | 1d7feb8ebbf9bc570136ade67b7413610be5987e (patch) | |
| tree | 6503d3822d1eac4e88b609c9fc2acf9d24ed8d1a /chrome/browser/prefs | |
| parent | abd41b76f8d722bd9b408f7a64524434a82914d4 (diff) | |
| download | chromium_src-1d7feb8ebbf9bc570136ade67b7413610be5987e.zip chromium_src-1d7feb8ebbf9bc570136ade67b7413610be5987e.tar.gz chromium_src-1d7feb8ebbf9bc570136ade67b7413610be5987e.tar.bz2 | |
Removed --disable-cloud-policy-on-signin flag.
Also removed the related kDisableCloudPolicyOnSignin pref.
BUG=None
Review URL: https://codereview.chromium.org/26512003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@229139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs')
| -rw-r--r-- | chrome/browser/prefs/command_line_pref_store.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc index 485f42d..7a123da 100644 --- a/chrome/browser/prefs/command_line_pref_store.cc +++ b/chrome/browser/prefs/command_line_pref_store.cc @@ -16,10 +16,6 @@ #include "chrome/common/pref_names.h" #include "ui/base/ui_base_switches.h" -#if defined(ENABLE_CONFIGURATION_POLICY) -#include "components/policy/core/common/policy_switches.h" -#endif - #if defined(OS_CHROMEOS) #include "chromeos/chromeos_switches.h" #endif @@ -74,10 +70,6 @@ const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry { chromeos::switches::kEnableTouchpadThreeFingerClick, prefs::kEnableTouchpadThreeFingerClick, true }, #endif -#if defined(ENABLE_CONFIGURATION_POLICY) - { policy::switches::kDisableCloudPolicyOnSignin, - prefs::kDisableCloudPolicyOnSignin, true }, -#endif { switches::kDisableAsyncDns, prefs::kBuiltInDnsClientEnabled, false }, { switches::kEnableAsyncDns, prefs::kBuiltInDnsClientEnabled, true }, }; |