| Index: device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java
|
| diff --git a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java
|
| index ebe9f07ecc17dd9bfd3766920daa0b82ac47fb17..6cf99fd023773a5700824355e2f9441b3db760c0 100644
|
| --- a/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java
|
| +++ b/device/bluetooth/android/java/src/org/chromium/device/bluetooth/ChromeBluetoothDevice.java
|
| @@ -29,7 +29,7 @@ final class ChromeBluetoothDevice {
|
| private static final String TAG = "Bluetooth";
|
|
|
| private long mNativeBluetoothDeviceAndroid;
|
| - final Wrappers.BluetoothDeviceWrapper mDevice;
|
| + final BluetoothDeviceWrapper mDevice;
|
| Wrappers.BluetoothGattWrapper mBluetoothGatt;
|
| private final BluetoothGattCallbackImpl mBluetoothGattCallbackImpl;
|
| final HashMap<Wrappers.BluetoothGattCharacteristicWrapper,
|
| @@ -38,7 +38,7 @@ final class ChromeBluetoothDevice {
|
| mWrapperToChromeDescriptorsMap;
|
|
|
| private ChromeBluetoothDevice(
|
| - long nativeBluetoothDeviceAndroid, Wrappers.BluetoothDeviceWrapper deviceWrapper) {
|
| + long nativeBluetoothDeviceAndroid, BluetoothDeviceWrapper deviceWrapper) {
|
| mNativeBluetoothDeviceAndroid = nativeBluetoothDeviceAndroid;
|
| mDevice = deviceWrapper;
|
| mBluetoothGattCallbackImpl = new BluetoothGattCallbackImpl();
|
| @@ -66,13 +66,13 @@ final class ChromeBluetoothDevice {
|
| // BluetoothDeviceAndroid methods implemented in java:
|
|
|
| // Implements BluetoothDeviceAndroid::Create.
|
| - // 'Object' type must be used because inner class Wrappers.BluetoothDeviceWrapper reference is
|
| + // 'Object' type must be used because inner class BluetoothDeviceWrapper reference is
|
| // not handled by jni_generator.py JavaToJni. http://crbug.com/505554
|
| @CalledByNative
|
| private static ChromeBluetoothDevice create(
|
| long nativeBluetoothDeviceAndroid, Object deviceWrapper) {
|
| return new ChromeBluetoothDevice(
|
| - nativeBluetoothDeviceAndroid, (Wrappers.BluetoothDeviceWrapper) deviceWrapper);
|
| + nativeBluetoothDeviceAndroid, (BluetoothDeviceWrapper) deviceWrapper);
|
| }
|
|
|
| // Implements BluetoothDeviceAndroid::GetBluetoothClass.
|
|
|