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 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
174 Optional<bool> enable_quic_persist_server_info; | 174 Optional<bool> enable_quic_persist_server_info; |
175 Optional<bool> enable_quic_port_selection; | 175 Optional<bool> enable_quic_port_selection; |
176 Optional<size_t> quic_max_packet_length; | 176 Optional<size_t> quic_max_packet_length; |
177 Optional<net::QuicVersionVector> quic_supported_versions; | 177 Optional<net::QuicVersionVector> quic_supported_versions; |
178 Optional<net::HostPortPair> origin_to_force_quic_on; | 178 Optional<net::HostPortPair> origin_to_force_quic_on; |
179 bool enable_user_alternate_protocol_ports; | 179 bool enable_user_alternate_protocol_ports; |
180 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a | 180 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a |
181 // main frame load fails with a DNS error in order to provide more useful | 181 // main frame load fails with a DNS error in order to provide more useful |
182 // information to the renderer so it can show a more specific error page. | 182 // information to the renderer so it can show a more specific error page. |
183 scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service; | 183 scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service; |
184 | |
185 Optional<bool> enable_websocket_over_spdy; | |
Adam Rice
2014/05/30 01:06:53
I assume the argument about the usefulness of Opti
mmenke
2014/05/30 01:46:46
I have no real opinion, just keeping the existing
Ryan Hamilton
2014/05/30 02:37:02
I'm not sure what the objection to Optional<> is h
Adam Rice
2014/05/30 03:25:24
Well, in this case there's no "disable" flag, so w
Ryan Hamilton
2014/05/30 03:43:27
*nod*
| |
184 }; | 186 }; |
185 | 187 |
186 // |net_log| must either outlive the IOThread or be NULL. | 188 // |net_log| must either outlive the IOThread or be NULL. |
187 IOThread(PrefService* local_state, | 189 IOThread(PrefService* local_state, |
188 policy::PolicyService* policy_service, | 190 policy::PolicyService* policy_service, |
189 ChromeNetLog* net_log, | 191 ChromeNetLog* net_log, |
190 extensions::EventRouterForwarder* extension_event_router_forwarder); | 192 extensions::EventRouterForwarder* extension_event_router_forwarder); |
191 | 193 |
192 virtual ~IOThread(); | 194 virtual ~IOThread(); |
193 | 195 |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
369 bool is_spdy_disabled_by_policy_; | 371 bool is_spdy_disabled_by_policy_; |
370 | 372 |
371 base::WeakPtrFactory<IOThread> weak_factory_; | 373 base::WeakPtrFactory<IOThread> weak_factory_; |
372 | 374 |
373 const base::TimeTicks creation_time_; | 375 const base::TimeTicks creation_time_; |
374 | 376 |
375 DISALLOW_COPY_AND_ASSIGN(IOThread); | 377 DISALLOW_COPY_AND_ASSIGN(IOThread); |
376 }; | 378 }; |
377 | 379 |
378 #endif // CHROME_BROWSER_IO_THREAD_H_ | 380 #endif // CHROME_BROWSER_IO_THREAD_H_ |
OLD | NEW |