Chromium Code Reviews| 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 |
| (...skipping 19 matching lines...) Expand all Loading... | |
| 30 class SystemURLRequestContextGetter; | 30 class SystemURLRequestContextGetter; |
| 31 | 31 |
| 32 namespace base { | 32 namespace base { |
| 33 class CommandLine; | 33 class CommandLine; |
| 34 } | 34 } |
| 35 | 35 |
| 36 namespace chrome_browser_net { | 36 namespace chrome_browser_net { |
| 37 class DnsProbeService; | 37 class DnsProbeService; |
| 38 } | 38 } |
| 39 | 39 |
| 40 #if defined(SPDY_PROXY_AUTH_ORIGIN) | |
| 41 namespace data_reduction_proxy { | 40 namespace data_reduction_proxy { |
| 42 class DataReductionProxyAuthRequestHandler; | 41 class DataReductionProxyAuthRequestHandler; |
| 43 class DataReductionProxyParams; | 42 class DataReductionProxyParams; |
| 44 } | 43 } |
| 45 #endif // defined(SPDY_PROXY_AUTH_ORIGIN) | |
| 46 | 44 |
| 47 namespace extensions { | 45 namespace extensions { |
| 48 class EventRouterForwarder; | 46 class EventRouterForwarder; |
| 49 } | 47 } |
| 50 | 48 |
| 51 namespace net { | 49 namespace net { |
| 52 class CertVerifier; | 50 class CertVerifier; |
| 53 class ChannelIDService; | 51 class ChannelIDService; |
| 54 class CookieStore; | 52 class CookieStore; |
| 55 class CTVerifier; | 53 class CTVerifier; |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 190 Optional<bool> quic_always_require_handshake_confirmation; | 188 Optional<bool> quic_always_require_handshake_confirmation; |
| 191 Optional<size_t> quic_max_packet_length; | 189 Optional<size_t> quic_max_packet_length; |
| 192 net::QuicTagVector quic_connection_options; | 190 net::QuicTagVector quic_connection_options; |
| 193 Optional<std::string> quic_user_agent_id; | 191 Optional<std::string> quic_user_agent_id; |
| 194 Optional<net::QuicVersionVector> quic_supported_versions; | 192 Optional<net::QuicVersionVector> quic_supported_versions; |
| 195 Optional<net::HostPortPair> origin_to_force_quic_on; | 193 Optional<net::HostPortPair> origin_to_force_quic_on; |
| 196 bool enable_user_alternate_protocol_ports; | 194 bool enable_user_alternate_protocol_ports; |
| 197 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a | 195 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a |
| 198 // main frame load fails with a DNS error in order to provide more useful | 196 // main frame load fails with a DNS error in order to provide more useful |
| 199 // information to the renderer so it can show a more specific error page. | 197 // information to the renderer so it can show a more specific error page. |
| 200 scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service; | 198 scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service; |
|
mmenke
2014/09/10 15:16:48
Can we get rid of the SPDY_PROXY_AUTH_ORIGIN defin
Not at Google. Contact bengr
2014/09/10 21:38:34
Yes, that is the plan. I have already removed it f
| |
| 201 #if defined(SPDY_PROXY_AUTH_ORIGIN) | 199 scoped_ptr<data_reduction_proxy::DataReductionProxyParams> |
| 202 scoped_ptr<data_reduction_proxy::DataReductionProxyParams> | 200 data_reduction_proxy_params; |
| 203 data_reduction_proxy_params; | 201 scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler> |
| 204 scoped_ptr<data_reduction_proxy::DataReductionProxyAuthRequestHandler> | 202 data_reduction_proxy_auth_request_handler; |
| 205 data_reduction_proxy_auth_request_handler; | |
| 206 #endif | |
| 207 }; | 203 }; |
| 208 | 204 |
| 209 // |net_log| must either outlive the IOThread or be NULL. | 205 // |net_log| must either outlive the IOThread or be NULL. |
| 210 IOThread(PrefService* local_state, | 206 IOThread(PrefService* local_state, |
| 211 policy::PolicyService* policy_service, | 207 policy::PolicyService* policy_service, |
| 212 ChromeNetLog* net_log, | 208 ChromeNetLog* net_log, |
| 213 extensions::EventRouterForwarder* extension_event_router_forwarder); | 209 extensions::EventRouterForwarder* extension_event_router_forwarder); |
| 214 | 210 |
| 215 virtual ~IOThread(); | 211 virtual ~IOThread(); |
| 216 | 212 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 304 net::SSLConfigService* GetSSLConfigService(); | 300 net::SSLConfigService* GetSSLConfigService(); |
| 305 | 301 |
| 306 void ChangedToOnTheRecordOnIOThread(); | 302 void ChangedToOnTheRecordOnIOThread(); |
| 307 | 303 |
| 308 void UpdateDnsClientEnabled(); | 304 void UpdateDnsClientEnabled(); |
| 309 | 305 |
| 310 // Configures QUIC options based on the flags in |command_line| as | 306 // Configures QUIC options based on the flags in |command_line| as |
| 311 // well as the QUIC field trial group. | 307 // well as the QUIC field trial group. |
| 312 void ConfigureQuic(const base::CommandLine& command_line); | 308 void ConfigureQuic(const base::CommandLine& command_line); |
| 313 | 309 |
| 310 // Set up data reduction proxy related objects on IO thread globals. | |
| 311 void SetupDataReductionProxy(ChromeNetworkDelegate* network_delegate); | |
| 312 | |
| 314 extensions::EventRouterForwarder* extension_event_router_forwarder() { | 313 extensions::EventRouterForwarder* extension_event_router_forwarder() { |
| 315 #if defined(ENABLE_EXTENSIONS) | 314 #if defined(ENABLE_EXTENSIONS) |
| 316 return extension_event_router_forwarder_; | 315 return extension_event_router_forwarder_; |
| 317 #else | 316 #else |
| 318 return NULL; | 317 return NULL; |
| 319 #endif | 318 #endif |
| 320 } | 319 } |
| 321 // Configures QUIC options in |globals| based on the flags in |command_line| | 320 // Configures QUIC options in |globals| based on the flags in |command_line| |
| 322 // as well as the QUIC field trial group and parameters. | 321 // as well as the QUIC field trial group and parameters. |
| 323 static void ConfigureQuicGlobals( | 322 static void ConfigureQuicGlobals( |
| (...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 448 bool is_spdy_disabled_by_policy_; | 447 bool is_spdy_disabled_by_policy_; |
| 449 | 448 |
| 450 base::WeakPtrFactory<IOThread> weak_factory_; | 449 base::WeakPtrFactory<IOThread> weak_factory_; |
| 451 | 450 |
| 452 const base::TimeTicks creation_time_; | 451 const base::TimeTicks creation_time_; |
| 453 | 452 |
| 454 DISALLOW_COPY_AND_ASSIGN(IOThread); | 453 DISALLOW_COPY_AND_ASSIGN(IOThread); |
| 455 }; | 454 }; |
| 456 | 455 |
| 457 #endif // CHROME_BROWSER_IO_THREAD_H_ | 456 #endif // CHROME_BROWSER_IO_THREAD_H_ |
| OLD | NEW |