Index: content/browser/renderer_host/render_process_host_impl.cc |
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc |
index d5aef3d4136fcfc77a0cd7b50c11f47d46b4179f..0b89a958a2343fdb04f05486dde0d5903353ae00 100644 |
--- a/content/browser/renderer_host/render_process_host_impl.cc |
+++ b/content/browser/renderer_host/render_process_host_impl.cc |
@@ -1332,8 +1332,9 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() { |
base::Unretained( |
memory_instrumentation::CoordinatorImpl::GetInstance()))); |
- GetContentClient()->browser()->ExposeInterfacesToRenderer(registry.get(), |
- this); |
+ associated_registry_.reset(new AssociatedInterfaceRegistryImpl()); |
+ GetContentClient()->browser()->ExposeInterfacesToRenderer( |
+ registry.get(), associated_registry_.get(), this); |
ServiceManagerConnection* service_manager_connection = |
BrowserContext::GetServiceManagerConnectionFor(browser_context_); |
@@ -2088,6 +2089,8 @@ void RenderProcessHostImpl::OnAssociatedInterfaceRequest( |
mojom::RouteProviderAssociatedRequest request; |
request.Bind(std::move(handle)); |
route_provider_binding_.Bind(std::move(request)); |
+ } else if (associated_registry_->CanBindRequest(interface_name)) { |
Ken Rockot(use gerrit already)
2017/04/11 22:20:36
Optional nit: You could add a binder for RouteProv
nigeltao1
2017/04/20 05:12:36
Done, by adding some new code further up in this f
|
+ associated_registry_->BindRequest(interface_name, std::move(handle)); |
} else { |
LOG(ERROR) << "Request for unknown Channel-associated interface: " |
<< interface_name; |