diff options
Diffstat (limited to 'content/child/child_thread.h')
| -rw-r--r-- | content/child/child_thread.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/content/child/child_thread.h b/content/child/child_thread.h index 1b04830..1728c71 100644 --- a/content/child/child_thread.h +++ b/content/child/child_thread.h @@ -16,7 +16,7 @@ #include "content/common/content_export.h" #include "content/common/message_router.h" #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. -#include "mojo/public/interfaces/shell/shell.mojom.h" +#include "mojo/public/interfaces/service_provider/service_provider.mojom.h" namespace base { class MessageLoop; @@ -56,9 +56,10 @@ class WebSocketDispatcher; struct RequestInfo; // The main thread of a child process derives from this class. -class CONTENT_EXPORT ChildThread : public IPC::Listener, - public IPC::Sender, - public NON_EXPORTED_BASE(mojo::ShellClient) { +class CONTENT_EXPORT ChildThread + : public IPC::Listener, + public IPC::Sender, + public NON_EXPORTED_BASE(mojo::ServiceProvider) { public: // Creates the thread. ChildThread(); @@ -170,7 +171,7 @@ class CONTENT_EXPORT ChildThread : public IPC::Listener, virtual void OnChannelError() OVERRIDE; // mojo::ShellClient implementation: - virtual void AcceptConnection( + virtual void ConnectToService( const mojo::String& service_name, mojo::ScopedMessagePipeHandle message_pipe) OVERRIDE; |