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 f53f9cdea2c69ec7cf8a90f6fb0aa088ec0a7ec5..ceb91427e216cac2131e3ade66b51a34ab2661c4 100644 |
--- a/content/browser/frame_host/render_frame_host_impl.cc |
+++ b/content/browser/frame_host/render_frame_host_impl.cc |
@@ -1937,8 +1937,10 @@ void RenderFrameHostImpl::RegisterMojoServices() { |
base::Unretained(this))); |
} |
+#if !defined(OS_ANDROID) |
ncarter (slow)
2016/04/25 20:03:14
Please add a comment:
// On android, NFC is impl
shalamov
2016/04/26 21:56:52
Done.
|
GetServiceRegistry()->AddService<device::NFC>( |
base::Bind(&device::NFCImpl::Create)); |
ncarter (slow)
2016/04/25 20:03:14
This line doesn't seem to exist at tip of tree; I
shalamov
2016/04/26 21:56:52
Yes, I'm planning to land https://crrev.com/191236
|
+#endif |
if (!frame_mojo_shell_) |
frame_mojo_shell_.reset(new FrameMojoShell(this)); |