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 61f99107da172a7b81fd447f6c1d758f72478d33..36f8f9a0f4ea81bc90fad6283075b047784ca891 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.h |
+++ b/content/browser/renderer_host/render_process_host_impl.h |
@@ -15,8 +15,10 @@ |
#include "base/timer/timer.h" |
#include "content/browser/child_process_launcher.h" |
#include "content/browser/dom_storage/session_storage_namespace_impl.h" |
+#include "content/browser/mojo/mojo_application_host.h" |
#include "content/browser/power_monitor_message_broadcaster.h" |
#include "content/common/content_export.h" |
+#include "content/common/mojo/service_registry_impl.h" |
#include "content/public/browser/gpu_data_manager_observer.h" |
#include "content/public/browser/render_process_host.h" |
#include "ipc/ipc_channel_proxy.h" |
@@ -45,13 +47,11 @@ class AudioRendererHost; |
class BrowserDemuxerAndroid; |
class GpuMessageFilter; |
class MessagePortMessageFilter; |
-class MojoApplicationHost; |
#if defined(ENABLE_WEBRTC) |
class P2PSocketDispatcherHost; |
#endif |
class PeerConnectionTrackerHost; |
class RendererMainThread; |
-class RenderProcessHostMojoImpl; |
class RenderWidgetHelper; |
class RenderWidgetHost; |
class RenderWidgetHostImpl; |
@@ -143,6 +143,7 @@ class CONTENT_EXPORT RenderProcessHostImpl |
virtual void ResumeDeferredNavigation(const GlobalRequestID& request_id) |
OVERRIDE; |
virtual void NotifyTimezoneChange() OVERRIDE; |
+ virtual ServiceRegistry* GetServiceRegistry() OVERRIDE; |
// IPC::Sender via RenderProcessHost. |
virtual bool Send(IPC::Message* msg) OVERRIDE; |
@@ -250,23 +251,13 @@ class CONTENT_EXPORT RenderProcessHostImpl |
void IncrementWorkerRefCount(); |
void DecrementWorkerRefCount(); |
- // Establish a connection to a renderer-provided service. See |
- // content/common/mojo/mojo_service_names.h for a list of services. |
- void ConnectTo(const base::StringPiece& service_name, |
- mojo::ScopedMessagePipeHandle handle); |
- |
- template <typename Interface> |
- void ConnectTo(const base::StringPiece& service_name, |
- mojo::InterfacePtr<Interface>* ptr) { |
- mojo::MessagePipe pipe; |
- ptr->Bind(pipe.handle0.Pass()); |
- ConnectTo(service_name, pipe.handle1.Pass()); |
- } |
- |
// Call this function to resume the navigation when it was deferred |
// 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) |