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

Unified Diff: device/bluetooth/android/bluetooth_jni_registrar.cc

Issue 1119113002: bluetooth: Initial JNI setup for device/bluetooth. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge GN files, removes circular includes. Created 5 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: device/bluetooth/android/bluetooth_jni_registrar.cc
diff --git a/device/vibration/android/vibration_jni_registrar.cc b/device/bluetooth/android/bluetooth_jni_registrar.cc
similarity index 47%
copy from device/vibration/android/vibration_jni_registrar.cc
copy to device/bluetooth/android/bluetooth_jni_registrar.cc
index 39003bf255de2270af263df5346dde1b383694d2..5012387fcfa160d32917ae6c43770c251b180eb3 100644
--- a/device/vibration/android/vibration_jni_registrar.cc
+++ b/device/bluetooth/android/bluetooth_jni_registrar.cc
@@ -1,26 +1,26 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2015 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "device/vibration/android/vibration_jni_registrar.h"
+#include "device/bluetooth/android/bluetooth_jni_registrar.h"
#include "base/android/jni_android.h"
#include "base/android/jni_registrar.h"
-#include "device/vibration/vibration_manager_impl_android.h"
+#include "device/bluetooth/bluetooth_adapter_android.h"
namespace device {
namespace android {
namespace {
const base::android::RegistrationMethod kRegisteredMethods[] = {
- { "VibrationProvider", device::VibrationManagerImplAndroid::Register },
+ {"BluetoothAdapter", device::BluetoothAdapterAndroid::RegisterJNI},
};
} // namespace
-bool RegisterVibrationJni(JNIEnv* env) {
- return RegisterNativeMethods(
- env, kRegisteredMethods, arraysize(kRegisteredMethods));
+bool RegisterBluetoothJni(JNIEnv* env) {
+ return RegisterNativeMethods(env, kRegisteredMethods,
+ arraysize(kRegisteredMethods));
}
} // namespace android

Powered by Google App Engine
This is Rietveld 408576698