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

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

Issue 26972003: Added a policy_switches.cc file in the policy component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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_android.cc ('k') | chrome/common/chrome_switches.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 f6006835e23978c74df4cd5232833f40c05a4d02..485f42d2fd613d315b6a352370e612a1b7d6e6d2 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -16,6 +16,10 @@
#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
@@ -70,8 +74,10 @@ const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
{ chromeos::switches::kEnableTouchpadThreeFingerClick,
prefs::kEnableTouchpadThreeFingerClick, true },
#endif
- { switches::kDisableCloudPolicyOnSignin,
+#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_android.cc ('k') | chrome/common/chrome_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698