net/http/http_stream_factory_impl_job.h - Issue 14813024: Introduce RequestWebSocketStream into HttpStreamFactory - Code Review

Chromium Code Reviews

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

(2092)

My Issues | Starred Open | Closed | All

Unified Diff: net/http/http_stream_factory_impl_job.h

Issue 14813024: Introduce RequestWebSocketStream into HttpStreamFactory (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase 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

« net/http/http_stream_factory_impl.h ('K') | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | net/http/http_stream_factory_impl_job.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/http/http_stream_factory_impl_job.h

diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h

index a6a3603cafa27a1f20cf53e1c5ab7c8ca0c8739f..3c5fd1b42b26897b68532cde4c4f74ed89396b8a 100644

--- a/net/http/http_stream_factory_impl_job.h

+++ b/net/http/http_stream_factory_impl_job.h

@@ -127,7 +127,9 @@ class HttpStreamFactoryImpl::Job {

};

void OnStreamReadyCallback();

- void OnSpdySessionReadyCallback();

+ // This callback function is called when a new spdy session is created.

mmenke 2013/06/03 21:10:18 nit: SPDY (We aren't very consistent about this,

yhirano 2013/06/04 02:20:13 Done.

+ void OnNewSpdySessionReadyCallback();

+ void OnWebSocketStreamReadyCallback();

void OnStreamFailedCallback(int result);

void OnCertificateErrorCallback(int result, const SSLInfo& ssl_info);

void OnNeedsProxyAuthCallback(const HttpResponseInfo& response_info,

@@ -292,6 +294,7 @@ class HttpStreamFactoryImpl::Job {

bool establishing_tunnel_;

scoped_ptr<HttpStream> stream_;

+ scoped_ptr<WebSocketStreamBase> websocket_stream_;

// True if we negotiated NPN.

bool was_npn_negotiated_;

« net/http/http_stream_factory_impl.h ('K') | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | net/http/http_stream_factory_impl_job.cc » ('J')

Powered by Google App Engine

This is Rietveld 408576698