net/websockets/websocket_stream.cc - Issue 284423002: Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled.

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/websockets/websocket_stream.cc

Issue 284423002: Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix merge Created 6 years, 7 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/websockets/websocket_stream.cc

diff --git a/net/websockets/websocket_stream.cc b/net/websockets/websocket_stream.cc

index 399b8f0b0911e23c1c1a2acbfa8a5ac90cf22349..8766316342fa15d599e4db982f06d5da39eea50b 100644

--- a/net/websockets/websocket_stream.cc

+++ b/net/websockets/websocket_stream.cc

@@ -7,6 +7,7 @@

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

#include "base/metrics/histogram.h"

+#include "net/base/load_flags.h"

#include "net/http/http_request_headers.h"

#include "net/http/http_status_code.h"

#include "net/url_request/url_request.h"

« no previous file with comments | « net/test/net_test_suite.cc ('k') | no next file » | no next file with comments »