| Index: device/bluetooth/bluetooth_remote_gatt_characteristic_android.h
|
| diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h b/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h
|
| index 6058f910e007b6b9efe5bf370b87070f2cde6ba3..c267d8b3eee24f57fe0452a9fd47699b502b542f 100644
|
| --- a/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h
|
| +++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_android.h
|
| @@ -12,7 +12,7 @@
|
| #include "base/android/jni_android.h"
|
| #include "base/containers/scoped_ptr_hash_map.h"
|
| #include "base/macros.h"
|
| -#include "device/bluetooth/bluetooth_gatt_characteristic.h"
|
| +#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h"
|
|
|
| namespace device {
|
|
|
| @@ -27,7 +27,7 @@ class BluetoothRemoteGattServiceAndroid;
|
| // TODO(crbug.com/551634): When notifications are enabled characteristic updates
|
| // should call observers' GattCharacteristicValueChanged.
|
| class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicAndroid
|
| - : public BluetoothGattCharacteristic {
|
| + : public BluetoothRemoteGattCharacteristic {
|
| public:
|
| // Create a BluetoothRemoteGattCharacteristicAndroid instance and associated
|
| // Java
|
| @@ -53,19 +53,19 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicAndroid
|
| // Returns the associated ChromeBluetoothRemoteGattCharacteristic Java object.
|
| base::android::ScopedJavaLocalRef<jobject> GetJavaObject();
|
|
|
| - // BluetoothGattCharacteristic interface:
|
| + // BluetoothRemoteGattCharacteristic interface:
|
| std::string GetIdentifier() const override;
|
| BluetoothUUID GetUUID() const override;
|
| bool IsLocal() const override;
|
| const std::vector<uint8_t>& GetValue() const override;
|
| - BluetoothGattService* GetService() const override;
|
| + BluetoothRemoteGattService* GetService() const override;
|
| Properties GetProperties() const override;
|
| Permissions GetPermissions() const override;
|
| bool IsNotifying() const override;
|
| - std::vector<BluetoothGattDescriptor*> GetDescriptors() const override;
|
| - BluetoothGattDescriptor* GetDescriptor(
|
| + std::vector<BluetoothRemoteGattDescriptor*> GetDescriptors() const override;
|
| + BluetoothRemoteGattDescriptor* GetDescriptor(
|
| const std::string& identifier) const override;
|
| - bool AddDescriptor(BluetoothGattDescriptor* descriptor) override;
|
| + bool AddDescriptor(BluetoothRemoteGattDescriptor* descriptor) override;
|
| bool UpdateValue(const std::vector<uint8_t>& value) override;
|
| void StartNotifySession(const NotifySessionCallback& callback,
|
| const ErrorCallback& error_callback) override;
|
| @@ -79,7 +79,8 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicAndroid
|
| void OnStartNotifySessionSuccess();
|
|
|
| // Called when StartNotifySession operation fails.
|
| - void OnStartNotifySessionError(BluetoothGattService::GattErrorCode error);
|
| + void OnStartNotifySessionError(
|
| + BluetoothRemoteGattService::GattErrorCode error);
|
|
|
| // Called when value changed event occurs.
|
| void OnChanged(JNIEnv* env,
|
|
|