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

Side by Side Diff: net/http/http_network_session.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 | « chrome/browser/io_thread.cc ('k') | net/http/http_network_session.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 NET_HTTP_HTTP_NETWORK_SESSION_H_ 5 #ifndef NET_HTTP_HTTP_NETWORK_SESSION_H_
6 #define NET_HTTP_HTTP_NETWORK_SESSION_H_ 6 #define NET_HTTP_HTTP_NETWORK_SESSION_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 std::string trusted_spdy_proxy; 97 std::string trusted_spdy_proxy;
98 // Controls whether or not ssl is used when in SPDY mode. 98 // Controls whether or not ssl is used when in SPDY mode.
99 bool force_spdy_over_ssl; 99 bool force_spdy_over_ssl;
100 // Controls whether or not SPDY is used without NPN. 100 // Controls whether or not SPDY is used without NPN.
101 bool force_spdy_always; 101 bool force_spdy_always;
102 // URLs to exclude from forced SPDY. 102 // URLs to exclude from forced SPDY.
103 std::set<HostPortPair> forced_spdy_exclusions; 103 std::set<HostPortPair> forced_spdy_exclusions;
104 // Noe: Using this in the case of NPN for HTTP only results in the browser 104 // Noe: Using this in the case of NPN for HTTP only results in the browser
105 // trying SSL and then falling back to http. 105 // trying SSL and then falling back to http.
106 bool use_alternate_protocols; 106 bool use_alternate_protocols;
107 bool enable_websocket_over_spdy;
107 108
108 bool enable_quic; 109 bool enable_quic;
109 bool enable_quic_https; 110 bool enable_quic_https;
110 bool enable_quic_port_selection; 111 bool enable_quic_port_selection;
111 bool enable_quic_pacing; 112 bool enable_quic_pacing;
112 bool enable_quic_time_based_loss_detection; 113 bool enable_quic_time_based_loss_detection;
113 bool enable_quic_persist_server_info; 114 bool enable_quic_persist_server_info;
114 HostPortPair origin_to_force_quic_on; 115 HostPortPair origin_to_force_quic_on;
115 QuicClock* quic_clock; // Will be owned by QuicStreamFactory. 116 QuicClock* quic_clock; // Will be owned by QuicStreamFactory.
116 QuicRandom* quic_random; 117 QuicRandom* quic_random;
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 236
236 std::vector<std::string> next_protos_; 237 std::vector<std::string> next_protos_;
237 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS]; 238 bool enabled_protocols_[NUM_VALID_ALTERNATE_PROTOCOLS];
238 239
239 Params params_; 240 Params params_;
240 }; 241 };
241 242
242 } // namespace net 243 } // namespace net
243 244
244 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 245 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW
« no previous file with comments | « chrome/browser/io_thread.cc ('k') | net/http/http_network_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698