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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: 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

« net/http/http_stream_factory_impl.cc ('K') | « net/http/http_stream_factory_impl.cc ('k') | net/http/http_stream_factory_impl_job.cc » ('j') | net/http/http_stream_factory_impl_unittest.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.

+ 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_;