Index: content/renderer/render_thread_impl.h |
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h |
index d8d50c8320b3025a4839f6c2347bc9ee1e9d17f5..3bc7f9dc887ef8e135bdc1605eab2820c33b6e6e 100644 |
--- a/content/renderer/render_thread_impl.h |
+++ b/content/renderer/render_thread_impl.h |
@@ -166,6 +166,7 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, |
virtual void PreCacheFont(const LOGFONT& log_font) OVERRIDE; |
virtual void ReleaseCachedFonts() OVERRIDE; |
#endif |
+ virtual ServiceRegistry* GetServiceRegistry() OVERRIDE; |
// Synchronously establish a channel to the GPU plugin if not previously |
// established or if it has been lost (for example if the GPU plugin crashed). |
@@ -400,6 +401,9 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, |
void AddEmbeddedWorkerRoute(int32 routing_id, IPC::Listener* listener); |
void RemoveEmbeddedWorkerRoute(int32 routing_id); |
+ void RegisterPendingRenderFrameConnect(int routing_id, |
+ mojo::ScopedMessagePipeHandle handle); |
+ |
private: |
// ChildThread |
virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE; |
@@ -425,13 +429,6 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, |
unsigned internalformat, |
unsigned usage) OVERRIDE; |
- // mojo::ServiceProvider implementation: |
- virtual void ConnectToService( |
- const mojo::String& service_url, |
- const mojo::String& service_name, |
- mojo::ScopedMessagePipeHandle message_pipe, |
- const mojo::String& requestor_url) OVERRIDE; |
- |
void Init(); |
void OnSetZoomLevelForCurrentURL(const std::string& scheme, |
@@ -580,6 +577,8 @@ class CONTENT_EXPORT RenderThreadImpl : public RenderThread, |
bool is_zero_copy_enabled_; |
bool is_one_copy_enabled_; |
+ std::map<int, mojo::MessagePipeHandle> pending_render_frame_connects_; |
+ |
DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl); |
}; |