| Index: content/browser/renderer_host/render_process_host_impl.h
|
| diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h
|
| index 92d1e4d1b78802735102f58033d32dd093bc8679..4e627ead4e4a314135f483ec1366fe5da2a755ce 100644
|
| --- a/content/browser/renderer_host/render_process_host_impl.h
|
| +++ b/content/browser/renderer_host/render_process_host_impl.h
|
| @@ -256,9 +256,6 @@ class CONTENT_EXPORT RenderProcessHostImpl
|
| // immediately after receiving response headers.
|
| void ResumeResponseDeferredAtStart(const GlobalRequestID& request_id);
|
|
|
| - // Activates Mojo for this process. Does nothing if Mojo is already activated.
|
| - void EnsureMojoActivated();
|
| -
|
| protected:
|
| // A proxy for our IPC::Channel that lives on the IO thread (see
|
| // browser_process.h)
|
| @@ -287,7 +284,6 @@ class CONTENT_EXPORT RenderProcessHostImpl
|
| private:
|
| friend class VisitRelayingRenderProcessHost;
|
|
|
| - void MaybeActivateMojo();
|
| bool ShouldUseMojoChannel() const;
|
| scoped_ptr<IPC::ChannelProxy> CreateChannelProxy(
|
| const std::string& channel_id);
|
| @@ -295,6 +291,9 @@ class CONTENT_EXPORT RenderProcessHostImpl
|
| // Creates and adds the IO thread message filters.
|
| void CreateMessageFilters();
|
|
|
| + // Registers Mojo services to be exposed to the renderer.
|
| + void RegisterMojoServices();
|
| +
|
| // Control message handlers.
|
| void OnShutdownRequest();
|
| void OnDumpHandlesDone();
|
| @@ -335,7 +334,6 @@ class CONTENT_EXPORT RenderProcessHostImpl
|
| #endif
|
|
|
| scoped_ptr<MojoApplicationHost> mojo_application_host_;
|
| - bool mojo_activation_required_;
|
|
|
| // The registered IPC listener objects. When this list is empty, we should
|
| // delete ourselves.
|
|
|