chrome/browser/net/pref_proxy_config_tracker_impl.h - Issue 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

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 12079097: Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again; base::File changes conflicted. 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:

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 ea546c1d0fe1dcac292154e5e436a1b9a07b1f2c..a449527ce2fb776dac473562f830f063808c4f16 100644

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

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

@@ -16,7 +16,7 @@

class PrefService;

class PrefRegistrySimple;

-class PrefServiceSyncable;

+class PrefRegistrySyncable;

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

// settings (pushed from PrefProxyConfigTrackerImpl) as overrides to the proxy

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

// Registers the proxy preferences. These are actually registered

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

static void RegisterPrefs(PrefRegistrySimple* registry);

- static void RegisterUserPrefs(PrefServiceSyncable* user_prefs);

+ static void RegisterUserPrefs(PrefRegistrySyncable* registry);

protected:

// Get the proxy configuration currently defined by preferences.