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

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

Issue 63753004: Rename websocket_handshake_stream_factory() (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase. Created 7 years, 1 month 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
« no previous file with comments | « no previous file | 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 10
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 } 133 }
134 NetworkDelegate* network_delegate() { 134 NetworkDelegate* network_delegate() {
135 return network_delegate_; 135 return network_delegate_;
136 } 136 }
137 base::WeakPtr<HttpServerProperties> http_server_properties() { 137 base::WeakPtr<HttpServerProperties> http_server_properties() {
138 return http_server_properties_; 138 return http_server_properties_;
139 } 139 }
140 HttpStreamFactory* http_stream_factory() { 140 HttpStreamFactory* http_stream_factory() {
141 return http_stream_factory_.get(); 141 return http_stream_factory_.get();
142 } 142 }
143 HttpStreamFactory* websocket_handshake_stream_factory() { 143 HttpStreamFactory* http_stream_factory_for_websocket() {
144 return websocket_handshake_stream_factory_.get(); 144 return http_stream_factory_for_websocket_.get();
145 } 145 }
146 NetLog* net_log() { 146 NetLog* net_log() {
147 return net_log_; 147 return net_log_;
148 } 148 }
149 149
150 // Creates a Value summary of the state of the socket pools. The caller is 150 // Creates a Value summary of the state of the socket pools. The caller is
151 // responsible for deleting the returned value. 151 // responsible for deleting the returned value.
152 base::Value* SocketPoolInfoToValue() const; 152 base::Value* SocketPoolInfoToValue() const;
153 153
154 // Creates a Value summary of the state of the SPDY sessions. The caller is 154 // Creates a Value summary of the state of the SPDY sessions. The caller is
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 ProxyService* proxy_service_; 190 ProxyService* proxy_service_;
191 const scoped_refptr<SSLConfigService> ssl_config_service_; 191 const scoped_refptr<SSLConfigService> ssl_config_service_;
192 192
193 HttpAuthCache http_auth_cache_; 193 HttpAuthCache http_auth_cache_;
194 SSLClientAuthCache ssl_client_auth_cache_; 194 SSLClientAuthCache ssl_client_auth_cache_;
195 scoped_ptr<ClientSocketPoolManager> normal_socket_pool_manager_; 195 scoped_ptr<ClientSocketPoolManager> normal_socket_pool_manager_;
196 scoped_ptr<ClientSocketPoolManager> websocket_socket_pool_manager_; 196 scoped_ptr<ClientSocketPoolManager> websocket_socket_pool_manager_;
197 QuicStreamFactory quic_stream_factory_; 197 QuicStreamFactory quic_stream_factory_;
198 SpdySessionPool spdy_session_pool_; 198 SpdySessionPool spdy_session_pool_;
199 scoped_ptr<HttpStreamFactory> http_stream_factory_; 199 scoped_ptr<HttpStreamFactory> http_stream_factory_;
200 scoped_ptr<HttpStreamFactory> websocket_handshake_stream_factory_; 200 scoped_ptr<HttpStreamFactory> http_stream_factory_for_websocket_;
201 std::set<HttpResponseBodyDrainer*> response_drainers_; 201 std::set<HttpResponseBodyDrainer*> response_drainers_;
202 202
203 Params params_; 203 Params params_;
204 }; 204 };
205 205
206 } // namespace net 206 } // namespace net
207 207
208 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 208 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW
« no previous file with comments | « no previous file | net/http/http_network_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698