content/browser/web_contents/web_contents_impl.cc - Issue 2214383002: Move registration of Java mojo interfaces to the new InterfaceRegistrar.

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/web_contents/web_contents_impl.cc

Issue 2214383002: Move registration of Java mojo interfaces to the new InterfaceRegistrar. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@java-content-interface-registry

Patch Set: Created 4 years, 3 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

« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/android/java/src/org/chromium/content/browser/InterfaceRegistrar.java » ('j') | content/public/android/java/src/org/chromium/content/browser/InterfaceRegistrar.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/web_contents/web_contents_impl.cc

diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc

index 10187d104037ca97078b9e33ddeca6b6f2b2886f..723313685ab3cd1fa4c832e084263f628b37b3fb 100644

--- a/content/browser/web_contents/web_contents_impl.cc

+++ b/content/browser/web_contents/web_contents_impl.cc

@@ -118,6 +118,7 @@

#include "content/public/common/url_utils.h"

#include "content/public/common/web_preferences.h"

#include "device/geolocation/geolocation_service_context.h"

+#include "device/nfc/nfc.mojom.h"

#include "net/base/url_util.h"

#include "net/http/http_cache.h"

#include "net/http/http_transaction_factory.h"

@@ -4084,6 +4085,10 @@ void WebContentsImpl::RenderFrameCreated(RenderFrameHost* render_frame_host) {

render_frame_host->Send(

new FrameMsg_EnableViewSourceMode(render_frame_host->GetRoutingID()));

}

+#if defined(OS_ANDROID)

+ render_frame_host->GetInterfaceRegistry()->AddInterface(

+ GetJavaInterfaces()->CreateInterfaceFactory<device::nfc::NFC>());

+#endif

}

void WebContentsImpl::RenderFrameDeleted(RenderFrameHost* render_frame_host) {