diff options
author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-31 03:58:46 +0000 |
---|---|---|
committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-31 03:58:46 +0000 |
commit | 8e3c78cb4857505329f602e6af71a46d05346e99 (patch) | |
tree | 0f42439dbfdea47be8189bc39d682062d071d3ec /net/http/http_stream_factory_impl_request.h | |
parent | 9822df966d60c67faaf4c4adacc70801aed9edaf (diff) | |
download | chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.zip chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.tar.gz chromium_src-8e3c78cb4857505329f602e6af71a46d05346e99.tar.bz2 |
Move NextProto enum to a new file net/socket/next_proto.h
BUG=120890
Review URL: http://codereview.chromium.org/9959033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_stream_factory_impl_request.h')
-rw-r--r-- | net/http/http_stream_factory_impl_request.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/http/http_stream_factory_impl_request.h b/net/http/http_stream_factory_impl_request.h index ea05420..ab5ff96 100644 --- a/net/http/http_stream_factory_impl_request.h +++ b/net/http/http_stream_factory_impl_request.h @@ -44,7 +44,7 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest { // Marks completion of the request. Must be called before OnStreamReady(). // |job_net_log| is the BoundNetLog of the Job that fulfilled this request. void Complete(bool was_npn_negotiated, - SSLClientSocket::NextProto protocol_negotiated, + NextProto protocol_negotiated, bool using_spdy, const BoundNetLog& job_net_log); @@ -94,7 +94,7 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest { const AuthCredentials& credentials) OVERRIDE; virtual LoadState GetLoadState() const OVERRIDE; virtual bool was_npn_negotiated() const OVERRIDE; - virtual SSLClientSocket::NextProto protocol_negotiated() const OVERRIDE; + virtual NextProto protocol_negotiated() const OVERRIDE; virtual bool using_spdy() const OVERRIDE; private: @@ -119,7 +119,7 @@ class HttpStreamFactoryImpl::Request : public HttpStreamRequest { bool completed_; bool was_npn_negotiated_; // Protocol negotiated with the server. - SSLClientSocket::NextProto protocol_negotiated_; + NextProto protocol_negotiated_; bool using_spdy_; DISALLOW_COPY_AND_ASSIGN(Request); |