content/browser/frame_host/render_frame_host_impl.cc - Issue 1486043002: [webnfc] Implement push method for Android nfc mojo service.

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 1486043002: [webnfc] Implement push method for Android nfc mojo service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@step_6_add_mojo_service_CL

Patch Set: Fixes for review comments. Created 4 years, 8 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

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 91733068a18e197e96b287cf273f81e957f33930..4a3fd125ea25b4bc4b941f8ce624461dd5354bb2 100644

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

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

@@ -1937,7 +1937,10 @@ void RenderFrameHostImpl::RegisterMojoServices() {

base::Unretained(this)));

}

+ // On android, NFC is implemented as a Java mojo service.

+#if !defined(OS_ANDROID)

GetServiceRegistry()->AddService(base::Bind(&device::NFCImpl::Create));

+#endif

if (!frame_mojo_shell_)

frame_mojo_shell_.reset(new FrameMojoShell(this));

« no previous file with comments | « no previous file | content/content.gyp » ('j') | device/nfc/android/java/src/org/chromium/device/nfc/NfcImpl.java » ('J')