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

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

Issue 14813024: Introduce RequestWebSocketStream into HttpStreamFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 7 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
« no previous file with comments | « no previous file | net/http/http_network_session.cc » ('j') | net/http/http_stream_factory_impl.h » ('J')
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>
mmenke 2013/05/24 14:53:22 While you're here, mind adding a blank line betwee
yhirano 2013/05/27 09:21:32 Done.
9 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
10 #include "base/threading/non_thread_safe.h" 11 #include "base/threading/non_thread_safe.h"
11 #include "net/base/host_port_pair.h" 12 #include "net/base/host_port_pair.h"
12 #include "net/base/net_export.h" 13 #include "net/base/net_export.h"
13 #include "net/dns/host_resolver.h" 14 #include "net/dns/host_resolver.h"
14 #include "net/http/http_auth_cache.h" 15 #include "net/http/http_auth_cache.h"
15 #include "net/http/http_stream_factory.h" 16 #include "net/http/http_stream_factory.h"
16 #include "net/quic/quic_stream_factory.h" 17 #include "net/quic/quic_stream_factory.h"
17 #include "net/spdy/spdy_session_pool.h" 18 #include "net/spdy/spdy_session_pool.h"
18 #include "net/ssl/ssl_client_auth_cache.h" 19 #include "net/ssl/ssl_client_auth_cache.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 } 130 }
130 NetworkDelegate* network_delegate() { 131 NetworkDelegate* network_delegate() {
131 return network_delegate_; 132 return network_delegate_;
132 } 133 }
133 HttpServerProperties* http_server_properties() { 134 HttpServerProperties* http_server_properties() {
134 return http_server_properties_; 135 return http_server_properties_;
135 } 136 }
136 HttpStreamFactory* http_stream_factory() { 137 HttpStreamFactory* http_stream_factory() {
137 return http_stream_factory_.get(); 138 return http_stream_factory_.get();
138 } 139 }
140 HttpStreamFactory* websocket_stream_factory() {
141 return websocket_stream_factory_.get();
142 }
139 NetLog* net_log() { 143 NetLog* net_log() {
140 return net_log_; 144 return net_log_;
141 } 145 }
142 146
143 // Creates a Value summary of the state of the socket pools. The caller is 147 // Creates a Value summary of the state of the socket pools. The caller is
144 // responsible for deleting the returned value. 148 // responsible for deleting the returned value.
145 base::Value* SocketPoolInfoToValue() const; 149 base::Value* SocketPoolInfoToValue() const;
146 150
147 // Creates a Value summary of the state of the SPDY sessions. The caller is 151 // Creates a Value summary of the state of the SPDY sessions. The caller is
148 // responsible for deleting the returned value. 152 // responsible for deleting the returned value.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 ProxyService* proxy_service_; 187 ProxyService* proxy_service_;
184 const scoped_refptr<SSLConfigService> ssl_config_service_; 188 const scoped_refptr<SSLConfigService> ssl_config_service_;
185 189
186 HttpAuthCache http_auth_cache_; 190 HttpAuthCache http_auth_cache_;
187 SSLClientAuthCache ssl_client_auth_cache_; 191 SSLClientAuthCache ssl_client_auth_cache_;
188 scoped_ptr<ClientSocketPoolManager> normal_socket_pool_manager_; 192 scoped_ptr<ClientSocketPoolManager> normal_socket_pool_manager_;
189 scoped_ptr<ClientSocketPoolManager> websocket_socket_pool_manager_; 193 scoped_ptr<ClientSocketPoolManager> websocket_socket_pool_manager_;
190 QuicStreamFactory quic_stream_factory_; 194 QuicStreamFactory quic_stream_factory_;
191 SpdySessionPool spdy_session_pool_; 195 SpdySessionPool spdy_session_pool_;
192 scoped_ptr<HttpStreamFactory> http_stream_factory_; 196 scoped_ptr<HttpStreamFactory> http_stream_factory_;
197 scoped_ptr<HttpStreamFactory> websocket_stream_factory_;
193 std::set<HttpResponseBodyDrainer*> response_drainers_; 198 std::set<HttpResponseBodyDrainer*> response_drainers_;
194 199
195 Params params_; 200 Params params_;
196 }; 201 };
197 202
198 } // namespace net 203 } // namespace net
199 204
200 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_ 205 #endif // NET_HTTP_HTTP_NETWORK_SESSION_H_
OLDNEW
« no previous file with comments | « no previous file | net/http/http_network_session.cc » ('j') | net/http/http_stream_factory_impl.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698