summaryrefslogtreecommitdiffstats
path: root/chrome/common/child_thread.h
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/common/child_thread.h
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/common/child_thread.h')
-rw-r--r--chrome/common/child_thread.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/common/child_thread.h b/chrome/common/child_thread.h
index 2082b08..63464fe 100644
--- a/chrome/common/child_thread.h
+++ b/chrome/common/child_thread.h
@@ -13,6 +13,7 @@
#include "ipc/ipc_message.h"
class NotificationService;
+class SocketStreamDispatcher;
// The main thread of a child process derives from this class.
class ChildThread : public IPC::Channel::Listener,
@@ -35,6 +36,10 @@ class ChildThread : public IPC::Channel::Listener,
return resource_dispatcher_.get();
}
+ SocketStreamDispatcher* socket_stream_dispatcher() {
+ return socket_stream_dispatcher_.get();
+ }
+
MessageLoop* message_loop() { return message_loop_; }
// Returns the one child thread.
@@ -72,6 +77,9 @@ class ChildThread : public IPC::Channel::Listener,
// Handles resource loads for this process.
scoped_ptr<ResourceDispatcher> resource_dispatcher_;
+ // Handles SocketStream for this process.
+ scoped_ptr<SocketStreamDispatcher> socket_stream_dispatcher_;
+
// If true, checks with the browser process before shutdown. This avoids race
// conditions if the process refcount is 0 but there's an IPC message inflight
// that would addref it.