chrome/browser/net/pref_proxy_config_tracker_impl.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/net/pref_proxy_config_tracker_impl.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix double registration in Chrome Frame test. Created 7 years, 10 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/net/pref_proxy_config_tracker_impl.h ('k') | chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 8134c8fdf912f043f380a50b662f41993a292480..ccc12ba3a8d761db08516ae9353eb7e7cb215d29 100644

--- a/chrome/browser/net/pref_proxy_config_tracker_impl.cc

+++ b/chrome/browser/net/pref_proxy_config_tracker_impl.cc

@@ -6,6 +6,7 @@

#include "base/bind.h"

#include "base/values.h"

+#include "chrome/browser/prefs/pref_registry_simple.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/prefs/proxy_config_dictionary.h"

#include "chrome/common/chrome_notification_types.h"

@@ -195,10 +196,9 @@ net::ProxyConfigService::ConfigAvailability

}

// static

-void PrefProxyConfigTrackerImpl::RegisterPrefs(

- PrefServiceSimple* local_state) {

+void PrefProxyConfigTrackerImpl::RegisterPrefs(PrefRegistrySimple* registry) {

DictionaryValue* default_settings = ProxyConfigDictionary::CreateSystem();

- local_state->RegisterDictionaryPref(prefs::kProxy, default_settings);

+ registry->RegisterDictionaryPref(prefs::kProxy, default_settings);

}

// static