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

Unified Diff: net/websockets/websocket_job.cc

Issue 7047003: Add --enable-websocket-over-spdy command-line flag (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Created 9 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:
View side-by-side diff with in-line comments
Download patch
« net/websockets/websocket_job.h ('K') | « net/websockets/websocket_job.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_job.cc
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index 95060c693248c06748472dac80a14d0d443ecfa4..e6d1ab8ce792d82ef57fee5423b60586e74352b2 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -53,11 +53,19 @@ static base::LazyInstance<WebSocketJobInitSingleton> g_websocket_job_init(
namespace net {
+bool WebSocketJob::websocket_over_spdy_ = false;
+
// static
void WebSocketJob::EnsureInit() {
g_websocket_job_init.Get();
}
+// static
+void WebSocketJob::EnableWebSocketOverSpdy(bool enable)
Yuta Kitamura 2011/05/20 02:59:48 I'm a bit worried about inter-thread race conditio
Takashi Toyoshima 2011/05/20 05:25:40 Good point. Actually, current caller point is afte
+{
Yuta Kitamura 2011/05/20 02:59:48 Opening brace should be put in the same line as th
Takashi Toyoshima 2011/05/20 05:25:40 Done. Sorry for poor mistake.
+ websocket_over_spdy_ = enable;
+}
+
WebSocketJob::WebSocketJob(SocketStream::Delegate* delegate)
: delegate_(delegate),
state_(INITIALIZED),
« net/websockets/websocket_job.h ('K') | « net/websockets/websocket_job.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698