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

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ 5 #ifndef CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
6 #define CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ 6 #define CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 9
10 class ChromeProxyConfigService; 10 class ChromeProxyConfigService;
11 class CommandLine; 11 class CommandLine;
12 class PrefProxyConfigTrackerImpl; 12 class PrefProxyConfigTrackerImpl;
13 class PrefService; 13 class PrefService;
14 class Profile;
14 15
15 #if defined(OS_CHROMEOS) 16 #if defined(OS_CHROMEOS)
16 namespace chromeos { 17 namespace chromeos {
17 class ProxyConfigServiceImpl; 18 class ProxyConfigServiceImpl;
18 } 19 }
19 #endif // defined(OS_CHROMEOS) 20 #endif // defined(OS_CHROMEOS)
20 21
21 namespace net { 22 namespace net {
22 class NetLog; 23 class NetLog;
23 class NetworkDelegate; 24 class NetworkDelegate;
24 class ProxyConfigService; 25 class ProxyConfigService;
25 class ProxyService; 26 class ProxyService;
26 class URLRequestContext; 27 class URLRequestContext;
27 } // namespace net 28 } // namespace net
28 29
29 class ProxyServiceFactory { 30 class ProxyServiceFactory {
30 public: 31 public:
31 // Creates a ProxyConfigService that delivers the system preferences 32 // Creates a ProxyConfigService that delivers the system preferences
32 // (or the respective ChromeOS equivalent). 33 // (or the respective ChromeOS equivalent).
33 // The ChromeProxyConfigService returns "pending" until it has been informed 34 // The ChromeProxyConfigService returns "pending" until it has been informed
34 // about the proxy configuration by calling its UpdateProxyConfig method. 35 // about the proxy configuration by calling its UpdateProxyConfig method.
35 static ChromeProxyConfigService* CreateProxyConfigService(); 36 static ChromeProxyConfigService* CreateProxyConfigService();
36 37
37 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
38 static chromeos::ProxyConfigServiceImpl* CreatePrefProxyConfigTracker( 39 static chromeos::ProxyConfigServiceImpl* CreatePrefProxyConfigTracker(
39 PrefService* pref_service); 40 Profile* profile);
40 #else 41 #else
41 static PrefProxyConfigTrackerImpl* CreatePrefProxyConfigTracker( 42 static PrefProxyConfigTrackerImpl* CreatePrefProxyConfigTracker(
43 Profile* profile);
44 #endif // defined(OS_CHROMEOS)
45
46 static PrefProxyConfigTrackerImpl* CreatePrefProxyConfigTrackerForLocalState(
42 PrefService* pref_service); 47 PrefService* pref_service);
43 #endif // defined(OS_CHROMEOS)
44 48
45 // Create a proxy service according to the options on command line. 49 // Create a proxy service according to the options on command line.
46 static net::ProxyService* CreateProxyService( 50 static net::ProxyService* CreateProxyService(
47 net::NetLog* net_log, 51 net::NetLog* net_log,
48 net::URLRequestContext* context, 52 net::URLRequestContext* context,
49 net::NetworkDelegate* network_delegate, 53 net::NetworkDelegate* network_delegate,
50 net::ProxyConfigService* proxy_config_service, 54 net::ProxyConfigService* proxy_config_service,
51 const CommandLine& command_line); 55 const CommandLine& command_line);
52 56
53 private: 57 private:
54 DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory); 58 DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory);
55 }; 59 };
56 60
57 #endif // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ 61 #endif // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698