diff options
| author | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-07 06:13:39 +0000 |
|---|---|---|
| committer | ukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-07 06:13:39 +0000 |
| commit | 7661f67398aa39e42346892bf33258db69ac9da7 (patch) | |
| tree | af87943a3c633eb09c73f76735fdb783a97ddbe5 /chrome/common/child_thread.cc | |
| parent | 703e4d66f618720ca07ce00ff3fbe68810a661c3 (diff) | |
| download | chromium_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/common/child_thread.cc')
| -rw-r--r-- | chrome/common/child_thread.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/common/child_thread.cc b/chrome/common/child_thread.cc index 48358f1..cb145ae 100644 --- a/chrome/common/child_thread.cc +++ b/chrome/common/child_thread.cc @@ -10,6 +10,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "chrome/common/plugin_messages.h" +#include "chrome/common/socket_stream_dispatcher.h" #include "ipc/ipc_logging.h" #include "ipc/ipc_message.h" #include "ipc/ipc_switches.h" @@ -45,6 +46,7 @@ void ChildThread::Init() { #endif resource_dispatcher_.reset(new ResourceDispatcher(this)); + socket_stream_dispatcher_.reset(new SocketStreamDispatcher()); // When running in unit tests, there is already a NotificationService object. // Since only one can exist at a time per thread, check first. @@ -97,6 +99,8 @@ void ChildThread::OnMessageReceived(const IPC::Message& msg) { // Resource responses are sent to the resource dispatcher. if (resource_dispatcher_->OnMessageReceived(msg)) return; + if (socket_stream_dispatcher_->OnMessageReceived(msg)) + return; bool handled = true; IPC_BEGIN_MESSAGE_MAP(ChildThread, msg) |