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

Unified Diff: chrome/browser/net/pref_proxy_config_tracker_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/net/pref_proxy_config_tracker_impl.cc
diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.cc b/chrome/browser/net/pref_proxy_config_tracker_impl.cc
index 69f9387800dfd7acedd3eaeba6e1f85b3f8c07ec..2b7f7471b28d15f1b96e3c31595859dfb383f24a 100644
--- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc
+++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc
@@ -196,11 +196,19 @@ net::ProxyConfigService::ConfigAvailability
}
// static
-void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefService* pref_service) {
+void PrefProxyConfigTrackerImpl::RegisterPrefs(
+ PrefServiceSimple* local_state) {
+ DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();
+ local_state->RegisterDictionaryPref(prefs::kProxy, default_settings);
+}
+
+// static
+void PrefProxyConfigTrackerImpl::RegisterUserPrefs(
+ PrefServiceSyncable* pref_service) {
DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();
pref_service->RegisterDictionaryPref(prefs::kProxy,
default_settings,
- PrefService::UNSYNCABLE_PREF);
+ PrefServiceSyncable::UNSYNCABLE_PREF);
}
ProxyPrefs::ConfigState PrefProxyConfigTrackerImpl::GetProxyConfig(
« no previous file with comments | « chrome/browser/net/pref_proxy_config_tracker_impl.h ('k') | chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698