Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Unified Diff: chrome/browser/chrome_content_browser_client.h

Issue 2766263009: Convert content ConnectionFilter to OnBindInterface (Closed)
Patch Set: . Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chrome_content_browser_client.h
diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
index dae52309fff5cdb8c7d5764e7f99a000f0f5cb2f..2688375d3f0c86e69e0c21f857f3c9fb98195104 100644
--- a/chrome/browser/chrome_content_browser_client.h
+++ b/chrome/browser/chrome_content_browser_client.h
@@ -20,6 +20,7 @@
#include "extensions/features/features.h"
#include "media/media_features.h"
#include "ppapi/features/features.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
class ChromeContentBrowserClientParts;
@@ -282,7 +283,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
int sandbox_type) const override;
#endif
void ExposeInterfacesToRenderer(
- service_manager::InterfaceRegistry* registry,
+ service_manager::BinderRegistry* registry,
content::RenderProcessHost* render_process_host) override;
void ExposeInterfacesToMediaService(
service_manager::InterfaceRegistry* registry,
@@ -290,9 +291,10 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
void RegisterRenderFrameMojoInterfaces(
service_manager::InterfaceRegistry* registry,
content::RenderFrameHost* render_frame_host) override;
- void ExposeInterfacesToGpuProcess(
- service_manager::InterfaceRegistry* registry,
- content::GpuProcessHost* render_process_host) override;
+ void BindInterfaceRequest(
+ const service_manager::ServiceInfo& source_info,
+ const std::string& interface_name,
+ mojo::ScopedMessagePipeHandle* interface_pipe) override;
void RegisterInProcessServices(StaticServiceMap* services) override;
void RegisterOutOfProcessServices(
OutOfProcessServiceMap* services) override;
@@ -385,6 +387,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
// Parts are deleted in the reverse order they are added.
std::vector<ChromeContentBrowserClientParts*> extra_parts_;
+ service_manager::BinderRegistry gpu_binder_registry_;
+
base::WeakPtrFactory<ChromeContentBrowserClient> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698