| Index: content/child/child_thread.h
|
| diff --git a/content/child/child_thread.h b/content/child/child_thread.h
|
| index b2095abf5014e749abec50e1942e9ee70d2bdfb7..59d68c5c4c139a376e6c312b9181ebc8c6ed9177 100644
|
| --- a/content/child/child_thread.h
|
| +++ b/content/child/child_thread.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/power_monitor/power_monitor.h"
|
| #include "base/tracked_objects.h"
|
| +#include "content/child/websocket_dispatcher.h"
|
| #include "content/common/content_export.h"
|
| #include "content/common/message_router.h"
|
| #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED.
|
| @@ -91,6 +92,10 @@ class CONTENT_EXPORT ChildThread : public IPC::Listener, public IPC::Sender {
|
| return socket_stream_dispatcher_.get();
|
| }
|
|
|
| + WebSocketDispatcher* websocket_dispatcher() const {
|
| + return websocket_dispatcher_.get();
|
| + }
|
| +
|
| FileSystemDispatcher* file_system_dispatcher() const {
|
| return file_system_dispatcher_.get();
|
| }
|
| @@ -180,6 +185,8 @@ class CONTENT_EXPORT ChildThread : public IPC::Listener, public IPC::Sender {
|
| // Handles SocketStream for this process.
|
| scoped_ptr<SocketStreamDispatcher> socket_stream_dispatcher_;
|
|
|
| + scoped_ptr<WebSocketDispatcher> websocket_dispatcher_;
|
| +
|
| // The OnChannelError() callback was invoked - the channel is dead, don't
|
| // attempt to communicate.
|
| bool on_channel_error_called_;
|
|
|