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

Side by Side Diff: net/http/http_network_session.cc

Issue 295383007: Get rid of websocket_over_spdy_enabled global. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 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
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 #include "net/http/http_network_session.h" 5 #include "net/http/http_network_session.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/debug/stack_trace.h" 10 #include "base/debug/stack_trace.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 enable_quic(false), 84 enable_quic(false),
85 enable_quic_https(false), 85 enable_quic_https(false),
86 enable_quic_port_selection(true), 86 enable_quic_port_selection(true),
87 enable_quic_pacing(false), 87 enable_quic_pacing(false),
88 enable_quic_time_based_loss_detection(false), 88 enable_quic_time_based_loss_detection(false),
89 enable_quic_persist_server_info(false), 89 enable_quic_persist_server_info(false),
90 quic_clock(NULL), 90 quic_clock(NULL),
91 quic_random(NULL), 91 quic_random(NULL),
92 quic_max_packet_length(kDefaultMaxPacketSize), 92 quic_max_packet_length(kDefaultMaxPacketSize),
93 enable_user_alternate_protocol_ports(false), 93 enable_user_alternate_protocol_ports(false),
94 quic_crypto_client_stream_factory(NULL) { 94 quic_crypto_client_stream_factory(NULL),
95 enable_websocket_over_spdy(false) {
95 quic_supported_versions.push_back(QUIC_VERSION_17); 96 quic_supported_versions.push_back(QUIC_VERSION_17);
96 } 97 }
97 98
98 HttpNetworkSession::Params::~Params() {} 99 HttpNetworkSession::Params::~Params() {}
99 100
100 // TODO(mbelshe): Move the socket factories into HttpStreamFactory. 101 // TODO(mbelshe): Move the socket factories into HttpStreamFactory.
101 HttpNetworkSession::HttpNetworkSession(const Params& params) 102 HttpNetworkSession::HttpNetworkSession(const Params& params)
102 : net_log_(params.net_log), 103 : net_log_(params.net_log),
103 network_delegate_(params.network_delegate), 104 network_delegate_(params.network_delegate),
104 http_server_properties_(params.http_server_properties), 105 http_server_properties_(params.http_server_properties),
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 case WEBSOCKET_SOCKET_POOL: 297 case WEBSOCKET_SOCKET_POOL:
297 return websocket_socket_pool_manager_.get(); 298 return websocket_socket_pool_manager_.get();
298 default: 299 default:
299 NOTREACHED(); 300 NOTREACHED();
300 break; 301 break;
301 } 302 }
302 return NULL; 303 return NULL;
303 } 304 }
304 305
305 } // namespace net 306 } // namespace net
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698