| Index: device/bluetooth/bluetooth_remote_gatt_descriptor_android.h
|
| diff --git a/device/bluetooth/bluetooth_remote_gatt_descriptor_android.h b/device/bluetooth/bluetooth_remote_gatt_descriptor_android.h
|
| index cc2b86174cbea3f27a8fdc7d37b81ff347221e2f..e7a4291587f1da07d835e95624c2891b21325162 100644
|
| --- a/device/bluetooth/bluetooth_remote_gatt_descriptor_android.h
|
| +++ b/device/bluetooth/bluetooth_remote_gatt_descriptor_android.h
|
| @@ -9,7 +9,8 @@
|
|
|
| #include "base/android/jni_android.h"
|
| #include "base/macros.h"
|
| -#include "device/bluetooth/bluetooth_gatt_descriptor.h"
|
| +#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
|
| +#include "device/bluetooth/bluetooth_remote_gatt_descriptor.h"
|
|
|
| namespace device {
|
|
|
| @@ -17,7 +18,7 @@ namespace device {
|
| // org.chromium.device.bluetooth.ChromeBluetoothRemoteGattDescriptor
|
| // implement BluetootGattDescriptor.
|
| class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattDescriptorAndroid
|
| - : public BluetoothGattDescriptor {
|
| + : public BluetoothRemoteGattDescriptor {
|
| public:
|
| // Create a BluetoothRemoteGattDescriptorAndroid instance and associated
|
| // Java ChromeBluetoothRemoteGattDescriptor using the provided
|
| @@ -39,13 +40,13 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattDescriptorAndroid
|
| // Returns the associated ChromeBluetoothRemoteGattDescriptor Java object.
|
| base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
|
|
|
| - // BluetoothGattDescriptor interface:
|
| + // BluetoothRemoteGattDescriptor interface:
|
| std::string GetIdentifier() const override;
|
| BluetoothUUID GetUUID() const override;
|
| - bool IsLocal() const override;
|
| const std::vector<uint8_t>& GetValue() const override;
|
| - BluetoothGattCharacteristic* GetCharacteristic() const override;
|
| - BluetoothGattCharacteristic::Permissions GetPermissions() const override;
|
| + BluetoothRemoteGattCharacteristic* GetCharacteristic() const override;
|
| + BluetoothRemoteGattCharacteristic::Permissions GetPermissions()
|
| + const override;
|
| void ReadRemoteDescriptor(const ValueCallback& callback,
|
| const ErrorCallback& error_callback) override;
|
| void WriteRemoteDescriptor(const std::vector<uint8_t>& new_value,
|
|
|