OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_IO_THREAD_H_ | 5 #ifndef CHROME_BROWSER_IO_THREAD_H_ |
6 #define CHROME_BROWSER_IO_THREAD_H_ | 6 #define CHROME_BROWSER_IO_THREAD_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "base/basictypes.h" | 11 #include "base/basictypes.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
14 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
15 #include "base/memory/weak_ptr.h" | 15 #include "base/memory/weak_ptr.h" |
16 #include "base/prefs/pref_member.h" | 16 #include "base/prefs/pref_member.h" |
17 #include "base/time/time.h" | 17 #include "base/time/time.h" |
18 #include "chrome/browser/net/chrome_network_delegate.h" | |
18 #include "chrome/browser/net/ssl_config_service_manager.h" | 19 #include "chrome/browser/net/ssl_config_service_manager.h" |
19 #include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_requ est_handler.h" | 20 #include "components/data_reduction_proxy/browser/data_reduction_proxy_auth_requ est_handler.h" |
20 #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h" | 21 #include "components/data_reduction_proxy/browser/data_reduction_proxy_params.h" |
21 #include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_sta ts.h" | 22 #include "components/data_reduction_proxy/browser/data_reduction_proxy_usage_sta ts.h" |
22 #include "content/public/browser/browser_thread.h" | 23 #include "content/public/browser/browser_thread.h" |
23 #include "content/public/browser/browser_thread_delegate.h" | 24 #include "content/public/browser/browser_thread_delegate.h" |
24 #include "net/base/network_change_notifier.h" | 25 #include "net/base/network_change_notifier.h" |
25 #include "net/http/http_network_session.h" | 26 #include "net/http/http_network_session.h" |
26 #include "net/socket/next_proto.h" | 27 #include "net/socket/next_proto.h" |
27 | 28 |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
188 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a | 189 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a |
189 // main frame load fails with a DNS error in order to provide more useful | 190 // main frame load fails with a DNS error in order to provide more useful |
190 // information to the renderer so it can show a more specific error page. | 191 // information to the renderer so it can show a more specific error page. |
191 scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service; | 192 scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service; |
192 scoped_ptr<data_reduction_proxy::DataReductionProxyParams> | 193 scoped_ptr<data_reduction_proxy::DataReductionProxyParams> |
193 data_reduction_proxy_params; | 194 data_reduction_proxy_params; |
194 scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats> | 195 scoped_ptr<data_reduction_proxy::DataReductionProxyUsageStats> |
195 data_reduction_proxy_usage_stats; | 196 data_reduction_proxy_usage_stats; |
196 scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler> | 197 scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler> |
197 data_reduction_proxy_auth_request_handler; | 198 data_reduction_proxy_auth_request_handler; |
199 scoped_ptr<ChromeNetworkDelegate::OnResolveProxyHandler> | |
200 on_resolve_proxy_handler; | |
mmenke
2014/07/07 20:21:59
No need for a scoped_ptr here, callbacks have thei
rcs
2014/07/07 22:08:49
Done.
| |
198 }; | 201 }; |
199 | 202 |
200 // |net_log| must either outlive the IOThread or be NULL. | 203 // |net_log| must either outlive the IOThread or be NULL. |
201 IOThread(PrefService* local_state, | 204 IOThread(PrefService* local_state, |
202 policy::PolicyService* policy_service, | 205 policy::PolicyService* policy_service, |
203 ChromeNetLog* net_log, | 206 ChromeNetLog* net_log, |
204 extensions::EventRouterForwarder* extension_event_router_forwarder); | 207 extensions::EventRouterForwarder* extension_event_router_forwarder); |
205 | 208 |
206 virtual ~IOThread(); | 209 virtual ~IOThread(); |
207 | 210 |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
414 bool is_spdy_disabled_by_policy_; | 417 bool is_spdy_disabled_by_policy_; |
415 | 418 |
416 base::WeakPtrFactory<IOThread> weak_factory_; | 419 base::WeakPtrFactory<IOThread> weak_factory_; |
417 | 420 |
418 const base::TimeTicks creation_time_; | 421 const base::TimeTicks creation_time_; |
419 | 422 |
420 DISALLOW_COPY_AND_ASSIGN(IOThread); | 423 DISALLOW_COPY_AND_ASSIGN(IOThread); |
421 }; | 424 }; |
422 | 425 |
423 #endif // CHROME_BROWSER_IO_THREAD_H_ | 426 #endif // CHROME_BROWSER_IO_THREAD_H_ |
OLD | NEW |