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

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

Issue 227523003: Only enforce the strongest SettingsEnforcement group in the absence of a Finch config on Windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/chrome_pref_service_factory.cc
diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
index 97313af949c6e5128f12ef5f5348c1809dd7fd7f..89bd025599c8c8dfe6df73885b823cd020114f6b 100644
--- a/chrome/browser/prefs/chrome_pref_service_factory.cc
+++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
@@ -204,8 +204,14 @@ SettingsEnforcementGroup GetSettingsEnforcementGroup() {
};
// Use the strongest enforcement setting in the absence of a field trial
- // config.
- SettingsEnforcementGroup enforcement_group = GROUP_ENFORCE_DEFAULT;
+ // config on Windows.
+ // TODO(gab): Enforce this on all platforms.
+ SettingsEnforcementGroup enforcement_group =
+#if defined(OS_WIN)
+ GROUP_ENFORCE_DEFAULT;
+#else
+ NO_ENFORCEMENT;
robertshield 2014/04/09 23:26:21 GROUP_NO_ENFORCEMENT?
gab 2014/04/10 13:15:25 Duh, of course :). Done.
+#endif
bool group_determined_from_trial = false;
base::FieldTrial* trial =
base::FieldTrialList::Find(
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698