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

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 missing include. 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..440457dde8b872c0bbea5e686cc1737730d84897 100644
--- a/chrome/browser/net/proxy_service_factory.h
+++ b/chrome/browser/net/proxy_service_factory.h
@@ -11,6 +11,7 @@ class ChromeProxyConfigService;
class CommandLine;
class PrefProxyConfigTrackerImpl;
class PrefService;
+class Profile;
#if defined(OS_CHROMEOS)
namespace chromeos {
@@ -36,12 +37,15 @@ class ProxyServiceFactory {
#if defined(OS_CHROMEOS)
static chromeos::ProxyConfigServiceImpl* CreatePrefProxyConfigTracker(
- PrefService* pref_service);
+ Profile* profile);
#else
static PrefProxyConfigTrackerImpl* CreatePrefProxyConfigTracker(
- PrefService* pref_service);
+ Profile* profile);
#endif // defined(OS_CHROMEOS)
+ static PrefProxyConfigTrackerImpl* CreatePrefProxyConfigTrackerForLocalState(
+ PrefService* pref_service);
+
// Create a proxy service according to the options on command line.
static net::ProxyService* CreateProxyService(
net::NetLog* net_log,

Powered by Google App Engine
This is Rietveld 408576698