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

Unified Diff: net/http/http_pipelined_connection_impl.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_connection.h ('k') | net/http/http_pipelined_connection_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_pipelined_connection_impl.h
diff --git a/net/http/http_pipelined_connection_impl.h b/net/http/http_pipelined_connection_impl.h
index 3f9e26969fd16828869bbad9b5a43928cdffa2d1..a20361d76093202d607ba575017d01f38fc660d0 100644
--- a/net/http/http_pipelined_connection_impl.h
+++ b/net/http/http_pipelined_connection_impl.h
@@ -56,7 +56,7 @@ class NET_EXPORT_PRIVATE HttpPipelinedConnectionImpl
const ProxyInfo& used_proxy_info,
const BoundNetLog& net_log,
bool was_npn_negotiated,
- SSLClientSocket::NextProto protocol_negotiated) OVERRIDE {
+ NextProto protocol_negotiated) OVERRIDE {
return new HttpPipelinedConnectionImpl(connection, delegate, origin,
used_ssl_config, used_proxy_info,
net_log, was_npn_negotiated,
@@ -71,7 +71,7 @@ class NET_EXPORT_PRIVATE HttpPipelinedConnectionImpl
const ProxyInfo& used_proxy_info,
const BoundNetLog& net_log,
bool was_npn_negotiated,
- SSLClientSocket::NextProto protocol_negotiated);
+ NextProto protocol_negotiated);
virtual ~HttpPipelinedConnectionImpl();
// HttpPipelinedConnection interface.
@@ -89,7 +89,7 @@ class NET_EXPORT_PRIVATE HttpPipelinedConnectionImpl
virtual const ProxyInfo& used_proxy_info() const OVERRIDE;
virtual const BoundNetLog& net_log() const OVERRIDE;
virtual bool was_npn_negotiated() const OVERRIDE;
- virtual SSLClientSocket::NextProto protocol_negotiated() const OVERRIDE;
+ virtual NextProto protocol_negotiated() const OVERRIDE;
// Used by HttpPipelinedStream.
@@ -307,7 +307,7 @@ class NET_EXPORT_PRIVATE HttpPipelinedConnectionImpl
BoundNetLog net_log_;
bool was_npn_negotiated_;
// Protocol negotiated with the server.
- SSLClientSocket::NextProto protocol_negotiated_;
+ NextProto protocol_negotiated_;
scoped_refptr<GrowableIOBuffer> read_buf_;
int next_pipeline_id_;
bool active_;
« no previous file with comments | « net/http/http_pipelined_connection.h ('k') | net/http/http_pipelined_connection_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698