| Index: content/renderer/render_frame_impl.h
|
| diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
|
| index 31ca01ff97415434befae9c3abe1565032064b54..2b94382013edd344c59801a9dddcc6f9f5cb3399 100644
|
| --- a/content/renderer/render_frame_impl.h
|
| +++ b/content/renderer/render_frame_impl.h
|
| @@ -14,6 +14,7 @@
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/observer_list.h"
|
| #include "base/process/process_handle.h"
|
| +#include "content/common/mojo/service_registry_impl.h"
|
| #include "content/public/common/javascript_message_type.h"
|
| #include "content/public/common/referrer.h"
|
| #include "content/public/renderer/render_frame.h"
|
| @@ -224,6 +225,7 @@ class CONTENT_EXPORT RenderFrameImpl
|
| blink::WebNavigationPolicy policy) OVERRIDE;
|
| virtual void ExecuteJavaScript(const base::string16& javascript) OVERRIDE;
|
| virtual bool IsHidden() OVERRIDE;
|
| + virtual ServiceRegistry* GetServiceRegistry() OVERRIDE;
|
|
|
| // blink::WebFrameClient implementation:
|
| virtual blink::WebPlugin* createPlugin(blink::WebLocalFrame* frame,
|
| @@ -398,6 +400,11 @@ class CONTENT_EXPORT RenderFrameImpl
|
| // this back to private member.
|
| void OnNavigate(const FrameMsg_Navigate_Params& params);
|
|
|
| + // Binds this render frame's service registry to a handle to the remote
|
| + // service registry.
|
| + void BindServiceRegistry(
|
| + mojo::ScopedMessagePipeHandle service_provider_handle);
|
| +
|
| protected:
|
| RenderFrameImpl(RenderViewImpl* render_view, int32 routing_id);
|
|
|
| @@ -630,6 +637,8 @@ class CONTENT_EXPORT RenderFrameImpl
|
| // The geolocation dispatcher attached to this view, lazily initialized.
|
| GeolocationDispatcher* geolocation_dispatcher_;
|
|
|
| + ServiceRegistryImpl service_registry_;
|
| +
|
| // The screen orientation dispatcher attached to the view, lazily initialized.
|
| ScreenOrientationDispatcher* screen_orientation_dispatcher_;
|
|
|
|
|