content/browser/frame_host/render_frame_host_impl.cc - Issue 2214383002: Move registration of Java mojo interfaces to the new InterfaceRegistrar.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/frame_host/render_frame_host_impl.cc

Issue 2214383002: Move registration of Java mojo interfaces to the new InterfaceRegistrar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@java-content-interface-registry

Patch Set: Created 4 years, 3 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 | « content/browser/DEPS ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | content/public/android/java/src/org/chromium/content/browser/InterfaceRegistrar.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 01bf05f44b1f5af42dec7efc152ff2bc1a5ddd88..6db1d0f701b8d02966a9b39ea36b2766ccb5d889 100644

--- a/content/browser/frame_host/render_frame_host_impl.cc

+++ b/content/browser/frame_host/render_frame_host_impl.cc

@@ -99,6 +99,7 @@

#if defined(OS_ANDROID)

#include "content/browser/mojo/interface_registrar_android.h"

+#include "content/public/browser/android/java_interfaces.h"

#if defined(ENABLE_MOJO_CDM)

#include "content/browser/media/android/provision_fetcher_impl.h"

#endif

@@ -2150,7 +2151,11 @@ void RenderFrameHostImpl::RegisterMojoInterfaces() {

GetInterfaceRegistry()->AddInterface(base::Bind(

&PresentationServiceImpl::CreateMojoService, base::Unretained(this)));

-#if !defined(OS_ANDROID)

+#if defined(OS_ANDROID)

+ GetInterfaceRegistry()->AddInterface(

+ GetGlobalJavaInterfaces()

+ ->CreateInterfaceFactory<device::VibrationManager>());

+#else

GetInterfaceRegistry()->AddInterface(

base::Bind(&device::VibrationManagerImpl::Create));

#endif