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

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 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 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 14
15 #if defined(OS_CHROMEOS) 15 #if defined(OS_CHROMEOS)
16 namespace chromeos { 16 namespace chromeos {
17 class ProxyConfigServiceImpl; 17 class ProxyConfigServiceImpl;
18 } 18 }
19 #endif // defined(OS_CHROMEOS) 19 #endif // defined(OS_CHROMEOS)
20 20
21 #if defined(OS_CHROMEOS)
22 typedef chromeos::ProxyConfigServiceImpl PrefProxyConfigTracker;
23 #else
24 typedef PrefProxyConfigTrackerImpl PrefProxyConfigTracker;
25 #endif // defined(OS_CHROMEOS)
26
21 namespace net { 27 namespace net {
22 class NetLog; 28 class NetLog;
23 class NetworkDelegate; 29 class NetworkDelegate;
24 class ProxyConfigService; 30 class ProxyConfigService;
25 class ProxyService; 31 class ProxyService;
26 class URLRequestContext; 32 class URLRequestContext;
27 } // namespace net 33 } // namespace net
28 34
29 class ProxyServiceFactory { 35 class ProxyServiceFactory {
30 public: 36 public:
31 // Creates a ProxyConfigService that delivers the system preferences 37 // Creates a ProxyConfigService that delivers the system preferences
32 // (or the respective ChromeOS equivalent). 38 // (or the respective ChromeOS equivalent).
33 // The ChromeProxyConfigService returns "pending" until it has been informed 39 // The ChromeProxyConfigService returns "pending" until it has been informed
34 // about the proxy configuration by calling its UpdateProxyConfig method. 40 // about the proxy configuration by calling its UpdateProxyConfig method.
35 static ChromeProxyConfigService* CreateProxyConfigService(); 41 static ChromeProxyConfigService* CreateProxyConfigService();
36 42
37 #if defined(OS_CHROMEOS) 43 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.
38 static chromeos::ProxyConfigServiceImpl* CreatePrefProxyConfigTracker( 44 PrefService* profile_prefs,
39 PrefService* pref_service); 45 PrefService* local_state_prefs);
40 #else 46
41 static PrefProxyConfigTrackerImpl* CreatePrefProxyConfigTracker( 47 static PrefProxyConfigTracker* CreatePrefProxyConfigTrackerOfLocalState(
42 PrefService* pref_service); 48 PrefService* local_state_prefs);
43 #endif // defined(OS_CHROMEOS)
44 49
45 // Create a proxy service according to the options on command line. 50 // Create a proxy service according to the options on command line.
46 static net::ProxyService* CreateProxyService( 51 static net::ProxyService* CreateProxyService(
47 net::NetLog* net_log, 52 net::NetLog* net_log,
48 net::URLRequestContext* context, 53 net::URLRequestContext* context,
49 net::NetworkDelegate* network_delegate, 54 net::NetworkDelegate* network_delegate,
50 net::ProxyConfigService* proxy_config_service, 55 net::ProxyConfigService* proxy_config_service,
51 const CommandLine& command_line); 56 const CommandLine& command_line);
52 57
53 private: 58 private:
54 DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory); 59 DISALLOW_IMPLICIT_CONSTRUCTORS(ProxyServiceFactory);
55 }; 60 };
56 61
57 #endif // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_ 62 #endif // CHROME_BROWSER_NET_PROXY_SERVICE_FACTORY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698