content/browser/renderer_host/render_process_host_impl.cc - Issue 641703002: Rewrite the Android implementation of BatteryMonitor directly in Java.

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 641703002: Rewrite the Android implementation of BatteryMonitor directly in Java. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@battery-status-api-to-mojo

Patch Set: Address Ben's comments, update GN build, polish. Created 6 years 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

« content/browser/mojo/mojo_application_host.h ('K') | « content/browser/mojo/service_registry_android.h ('k') | content/content_browser.gypi » ('j') | content/public/android/java/src/org/chromium/content/browser/ServiceRegistrar.java » ('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 1d3166360f3210e660dcdca99c70929e4c87ec50..952349268cdec675def6ffb3e6240d3472582acc 100644

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

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

@@ -156,6 +156,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/screen_orientation/screen_orientation_message_filter_android.h"

#endif

@@ -896,6 +897,11 @@ void RenderProcessHostImpl::RegisterMojoServices() {

base::Bind(&PermissionServiceContext::CreateService,

base::Unretained(permission_service_context_.get())));

+#if defined(OS_ANDROID)

+ ServiceRegistrarAndroid::RegisterProcessHostServices(

+ mojo_application_host_->service_registry_android());

+#endif

GetContentClient()->browser()->OverrideRenderProcessMojoServices(

mojo_application_host_->service_registry());

}