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

Side by Side Diff: chrome/browser/io_thread.h

Issue 353713005: Implements new, more robust design for communicating between SSLConnectJobs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed comment I missed in the last patch. Created 6 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
OLDNEW
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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory; 145 scoped_ptr<net::HttpTransactionFactory> system_http_transaction_factory;
146 scoped_ptr<net::URLRequestContext> system_request_context; 146 scoped_ptr<net::URLRequestContext> system_request_context;
147 SystemRequestContextLeakChecker system_request_context_leak_checker; 147 SystemRequestContextLeakChecker system_request_context_leak_checker;
148 // |system_cookie_store| and |system_server_bound_cert_service| are shared 148 // |system_cookie_store| and |system_server_bound_cert_service| are shared
149 // between |proxy_script_fetcher_context| and |system_request_context|. 149 // between |proxy_script_fetcher_context| and |system_request_context|.
150 scoped_refptr<net::CookieStore> system_cookie_store; 150 scoped_refptr<net::CookieStore> system_cookie_store;
151 scoped_refptr<extensions::EventRouterForwarder> 151 scoped_refptr<extensions::EventRouterForwarder>
152 extension_event_router_forwarder; 152 extension_event_router_forwarder;
153 scoped_ptr<net::HostMappingRules> host_mapping_rules; 153 scoped_ptr<net::HostMappingRules> host_mapping_rules;
154 scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings; 154 scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings;
155 bool ignore_certificate_errors; 155 bool ignore_certificate_errors;
wtc 2014/07/23 22:53:32 Nit: I suggest declaring enable_ssl_connect_job_wa
mshelley 2014/07/24 20:37:46 Done.
156 uint16 testing_fixed_http_port; 156 uint16 testing_fixed_http_port;
157 uint16 testing_fixed_https_port; 157 uint16 testing_fixed_https_port;
158 158
159 Optional<size_t> initial_max_spdy_concurrent_streams; 159 Optional<size_t> initial_max_spdy_concurrent_streams;
160 Optional<bool> force_spdy_single_domain; 160 Optional<bool> force_spdy_single_domain;
161 Optional<bool> enable_spdy_compression; 161 Optional<bool> enable_spdy_compression;
162 Optional<bool> enable_spdy_ping_based_connection_checking; 162 Optional<bool> enable_spdy_ping_based_connection_checking;
163 Optional<net::NextProto> spdy_default_protocol; 163 Optional<net::NextProto> spdy_default_protocol;
164 net::NextProtoVector next_protos; 164 net::NextProtoVector next_protos;
165 Optional<string> trusted_spdy_proxy; 165 Optional<string> trusted_spdy_proxy;
166 Optional<bool> force_spdy_over_ssl; 166 Optional<bool> force_spdy_over_ssl;
167 Optional<bool> force_spdy_always; 167 Optional<bool> force_spdy_always;
168 std::set<net::HostPortPair> forced_spdy_exclusions; 168 std::set<net::HostPortPair> forced_spdy_exclusions;
169 Optional<bool> use_alternate_protocols; 169 Optional<bool> use_alternate_protocols;
170 Optional<bool> enable_websocket_over_spdy; 170 Optional<bool> enable_websocket_over_spdy;
171 171
172 Optional<bool> enable_quic; 172 Optional<bool> enable_quic;
173 Optional<bool> enable_quic_https; 173 Optional<bool> enable_quic_https;
174 Optional<bool> enable_quic_pacing; 174 Optional<bool> enable_quic_pacing;
175 Optional<bool> enable_quic_time_based_loss_detection; 175 Optional<bool> enable_quic_time_based_loss_detection;
176 Optional<bool> enable_quic_persist_server_info; 176 Optional<bool> enable_quic_persist_server_info;
177 Optional<bool> enable_quic_port_selection; 177 Optional<bool> enable_quic_port_selection;
178 Optional<size_t> quic_max_packet_length; 178 Optional<size_t> quic_max_packet_length;
179 Optional<std::string> quic_user_agent_id; 179 Optional<std::string> quic_user_agent_id;
180 Optional<net::QuicVersionVector> quic_supported_versions; 180 Optional<net::QuicVersionVector> quic_supported_versions;
181 Optional<net::HostPortPair> origin_to_force_quic_on; 181 Optional<net::HostPortPair> origin_to_force_quic_on;
182 bool enable_user_alternate_protocol_ports; 182 bool enable_user_alternate_protocol_ports;
183 bool enable_ssl_connect_job_waiting;
183 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a 184 // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a
184 // main frame load fails with a DNS error in order to provide more useful 185 // main frame load fails with a DNS error in order to provide more useful
185 // information to the renderer so it can show a more specific error page. 186 // information to the renderer so it can show a more specific error page.
186 scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service; 187 scoped_ptr<chrome_browser_net::DnsProbeService> dns_probe_service;
187 scoped_ptr<data_reduction_proxy::DataReductionProxyParams> 188 scoped_ptr<data_reduction_proxy::DataReductionProxyParams>
188 data_reduction_proxy_params; 189 data_reduction_proxy_params;
189 }; 190 };
190 191
191 // |net_log| must either outlive the IOThread or be NULL. 192 // |net_log| must either outlive the IOThread or be NULL.
192 IOThread(PrefService* local_state, 193 IOThread(PrefService* local_state,
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
373 bool is_spdy_disabled_by_policy_; 374 bool is_spdy_disabled_by_policy_;
374 375
375 base::WeakPtrFactory<IOThread> weak_factory_; 376 base::WeakPtrFactory<IOThread> weak_factory_;
376 377
377 const base::TimeTicks creation_time_; 378 const base::TimeTicks creation_time_;
378 379
379 DISALLOW_COPY_AND_ASSIGN(IOThread); 380 DISALLOW_COPY_AND_ASSIGN(IOThread);
380 }; 381 };
381 382
382 #endif // CHROME_BROWSER_IO_THREAD_H_ 383 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698