content/browser/mojo/mojo_application_host.h - 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/mojo/mojo_application_host.h

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

« no previous file with comments | « content/browser/android/browser_jni_registrar.cc ('k') | content/browser/mojo/service_registrar_android.h » ('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/mojo/mojo_application_host.h

diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h

index 1825b3eab55f2444c3e7dddceb7ebee4cc8b2885..d207055cfa741cf87b64dd9d2f18bd135788f452 100644

--- a/content/browser/mojo/mojo_application_host.h

+++ b/content/browser/mojo/mojo_application_host.h

@@ -41,6 +41,11 @@ class MojoApplicationHost {

ServiceRegistry* service_registry() { return &service_registry_; }

+#if defined(OS_ANDROID)

+ ServiceRegistryAndroid* service_registry_android() {

+ return service_registry_android_.get();

+ }

+#endif

qsr 2014/12/12 15:31:57 Keep a space before private:

ppi 2014/12/12 16:02:16 Done.

private:

mojo::embedder::ChannelInit channel_init_;

mojo::embedder::ScopedPlatformHandle client_handle_;