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

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

Issue 1542163002: Switch to standard integer types in device/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: win Created 5 years 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
« no previous file with comments | « device/battery/battery_status_service_unittest.cc ('k') | device/bluetooth/bluetooth_adapter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "device/bluetooth/android/wrappers.h" 10 #include "device/bluetooth/android/wrappers.h"
10 #include "device/bluetooth/bluetooth_adapter_android.h" 11 #include "device/bluetooth/bluetooth_adapter_android.h"
11 #include "device/bluetooth/bluetooth_device_android.h" 12 #include "device/bluetooth/bluetooth_device_android.h"
12 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_android.h" 13 #include "device/bluetooth/bluetooth_remote_gatt_characteristic_android.h"
13 #include "device/bluetooth/bluetooth_remote_gatt_service_android.h" 14 #include "device/bluetooth/bluetooth_remote_gatt_service_android.h"
14 15
15 namespace device { 16 namespace device {
16 namespace android { 17 namespace android {
17 namespace { 18 namespace {
18 19
19 const base::android::RegistrationMethod kRegisteredMethods[] = { 20 const base::android::RegistrationMethod kRegisteredMethods[] = {
20 {"BluetoothAdapterAndroid", device::BluetoothAdapterAndroid::RegisterJNI}, 21 {"BluetoothAdapterAndroid", device::BluetoothAdapterAndroid::RegisterJNI},
21 {"BluetoothDeviceAndroid", device::BluetoothDeviceAndroid::RegisterJNI}, 22 {"BluetoothDeviceAndroid", device::BluetoothDeviceAndroid::RegisterJNI},
22 {"BluetoothRemoteGattCharacteristicAndroid", 23 {"BluetoothRemoteGattCharacteristicAndroid",
23 device::BluetoothRemoteGattCharacteristicAndroid::RegisterJNI}, 24 device::BluetoothRemoteGattCharacteristicAndroid::RegisterJNI},
24 {"BluetoothRemoteGattServiceAndroid", 25 {"BluetoothRemoteGattServiceAndroid",
25 device::BluetoothRemoteGattServiceAndroid::RegisterJNI}, 26 device::BluetoothRemoteGattServiceAndroid::RegisterJNI},
26 {"Wrappers", device::WrappersRegisterJNI}, 27 {"Wrappers", device::WrappersRegisterJNI},
27 }; 28 };
28 29
29 } // namespace 30 } // namespace
30 31
31 bool RegisterBluetoothJni(JNIEnv* env) { 32 bool RegisterBluetoothJni(JNIEnv* env) {
32 return RegisterNativeMethods(env, kRegisteredMethods, 33 return RegisterNativeMethods(env, kRegisteredMethods,
33 arraysize(kRegisteredMethods)); 34 arraysize(kRegisteredMethods));
34 } 35 }
35 36
36 } // namespace android 37 } // namespace android
37 } // namespace device 38 } // namespace device
OLDNEW
« no previous file with comments | « device/battery/battery_status_service_unittest.cc ('k') | device/bluetooth/bluetooth_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698