chrome/browser/net/pref_proxy_config_tracker_impl.h - 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.h

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/http_server_properties_manager_unittest.cc ('k') | chrome/browser/net/pref_proxy_config_tracker_impl.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.h

diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.h b/chrome/browser/net/pref_proxy_config_tracker_impl.h

index c280b50639a3a4da0292b9e286650d89114d9628..ea546c1d0fe1dcac292154e5e436a1b9a07b1f2c 100644

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

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

@@ -15,7 +15,7 @@

#include "net/proxy/proxy_config_service.h"

class PrefService;

-class PrefServiceSimple;

+class PrefRegistrySimple;

class PrefServiceSyncable;

// A net::ProxyConfigService implementation that applies preference proxy

@@ -119,7 +119,7 @@ class PrefProxyConfigTrackerImpl {

// Registers the proxy preferences. These are actually registered

// the same way in local state and in user prefs.

- static void RegisterPrefs(PrefServiceSimple* local_state);

+ static void RegisterPrefs(PrefRegistrySimple* registry);

static void RegisterUserPrefs(PrefServiceSyncable* user_prefs);

protected: