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

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 Torne's comment. 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
« no previous file with comments | « content/browser/mojo/service_registry_android.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 f3a52cc48c4cff98595fae3f7d6fc3c65bd0c1cb..e572939a72ef71827a0e5296578c0b56e02d9375 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -157,6 +157,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
@@ -903,6 +904,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());
}
« no previous file with comments | « content/browser/mojo/service_registry_android.h ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698