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)); |