summaryrefslogtreecommitdiffstats
path: root/net/http/http_stream_factory_impl_job.h
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 03:58:46 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-31 03:58:46 +0000
commit8e3c78cb4857505329f602e6af71a46d05346e99 (patch)
tree0f42439dbfdea47be8189bc39d682062d071d3ec /net/http/http_stream_factory_impl_job.h
parent9822df966d60c67faaf4c4adacc70801aed9edaf (diff)
downloadchromium_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_job.h')
-rw-r--r--net/http/http_stream_factory_impl_job.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/http/http_stream_factory_impl_job.h b/net/http/http_stream_factory_impl_job.h
index 8e167da..f03aab8 100644
--- a/net/http/http_stream_factory_impl_job.h
+++ b/net/http/http_stream_factory_impl_job.h
@@ -67,7 +67,7 @@ class HttpStreamFactoryImpl::Job {
void Orphan(const Request* request);
bool was_npn_negotiated() const;
- SSLClientSocket::NextProto protocol_negotiated() const;
+ NextProto protocol_negotiated() const;
bool using_spdy() const;
const BoundNetLog& net_log() const { return net_log_; }
@@ -266,7 +266,7 @@ class HttpStreamFactoryImpl::Job {
bool was_npn_negotiated_;
// Protocol negotiated with the server.
- SSLClientSocket::NextProto protocol_negotiated_;
+ NextProto protocol_negotiated_;
// 0 if we're not preconnecting. Otherwise, the number of streams to
// preconnect.