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

Unified Diff: net/http/http_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_proxy_client_socket.h ('k') | net/http/http_proxy_client_socket_pool.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_proxy_client_socket.cc
diff --git a/net/http/http_proxy_client_socket.cc b/net/http/http_proxy_client_socket.cc
index 1a2bac5eaac4e7bb2853b2be3b53fcea304e5e34..47aaa7b8a46971f0abab4940f8d41f67395f8496 100644
--- a/net/http/http_proxy_client_socket.cc
+++ b/net/http/http_proxy_client_socket.cc
@@ -34,7 +34,7 @@ HttpProxyClientSocket::HttpProxyClientSocket(
HttpAuthHandlerFactory* http_auth_handler_factory,
bool tunnel,
bool using_spdy,
- SSLClientSocket::NextProto protocol_negotiated,
+ NextProto protocol_negotiated,
bool is_https_proxy)
: ALLOW_THIS_IN_INITIALIZER_LIST(io_callback_(
base::Bind(&HttpProxyClientSocket::OnIOComplete,
@@ -92,8 +92,7 @@ bool HttpProxyClientSocket::IsUsingSpdy() const {
return using_spdy_;
}
-SSLClientSocket::NextProto
-HttpProxyClientSocket::GetProtocolNegotiated() const {
+NextProto HttpProxyClientSocket::GetProtocolNegotiated() const {
return protocol_negotiated_;
}
« no previous file with comments | « net/http/http_proxy_client_socket.h ('k') | net/http/http_proxy_client_socket_pool.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698