OLD | NEW |
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 namespace net { | 21 namespace net { |
22 class NetLog; | 22 class NetLog; |
23 class ProxyConfigService; | 23 class ProxyConfigService; |
24 class ProxyService; | 24 class ProxyService; |
25 class URLRequestContext; | 25 class URLRequestContext; |
26 } // namespace net | 26 } // namespace net |
27 | 27 |
| 28 namespace v8 { |
| 29 class Isolate; |
| 30 } // namespace v8 |
| 31 |
28 class ProxyServiceFactory { | 32 class ProxyServiceFactory { |
29 public: | 33 public: |
30 // Creates a ProxyConfigService that delivers the system preferences | 34 // Creates a ProxyConfigService that delivers the system preferences |
31 // (or the respective ChromeOS equivalent). | 35 // (or the respective ChromeOS equivalent). |
32 // If |wait_for_first_update| is true, the ChromeProxyConfigService | 36 // If |wait_for_first_update| is true, the ChromeProxyConfigService |
33 // returns "pending" until it has been informed about the proxy configuration | 37 // returns "pending" until it has been informed about the proxy configuration |
34 // by calling its UpdateProxyConfig method. | 38 // by calling its UpdateProxyConfig method. |
35 static ChromeProxyConfigService* CreateProxyConfigService( | 39 static ChromeProxyConfigService* CreateProxyConfigService( |
36 bool wait_for_first_update); | 40 bool wait_for_first_update); |
37 | 41 |
38 #if defined(OS_CHROMEOS) | 42 #if defined(OS_CHROMEOS) |
39 static chromeos::ProxyConfigServiceImpl* CreatePrefProxyConfigTracker( | 43 static chromeos::ProxyConfigServiceImpl* CreatePrefProxyConfigTracker( |
40 PrefService* pref_service); | 44 PrefService* pref_service); |
41 #else | 45 #else |
42 static PrefProxyConfigTrackerImpl* CreatePrefProxyConfigTracker( | 46 static PrefProxyConfigTrackerImpl* CreatePrefProxyConfigTracker( |
43 PrefService* pref_service); | 47 PrefService* pref_service); |
44 #endif // defined(OS_CHROMEOS) | 48 #endif // defined(OS_CHROMEOS) |
45 | 49 |
46 // Create a proxy service according to the options on command line. | 50 // Create a proxy service according to the options on command line. |
47 static net::ProxyService* CreateProxyService( | 51 static net::ProxyService* CreateProxyService( |
48 net::NetLog* net_log, | 52 net::NetLog* net_log, |
49 net::URLRequestContext* context, | 53 net::URLRequestContext* context, |
50 net::ProxyConfigService* proxy_config_service, | 54 net::ProxyConfigService* proxy_config_service, |
| 55 v8::Isolate* v8_default_isolate, |
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_ |
OLD | NEW |