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

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

Issue 18112018: Cleanup the UseSharedProxies preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added a missing member initializer. Created 7 years, 5 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
Index: chrome/browser/net/proxy_service_factory.cc
diff --git a/chrome/browser/net/proxy_service_factory.cc b/chrome/browser/net/proxy_service_factory.cc
index 9d30b1e3f6e9e4e15802de32530d73cbbe443666..0c83d0e8eff0ab13f280171f73368f48f3124f0c 100644
--- a/chrome/browser/net/proxy_service_factory.cc
+++ b/chrome/browser/net/proxy_service_factory.cc
@@ -54,20 +54,28 @@ ChromeProxyConfigService* ProxyServiceFactory::CreateProxyConfigService() {
return new ChromeProxyConfigService(base_service);
}
-#if defined(OS_CHROMEOS)
// static
-chromeos::ProxyConfigServiceImpl*
- ProxyServiceFactory::CreatePrefProxyConfigTracker(
- PrefService* pref_service) {
- return new chromeos::ProxyConfigServiceImpl(pref_service);
-}
+PrefProxyConfigTracker*
+ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(
+ PrefService* profile_prefs,
+ PrefService* local_state_prefs) {
+#if defined(OS_CHROMEOS)
+ return new chromeos::ProxyConfigServiceImpl(profile_prefs, local_state_prefs);
#else
-// static
-PrefProxyConfigTrackerImpl* ProxyServiceFactory::CreatePrefProxyConfigTracker(
- PrefService* pref_service) {
- return new PrefProxyConfigTrackerImpl(pref_service);
+ return new PrefProxyConfigTrackerImpl(profile_prefs);
+#endif // defined(OS_CHROMEOS)
}
+
+// static
+PrefProxyConfigTracker*
+ProxyServiceFactory::CreatePrefProxyConfigTrackerOfLocalState(
+ PrefService* local_state_prefs) {
+#if defined(OS_CHROMEOS)
+ return new chromeos::ProxyConfigServiceImpl(NULL, local_state_prefs);
+#else
+ return new PrefProxyConfigTrackerImpl(local_state_prefs);
#endif // defined(OS_CHROMEOS)
+}
// static
net::ProxyService* ProxyServiceFactory::CreateProxyService(

Powered by Google App Engine
This is Rietveld 408576698