Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1944)

Unified Diff: chrome/browser/prefs/command_line_pref_store.cc

Issue 26512003: Removed --disable-cloud-policy-on-signin flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/cloud/user_policy_signin_service_factory.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/command_line_pref_store.cc
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index 485f42d2fd613d315b6a352370e612a1b7d6e6d2..7a123da4a1d8f83d7c478a081a2535132a33d1b5 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 },
};
« no previous file with comments | « chrome/browser/policy/cloud/user_policy_signin_service_factory.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698