Chromium Code Reviews| Index: content/browser/frame_host/render_frame_host_impl.h |
| diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h |
| index ab32d9f767fcf9484a1f3bcc7632f7b80a9152e5..39657d20cd2175925333edb9bf3f6028604415bd 100644 |
| --- a/content/browser/frame_host/render_frame_host_impl.h |
| +++ b/content/browser/frame_host/render_frame_host_impl.h |
| @@ -14,6 +14,7 @@ |
| #include "base/strings/string16.h" |
| #include "base/time/time.h" |
| #include "content/common/content_export.h" |
| +#include "content/common/mojo/service_registry_impl.h" |
| #include "content/public/browser/render_frame_host.h" |
| #include "content/public/common/javascript_message_type.h" |
| #include "content/public/common/page_transition_types.h" |
| @@ -66,6 +67,7 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost { |
| const base::string16& javascript, |
| const JavaScriptResultCallback& callback) OVERRIDE; |
| virtual RenderViewHost* GetRenderViewHost() OVERRIDE; |
| + virtual ServiceRegistry* GetServiceRegistry() OVERRIDE; |
| // IPC::Sender |
| virtual bool Send(IPC::Message* msg) OVERRIDE; |
| @@ -167,6 +169,10 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost { |
| // Called when an HTML5 notification is closed. |
| void NotificationClosed(int notification_id); |
| + // Binds this render frame's service registry to a handle to the remote |
| + // service registry. |
| + void BindServiceRegistry(mojo::ScopedMessagePipeHandle shell_handle); |
|
darin (slow to review)
2014/06/12 05:27:12
nit: shell_handle seems like the wrong parameter n
Sam McNally
2014/06/12 08:56:40
Done.
|
| + |
| protected: |
| friend class RenderFrameHostFactory; |
| @@ -290,6 +296,8 @@ class CONTENT_EXPORT RenderFrameHostImpl : public RenderFrameHost { |
| // When the last BeforeUnload message was sent. |
| base::TimeTicks send_before_unload_start_time_; |
| + ServiceRegistryImpl service_registry_; |
| + |
| base::WeakPtrFactory<RenderFrameHostImpl> weak_ptr_factory_; |
| DISALLOW_COPY_AND_ASSIGN(RenderFrameHostImpl); |