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

Unified Diff: net/http/http_proxy_client_socket.h

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_pipelined_stream.cc ('k') | net/http/http_proxy_client_socket.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_proxy_client_socket.h
diff --git a/net/http/http_proxy_client_socket.h b/net/http/http_proxy_client_socket.h
index db6f7e05aa6cd7a9f21c42e9d802f8b6fb2e9d80..e0c998082bda3972df485c0d512ac7c6e439bd79 100644
--- a/net/http/http_proxy_client_socket.h
+++ b/net/http/http_proxy_client_socket.h
@@ -46,7 +46,7 @@ class HttpProxyClientSocket : public ProxyClientSocket {
HttpAuthHandlerFactory* http_auth_handler_factory,
bool tunnel,
bool using_spdy,
- SSLClientSocket::NextProto protocol_negotiated,
+ NextProto protocol_negotiated,
bool is_https_proxy);
// On destruction Disconnect() is called.
@@ -59,7 +59,7 @@ class HttpProxyClientSocket : public ProxyClientSocket {
virtual const scoped_refptr<HttpAuthController>& GetAuthController() const
OVERRIDE;
virtual bool IsUsingSpdy() const OVERRIDE;
- virtual SSLClientSocket::NextProto GetProtocolNegotiated() const OVERRIDE;
+ virtual NextProto GetProtocolNegotiated() const OVERRIDE;
// StreamSocket implementation.
virtual int Connect(const CompletionCallback& callback) OVERRIDE;
@@ -151,7 +151,7 @@ class HttpProxyClientSocket : public ProxyClientSocket {
// If true, then the connection to the proxy is a SPDY connection.
const bool using_spdy_;
// Protocol negotiated with the server.
- SSLClientSocket::NextProto protocol_negotiated_;
+ NextProto protocol_negotiated_;
// If true, then SSL is used to communicate with this proxy
const bool is_https_proxy_;
« no previous file with comments | « net/http/http_pipelined_stream.cc ('k') | net/http/http_proxy_client_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698