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

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 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 | « net/http/http_network_session.h ('k') | net/spdy/spdy_test_util_common.h » ('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 #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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 enable_spdy_compression(true), 74 enable_spdy_compression(true),
75 enable_spdy_ping_based_connection_checking(true), 75 enable_spdy_ping_based_connection_checking(true),
76 spdy_default_protocol(kProtoUnknown), 76 spdy_default_protocol(kProtoUnknown),
77 spdy_stream_initial_recv_window_size(0), 77 spdy_stream_initial_recv_window_size(0),
78 spdy_initial_max_concurrent_streams(0), 78 spdy_initial_max_concurrent_streams(0),
79 spdy_max_concurrent_streams_limit(0), 79 spdy_max_concurrent_streams_limit(0),
80 time_func(&base::TimeTicks::Now), 80 time_func(&base::TimeTicks::Now),
81 force_spdy_over_ssl(true), 81 force_spdy_over_ssl(true),
82 force_spdy_always(false), 82 force_spdy_always(false),
83 use_alternate_protocols(false), 83 use_alternate_protocols(false),
84 enable_websocket_over_spdy(false),
84 enable_quic(false), 85 enable_quic(false),
85 enable_quic_https(false), 86 enable_quic_https(false),
86 enable_quic_port_selection(true), 87 enable_quic_port_selection(true),
87 enable_quic_pacing(false), 88 enable_quic_pacing(false),
88 enable_quic_time_based_loss_detection(false), 89 enable_quic_time_based_loss_detection(false),
89 enable_quic_persist_server_info(false), 90 enable_quic_persist_server_info(false),
90 quic_clock(NULL), 91 quic_clock(NULL),
91 quic_random(NULL), 92 quic_random(NULL),
92 quic_max_packet_length(kDefaultMaxPacketSize), 93 quic_max_packet_length(kDefaultMaxPacketSize),
93 enable_user_alternate_protocol_ports(false), 94 enable_user_alternate_protocol_ports(false),
(...skipping 202 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
« no previous file with comments | « net/http/http_network_session.h ('k') | net/spdy/spdy_test_util_common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698