Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(90)

Unified Diff: content/browser/service_manager/service_manager_context.cc

Issue 2865653002: [Device Service] Decouple NFC implementation from //content (Closed)
Patch Set: Rebase Created 3 years, 7 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/service_manager/service_manager_context.cc
diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
index 4931f96b6f81c66be41ada9d4deb4a7e426074ed..6bf17dd96a108f92029f28c83840a0c4d8f9fb65 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -51,6 +51,13 @@
#include "services/service_manager/service_manager.h"
#include "services/shape_detection/public/interfaces/constants.mojom.h"
+#if defined(OS_ANDROID)
+#include "base/android/context_utils.h"
+#include "base/android/jni_android.h"
+#include "base/android/scoped_java_ref.h"
+#include "jni/ContentNfcDelegate_jni.h"
+#endif
+
namespace content {
namespace {
@@ -291,13 +298,19 @@ ServiceManagerContext::ServiceManagerContext() {
ServiceInfo device_info;
#if defined(OS_ANDROID)
- // See the comments on wake_lock_context_host.h for details on this
- // callback.
+ JNIEnv* env = base::android::AttachCurrentThread();
+ base::android::ScopedJavaGlobalRef<jobject> java_nfc_delegate;
+ java_nfc_delegate.Reset(Java_ContentNfcDelegate_create(env));
+ DCHECK(!java_nfc_delegate.is_null());
+
+ // See the comments on wake_lock_context_host.h and ContentNfcDelegate.java
+ // respectively for comments on those parameters.
device_info.factory =
base::Bind(&device::CreateDeviceService,
BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE),
BrowserThread::GetTaskRunnerForThread(BrowserThread::IO),
- base::Bind(&WakeLockContextHost::GetNativeViewForContext));
+ base::Bind(&WakeLockContextHost::GetNativeViewForContext),
+ std::move(java_nfc_delegate));
#else
device_info.factory =
base::Bind(&device::CreateDeviceService,
« no previous file with comments | « content/browser/frame_host/render_frame_host_impl.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698