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

Side by Side Diff: device/bluetooth/android/bluetooth_jni_registrar.cc

Issue 2146753002: Android: Remove unneeded RegisterNatives() calls (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android: Don't require RegisterNatives if there are none Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "device/bluetooth/android/bluetooth_jni_registrar.h" 5 #include "device/bluetooth/android/bluetooth_jni_registrar.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_registrar.h" 8 #include "base/android/jni_registrar.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "device/bluetooth/android/wrappers.h"
11 #include "device/bluetooth/bluetooth_adapter_android.h" 10 #include "device/bluetooth/bluetooth_adapter_android.h"
12 #include "device/bluetooth/bluetooth_device_android.h" 11 #include "device/bluetooth/bluetooth_device_android.h"
13 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_android.h" 12 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_android.h"
14 #include "device/bluetooth/bluetooth_remote_gatt_descriptor_android.h" 13 #include "device/bluetooth/bluetooth_remote_gatt_descriptor_android.h"
15 #include "device/bluetooth/bluetooth_remote_gatt_service_android.h" 14 #include "device/bluetooth/bluetooth_remote_gatt_service_android.h"
16 15
17 namespace device { 16 namespace device {
18 namespace android { 17 namespace android {
19 namespace { 18 namespace {
20 19
21 const base::android::RegistrationMethod kRegisteredMethods[] = { 20 const base::android::RegistrationMethod kRegisteredMethods[] = {
22 {"BluetoothAdapterAndroid", device::BluetoothAdapterAndroid::RegisterJNI}, 21 {"BluetoothAdapterAndroid", device::BluetoothAdapterAndroid::RegisterJNI},
23 {"BluetoothDeviceAndroid", device::BluetoothDeviceAndroid::RegisterJNI}, 22 {"BluetoothDeviceAndroid", device::BluetoothDeviceAndroid::RegisterJNI},
24 {"BluetoothRemoteGattCharacteristicAndroid", 23 {"BluetoothRemoteGattCharacteristicAndroid",
25 device::BluetoothRemoteGattCharacteristicAndroid::RegisterJNI}, 24 device::BluetoothRemoteGattCharacteristicAndroid::RegisterJNI},
26 {"BluetoothRemoteGattDescriptorAndroid", 25 {"BluetoothRemoteGattDescriptorAndroid",
27 device::BluetoothRemoteGattDescriptorAndroid::RegisterJNI}, 26 device::BluetoothRemoteGattDescriptorAndroid::RegisterJNI},
28 {"BluetoothRemoteGattServiceAndroid", 27 {"BluetoothRemoteGattServiceAndroid",
29 device::BluetoothRemoteGattServiceAndroid::RegisterJNI}, 28 device::BluetoothRemoteGattServiceAndroid::RegisterJNI},
30 {"Wrappers", device::WrappersRegisterJNI},
31 }; 29 };
32 30
33 } // namespace 31 } // namespace
34 32
35 bool RegisterBluetoothJni(JNIEnv* env) { 33 bool RegisterBluetoothJni(JNIEnv* env) {
36 return RegisterNativeMethods(env, kRegisteredMethods, 34 return RegisterNativeMethods(env, kRegisteredMethods,
37 arraysize(kRegisteredMethods)); 35 arraysize(kRegisteredMethods));
38 } 36 }
39 37
40 } // namespace android 38 } // namespace android
41 } // namespace device 39 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698