Replace ContentBrowserClient::ExposeInterfacesToFrame with BindInterfaceRequestFromFrame
Use new parameterized BinderRegistry.
[email protected]
Cq-Include-Trybots: master.tryserver.chromium.linux:linux_site_isolation
Change-Id: I9f7e5cdf6802d45bdec83069e116cd99e0371022
Reviewed-on: https://chromium-review.googlesource.com/538998
Commit-Queue: Ben Goodger <[email protected]>
Reviewed-by: Ken Rockot <[email protected]>
Cr-Commit-Position: refs/heads/master@{#480972}diff --git a/content/shell/browser/shell_content_browser_client.h b/content/shell/browser/shell_content_browser_client.h
index 9e10d08..5bee942 100644
--- a/content/shell/browser/shell_content_browser_client.h
+++ b/content/shell/browser/shell_content_browser_client.h
@@ -14,6 +14,7 @@
#include "content/public/browser/content_browser_client.h"
#include "content/shell/browser/shell_resource_dispatcher_host_delegate.h"
#include "content/shell/browser/shell_speech_recognition_manager_delegate.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
namespace content {
@@ -36,8 +37,11 @@
bool DoesSiteRequireDedicatedProcess(BrowserContext* browser_context,
const GURL& effective_site_url) override;
bool IsHandledURL(const GURL& url) override;
- void ExposeInterfacesToFrame(service_manager::BinderRegistry* registry,
- RenderFrameHost* frame_host) override;
+ void BindInterfaceRequestFromFrame(
+ content::RenderFrameHost* render_frame_host,
+ const service_manager::BindSourceInfo& source_info,
+ const std::string& interface_name,
+ mojo::ScopedMessagePipeHandle interface_pipe) override;
void RegisterInProcessServices(StaticServiceMap* services) override;
void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override;
std::unique_ptr<base::Value> GetServiceManifestOverlay(
@@ -111,6 +115,9 @@
base::Closure select_client_certificate_callback_;
+ service_manager::BinderRegistryWithParams<content::RenderFrameHost*>
+ frame_interfaces_;
+
ShellBrowserMainParts* shell_browser_main_parts_;
};
