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

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 typo & removed CapturingNetLog arg. Created 6 years, 4 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 SystemRequestContextLeakChecker system_request_context_leak_checker; 154 SystemRequestContextLeakChecker system_request_context_leak_checker;
155 // |system_cookie_store| and |system_channel_id_service| are shared 155 // |system_cookie_store| and |system_channel_id_service| are shared
156 // between |proxy_script_fetcher_context| and |system_request_context|. 156 // between |proxy_script_fetcher_context| and |system_request_context|.
157 scoped_refptr<net::CookieStore> system_cookie_store; 157 scoped_refptr<net::CookieStore> system_cookie_store;
158 #if defined(ENABLE_EXTENSIONS) 158 #if defined(ENABLE_EXTENSIONS)
159 scoped_refptr<extensions::EventRouterForwarder> 159 scoped_refptr<extensions::EventRouterForwarder>
160 extension_event_router_forwarder; 160 extension_event_router_forwarder;
161 #endif 161 #endif
162 scoped_ptr<net::HostMappingRules> host_mapping_rules; 162 scoped_ptr<net::HostMappingRules> host_mapping_rules;
163 scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings; 163 scoped_ptr<net::HttpUserAgentSettings> http_user_agent_settings;
164 bool enable_ssl_connect_job_waiting;
164 bool ignore_certificate_errors; 165 bool ignore_certificate_errors;
165 uint16 testing_fixed_http_port; 166 uint16 testing_fixed_http_port;
166 uint16 testing_fixed_https_port; 167 uint16 testing_fixed_https_port;
167 168
168 Optional<size_t> initial_max_spdy_concurrent_streams; 169 Optional<size_t> initial_max_spdy_concurrent_streams;
169 Optional<bool> force_spdy_single_domain; 170 Optional<bool> force_spdy_single_domain;
170 Optional<bool> enable_spdy_compression; 171 Optional<bool> enable_spdy_compression;
171 Optional<bool> enable_spdy_ping_based_connection_checking; 172 Optional<bool> enable_spdy_ping_based_connection_checking;
172 Optional<net::NextProto> spdy_default_protocol; 173 Optional<net::NextProto> spdy_default_protocol;
173 net::NextProtoVector next_protos; 174 net::NextProtoVector next_protos;
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 bool is_spdy_disabled_by_policy_; 440 bool is_spdy_disabled_by_policy_;
440 441
441 base::WeakPtrFactory<IOThread> weak_factory_; 442 base::WeakPtrFactory<IOThread> weak_factory_;
442 443
443 const base::TimeTicks creation_time_; 444 const base::TimeTicks creation_time_;
444 445
445 DISALLOW_COPY_AND_ASSIGN(IOThread); 446 DISALLOW_COPY_AND_ASSIGN(IOThread);
446 }; 447 };
447 448
448 #endif // CHROME_BROWSER_IO_THREAD_H_ 449 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698