summaryrefslogtreecommitdiffstats
path: root/chrome/browser/prefs/command_line_pref_store.cc
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 19:54:31 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-07 19:54:31 +0000
commit2174b41bde437dae0be9f575bb2733903ac0eb24 (patch)
tree56a2ce61d18d53218e6f112e7a6258f0d0535276 /chrome/browser/prefs/command_line_pref_store.cc
parent2c314bb5f4d80a9c8ce3dc909a08afc4fb40fbd3 (diff)
downloadchromium_src-2174b41bde437dae0be9f575bb2733903ac0eb24.zip
chromium_src-2174b41bde437dae0be9f575bb2733903ac0eb24.tar.gz
chromium_src-2174b41bde437dae0be9f575bb2733903ac0eb24.tar.bz2
Reverting this as it causes browser tests on the Linux ChromiumOS builder to fail.
Will revert back if it does not address the redness. Revert 150380 - Add support for loading user cloud policy on desktop, behind the --load-cloud-policy-on-signin flag. Move UserCloudPolicyManager to be owned by the Profile as a step towards supporting multiple profiles. Added TestingProfile::Builder as a start towards taming the madness of all the different constructors and setters. BUG=141123 TEST=none Review URL: https://chromiumcodereview.appspot.com/10693022 TBR=atwilson@chromium.org Review URL: https://chromiumcodereview.appspot.com/10823208 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150391 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/prefs/command_line_pref_store.cc')
-rw-r--r--chrome/browser/prefs/command_line_pref_store.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index a3ce691..70d8056 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -64,8 +64,6 @@ const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
{ switches::kEnableTouchpadThreeFingerClick,
prefs::kEnableTouchpadThreeFingerClick, true },
#endif
- { switches::kLoadCloudPolicyOnSignin, prefs::kLoadCloudPolicyOnSignin,
- true },
};
const CommandLinePrefStore::IntegerSwitchToPreferenceMapEntry