net/spdy/spdy_proxy_client_socket.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/spdy/spdy_proxy_client_socket.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/spdy/spdy_proxy_client_socket.cc

diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc

index e5026db5ccfc6ceb1fd884c2285c255b7b1a200e..182be87d58cfdab1fb2a5837f38e640b51e710e1 100644

--- a/net/spdy/spdy_proxy_client_socket.cc

+++ b/net/spdy/spdy_proxy_client_socket.cc

@@ -77,12 +77,11 @@ bool SpdyProxyClientSocket::IsUsingSpdy() const {

return true;

}

-SSLClientSocket::NextProto

-SpdyProxyClientSocket::GetProtocolNegotiated() const {

+NextProto SpdyProxyClientSocket::GetProtocolNegotiated() const {

// Save the negotiated protocol

SSLInfo ssl_info;

bool was_npn_negotiated;

- SSLClientSocket::NextProto protocol_negotiated;

+ NextProto protocol_negotiated;

spdy_stream_->GetSSLInfo(&ssl_info, &was_npn_negotiated,

&protocol_negotiated);

return protocol_negotiated;