net/websockets/websocket_job.cc - Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h

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/websockets/websocket_job.cc

Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Address wtc's comments Created 8 years, 9 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:

Index: net/websockets/websocket_job.cc

diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc

index 0df6ac1644a9c47d288c012f38178ac4c7323b83..577c829d8ae7c4184ed563d1ebc07aabddeed7c5 100644

--- a/net/websockets/websocket_job.cc

+++ b/net/websockets/websocket_job.cc

@@ -561,8 +561,7 @@ int WebSocketJob::TrySpdyStream() {

spdy_pool->Get(pair, *socket_->net_log());

SSLInfo ssl_info;

bool was_npn_negotiated;

- SSLClientSocket::NextProto protocol_negotiated =

- SSLClientSocket::kProtoUnknown;

+ NextProto protocol_negotiated = kProtoUnknown;

bool use_ssl = spdy_session->GetSSLInfo(

&ssl_info, &was_npn_negotiated, &protocol_negotiated);

if (socket_->is_secure() && !use_ssl)