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

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

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.h
diff --git a/chrome/browser/net/proxy_service_factory.h b/chrome/browser/net/proxy_service_factory.h
index c0c26fdf09e7b38b90555c4cdc28eb27d43636f7..27a0b2d611473c19a0a1f6be6d9feaa4dd72738c 100644
--- a/chrome/browser/net/proxy_service_factory.h
+++ b/chrome/browser/net/proxy_service_factory.h
@@ -18,6 +18,12 @@ class ProxyConfigServiceImpl;
}
#endif // defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS)
+typedef chromeos::ProxyConfigServiceImpl PrefProxyConfigTracker;
+#else
+typedef PrefProxyConfigTrackerImpl PrefProxyConfigTracker;
+#endif // defined(OS_CHROMEOS)
+
namespace net {
class NetLog;
class NetworkDelegate;
@@ -34,13 +40,12 @@ class ProxyServiceFactory {
// about the proxy configuration by calling its UpdateProxyConfig method.
static ChromeProxyConfigService* CreateProxyConfigService();
-#if defined(OS_CHROMEOS)
- static chromeos::ProxyConfigServiceImpl* CreatePrefProxyConfigTracker(
- PrefService* pref_service);
-#else
- static PrefProxyConfigTrackerImpl* CreatePrefProxyConfigTracker(
- PrefService* pref_service);
-#endif // defined(OS_CHROMEOS)
+ static PrefProxyConfigTracker* CreatePrefProxyConfigTrackerOfProfile(
Nikita (slow) 2013/07/15 08:08:46 nit: Please add comments to these methods (or exte
pneubeck (no reviews) 2013/07/16 08:38:06 Done.
+ PrefService* profile_prefs,
+ PrefService* local_state_prefs);
+
+ static PrefProxyConfigTracker* CreatePrefProxyConfigTrackerOfLocalState(
+ PrefService* local_state_prefs);
// Create a proxy service according to the options on command line.
static net::ProxyService* CreateProxyService(

Powered by Google App Engine
This is Rietveld 408576698