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

Unified 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 side-by-side diff with in-line comments
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')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_session.h
diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index b43c301694586fac8123b799d257ec2114790e8b..8710443be6664ae864915161ba0f8ef220eeecba 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -6,6 +6,7 @@
#define NET_HTTP_HTTP_NETWORK_SESSION_H_
#include <set>
+#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.
#include "base/memory/ref_counted.h"
#include "base/threading/non_thread_safe.h"
#include "net/base/host_port_pair.h"
@@ -136,6 +137,9 @@ class NET_EXPORT HttpNetworkSession
HttpStreamFactory* http_stream_factory() {
return http_stream_factory_.get();
}
+ HttpStreamFactory* websocket_stream_factory() {
+ return websocket_stream_factory_.get();
+ }
NetLog* net_log() {
return net_log_;
}
@@ -190,6 +194,7 @@ class NET_EXPORT HttpNetworkSession
QuicStreamFactory quic_stream_factory_;
SpdySessionPool spdy_session_pool_;
scoped_ptr<HttpStreamFactory> http_stream_factory_;
+ scoped_ptr<HttpStreamFactory> websocket_stream_factory_;
std::set<HttpResponseBodyDrainer*> response_drainers_;
Params params_;
« 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