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

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

Patch Set: Address review comments. Fix Clang build and fix bug shown by trybots. Created 7 years, 11 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/intranet_redirect_detector.cc ('k') | chrome/browser/io_thread.cc » ('j') | chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/io_thread.h

diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h

index d612b35540c5e57e65fc0d3438b8628bd4e08939..a1961ce7b74ba1e77629b106aef0e463a0f95e35 100644

--- a/chrome/browser/io_thread.h

+++ b/chrome/browser/io_thread.h

@@ -24,7 +24,7 @@ class ChromeNetLog;

class CommandLine;

class PrefProxyConfigTrackerImpl;

class PrefService;

-class PrefServiceSimple;

+class PrefRegistrySimple;

class SystemURLRequestContextGetter;

namespace chrome_browser_net {

@@ -170,7 +170,7 @@ class IOThread : public content::BrowserThreadDelegate {

};

// |net_log| must either outlive the IOThread or be NULL.

- IOThread(PrefServiceSimple* local_state,

+ IOThread(PrefService* local_state,

policy::PolicyService* policy_service,

ChromeNetLog* net_log,

extensions::EventRouterForwarder* extension_event_router_forwarder);

@@ -235,7 +235,7 @@ class IOThread : public content::BrowserThreadDelegate {

// SystemRequestContext state has been initialized on the UI thread.

void InitSystemRequestContextOnIOThread();

- static void RegisterPrefs(PrefServiceSimple* local_state);

+ static void RegisterPrefs(PrefRegistrySimple* registry);

net::HttpAuthHandlerFactory* CreateDefaultAuthHandlerFactory(

net::HostResolver* resolver);