summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/renderer_glue.cc
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 06:13:39 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-07 06:13:39 +0000
commit7661f67398aa39e42346892bf33258db69ac9da7 (patch)
treeaf87943a3c633eb09c73f76735fdb783a97ddbe5 /chrome/renderer/renderer_glue.cc
parent703e4d66f618720ca07ce00ff3fbe68810a661c3 (diff)
downloadchromium_src-7661f67398aa39e42346892bf33258db69ac9da7.zip
chromium_src-7661f67398aa39e42346892bf33258db69ac9da7.tar.gz
chromium_src-7661f67398aa39e42346892bf33258db69ac9da7.tar.bz2
WebSocket in Worker: render_thread->child_thread change.
SocketStream should be handled in ChildThread instead of RenderThread to be used in Worker process. Move SocketStream in chrome/common to satisfy check_deps. BUG=27618 TEST=none Review URL: http://codereview.chromium.org/443015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/renderer_glue.cc')
-rw-r--r--chrome/renderer/renderer_glue.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 558589c..012a249 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -19,12 +19,12 @@
#include "base/string_util.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/render_messages.h"
+#include "chrome/common/socket_stream_dispatcher.h"
#include "chrome/common/url_constants.h"
#include "chrome/plugin/npobject_util.h"
#include "chrome/renderer/net/render_dns_master.h"
#include "chrome/renderer/render_process.h"
#include "chrome/renderer/render_thread.h"
-#include "chrome/renderer/socket_stream_dispatcher.h"
#include "googleurl/src/url_util.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/WebKit/WebKit/chromium/public/WebKit.h"
@@ -242,7 +242,7 @@ WebSocketStreamHandleBridge* WebSocketStreamHandleBridge::Create(
WebKit::WebSocketStreamHandle* handle,
WebSocketStreamHandleDelegate* delegate) {
SocketStreamDispatcher* dispatcher =
- RenderThread::current()->socket_stream_dispatcher();
+ ChildThread::current()->socket_stream_dispatcher();
return dispatcher->CreateBridge(handle, delegate);
}