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

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

Issue 295383007: Get rid of websocket_over_spdy_enabled global. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with fixed linebreaks Created 6 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 171
171 Optional<bool> enable_quic; 172 Optional<bool> enable_quic;
172 Optional<bool> enable_quic_https; 173 Optional<bool> enable_quic_https;
173 Optional<bool> enable_quic_pacing; 174 Optional<bool> enable_quic_pacing;
174 Optional<bool> enable_quic_time_based_loss_detection; 175 Optional<bool> enable_quic_time_based_loss_detection;
175 Optional<bool> enable_quic_persist_server_info; 176 Optional<bool> enable_quic_persist_server_info;
176 Optional<bool> enable_quic_port_selection; 177 Optional<bool> enable_quic_port_selection;
177 Optional<size_t> quic_max_packet_length; 178 Optional<size_t> quic_max_packet_length;
178 Optional<net::QuicVersionVector> quic_supported_versions; 179 Optional<net::QuicVersionVector> quic_supported_versions;
179 Optional<net::HostPortPair> origin_to_force_quic_on; 180 Optional<net::HostPortPair> origin_to_force_quic_on;
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 bool is_spdy_disabled_by_policy_; 372 bool is_spdy_disabled_by_policy_;
372 373
373 base::WeakPtrFactory<IOThread> weak_factory_; 374 base::WeakPtrFactory<IOThread> weak_factory_;
374 375
375 const base::TimeTicks creation_time_; 376 const base::TimeTicks creation_time_;
376 377
377 DISALLOW_COPY_AND_ASSIGN(IOThread); 378 DISALLOW_COPY_AND_ASSIGN(IOThread);
378 }; 379 };
379 380
380 #endif // CHROME_BROWSER_IO_THREAD_H_ 381 #endif // CHROME_BROWSER_IO_THREAD_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/io_thread.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698