| Index: content/browser/frame_host/render_frame_host_impl.cc
|
| diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
|
| index 707e69a636f7ea0b1d79939c6513311c9bc0812c..8ad04505f40101293753cc04d821358aa7746490 100644
|
| --- a/content/browser/frame_host/render_frame_host_impl.cc
|
| +++ b/content/browser/frame_host/render_frame_host_impl.cc
|
| @@ -24,6 +24,7 @@
|
| #include "content/common/frame_messages.h"
|
| #include "content/common/input_messages.h"
|
| #include "content/common/inter_process_time_ticks_converter.h"
|
| +#include "content/common/render_frame_setup.mojom.h"
|
| #include "content/common/swapped_out_messages.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/content_browser_client.h"
|
| @@ -161,6 +162,14 @@ RenderFrameHostImpl::RenderFrameHostImpl(
|
| g_routing_id_frame_map.Get().insert(std::make_pair(
|
| RenderFrameHostID(GetProcess()->GetID(), routing_id_),
|
| this));
|
| +
|
| + if (GetProcess()->GetServiceRegistry()) {
|
| + RenderFrameSetupPtr setup;
|
| + GetProcess()->GetServiceRegistry()->GetInterface(&setup);
|
| + mojo::IInterfaceProviderPtr service_provider;
|
| + setup->ConnectToServiceProvider(routing_id_, mojo::Get(&service_provider));
|
| + service_registry_.Bind(service_provider.PassMessagePipe());
|
| + }
|
| }
|
|
|
| RenderFrameHostImpl::~RenderFrameHostImpl() {
|
| @@ -241,6 +250,10 @@ RenderViewHost* RenderFrameHostImpl::GetRenderViewHost() {
|
| return render_view_host_;
|
| }
|
|
|
| +ServiceRegistry* RenderFrameHostImpl::GetServiceRegistry() {
|
| + return &service_registry_;
|
| +}
|
| +
|
| bool RenderFrameHostImpl::Send(IPC::Message* message) {
|
| if (IPC_MESSAGE_ID_CLASS(message->type()) == InputMsgStart) {
|
| return render_view_host_->input_router()->SendInput(
|
|
|