net/http/http_stream_factory_impl_request.h - Issue 9959033: Move NextProto enum to a new file net/socket/next_proto.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: net/http/http_stream_factory_impl_request.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:

Index: net/http/http_stream_factory_impl_request.h

diff --git a/net/http/http_stream_factory_impl_request.h b/net/http/http_stream_factory_impl_request.h

index ea05420bffe7c1a07889f6eb0ed01cfa327824a3..ab5ff9652a39a2fac8ed977c08b3691d2ec60d80 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);