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

Unified Diff: chrome/browser/chromeos/proxy_config_service_impl.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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
Index: chrome/browser/chromeos/proxy_config_service_impl.cc
diff --git a/chrome/browser/chromeos/proxy_config_service_impl.cc b/chrome/browser/chromeos/proxy_config_service_impl.cc
index 74617adb14816e04d42ce09b52efbdd1b503feb9..eee5875162e66103420e86b02a89b4626b18d3c3 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl.cc
@@ -580,12 +580,18 @@ bool ProxyConfigServiceImpl::ParseProxyConfig(const Network* network,
}
// static
-void ProxyConfigServiceImpl::RegisterPrefs(PrefService* pref_service) {
+void ProxyConfigServiceImpl::RegisterPrefs(PrefServiceSimple* pref_service) {
// Use shared proxies default to off. GetUseSharedProxies will return the
// correct value based on pre-login and login.
+ pref_service->RegisterBooleanPref(prefs::kUseSharedProxies, true);
+}
+
+// static
+void ProxyConfigServiceImpl::RegisterUserPrefs(
+ PrefServiceSyncable* pref_service) {
pref_service->RegisterBooleanPref(prefs::kUseSharedProxies,
true,
- PrefService::UNSYNCABLE_PREF);
+ PrefServiceSyncable::UNSYNCABLE_PREF);
}
//------------------ ProxyConfigServiceImpl: private methods -------------------
« no previous file with comments | « chrome/browser/chromeos/proxy_config_service_impl.h ('k') | chrome/browser/chromeos/proxy_config_service_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698