content/browser/renderer_host/render_process_host_impl.cc - Issue 2191033002: Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid

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/renderer_host/render_process_host_impl.cc

Issue 2191033002: Split ServiceRegistryAndroid into InterfaceRegistryAndroid and InterfaceProviderAndroid (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: . Created 4 years, 5 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/mojo/service_registrar_android.cc ('k') | content/content_browser.gypi » ('j') | content/public/browser/android/interface_provider_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 690f29392511ee60d74d9bc0471d55ebb0d86fe2..de825b5852f59b51a71e389a97740977679d1548 100644

--- a/content/browser/renderer_host/render_process_host_impl.cc

+++ b/content/browser/renderer_host/render_process_host_impl.cc

@@ -188,7 +188,7 @@

#if defined(OS_ANDROID)

#include "content/browser/android/child_process_launcher_android.h"

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

-#include "content/browser/mojo/service_registrar_android.h"

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

#include "content/browser/screen_orientation/screen_orientation_message_filter_android.h"

#include "ipc/ipc_sync_channel.h"

#include "media/audio/android/audio_manager_android.h"

@@ -1109,8 +1109,8 @@ void RenderProcessHostImpl::RegisterMojoInterfaces() {

}

#if defined(OS_ANDROID)

- ServiceRegistrarAndroid::RegisterProcessHostServices(

- mojo_child_connection_->service_registry_android());

+ InterfaceRegistrarAndroid::ExposeInterfacesToRenderer(

+ mojo_child_connection_->interface_registry_android());

#endif

GetContentClient()->browser()->ExposeInterfacesToRenderer(