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

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: 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/intranet_redirect_detector.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 431eb92abc230e339ca8d1c7616f597712d24019..a70c99e4d2cc367ed616ad04baf74e9363b96976 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 {
@@ -171,7 +171,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);
@@ -236,7 +236,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);
« no previous file with comments | « chrome/browser/intranet_redirect_detector.cc ('k') | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698