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

Issues Search
    My Issues | Starred     Open | Closed | All

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: Unwrap short lines. 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:
View side-by-side diff with in-line comments
Download patch
« net/socket/socket_test_util.h ('K') | « net/spdy/spdy_proxy_client_socket.h ('k') | net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc » ('j') | net/spdy/spdy_session.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..e5ef78c02b549be55c9e794356c9087e922ee797 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -77,12 +77,12 @@ bool SpdyProxyClientSocket::IsUsingSpdy() const {
return true;
}
-SSLClientSocket::NextProto
+NextProto
wtc 2012/03/30 20:53:51 Nit: move this to the next line.
Ryan Hamilton 2012/03/30 21:12:13 Done.
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;
« net/socket/socket_test_util.h ('K') | « net/spdy/spdy_proxy_client_socket.h ('k') | net/spdy/spdy_proxy_client_socket_spdy2_unittest.cc » ('j') | net/spdy/spdy_session.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698