Index: device/bluetooth/bluetooth_remote_gatt_characteristic_win.h |
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_win.h b/device/bluetooth/bluetooth_remote_gatt_characteristic_win.h |
index f7ad8991aff40875788801c039da1ccb9f25010c..549ea205e827b5cbfc0bba39740eeb13953e9211 100644 |
--- a/device/bluetooth/bluetooth_remote_gatt_characteristic_win.h |
+++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_win.h |
@@ -10,8 +10,9 @@ |
#include "base/memory/weak_ptr.h" |
#include "base/sequenced_task_runner.h" |
-#include "device/bluetooth/bluetooth_gatt_characteristic.h" |
#include "device/bluetooth/bluetooth_low_energy_defs_win.h" |
+#include "device/bluetooth/bluetooth_remote_gatt_characteristic.h" |
+#include "device/bluetooth/bluetooth_remote_gatt_service.h" |
namespace device { |
@@ -21,9 +22,10 @@ class BluetoothRemoteGattServiceWin; |
class BluetoothTaskManagerWin; |
// The BluetoothRemoteGattCharacteristicWin class implements |
-// BluetoothGattCharacteristic for remote GATT services on Windows 8 and later. |
+// BluetoothRemoteGattCharacteristic for remote GATT services on Windows 8 and |
+// later. |
class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicWin |
- : public BluetoothGattCharacteristic { |
+ : public BluetoothRemoteGattCharacteristic { |
public: |
BluetoothRemoteGattCharacteristicWin( |
BluetoothRemoteGattServiceWin* parent_service, |
@@ -31,20 +33,17 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicWin |
scoped_refptr<base::SequencedTaskRunner>& ui_task_runner); |
~BluetoothRemoteGattCharacteristicWin() override; |
- // Override BluetoothGattCharacteristic interfaces. |
+ // Override BluetoothRemoteGattCharacteristic interfaces. |
std::string GetIdentifier() const override; |
BluetoothUUID GetUUID() const override; |
- bool IsLocal() const override; |
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 UpdateValue(const std::vector<uint8_t>& value) override; |
void StartNotifySession(const NotifySessionCallback& callback, |
const ErrorCallback& error_callback) override; |
void ReadRemoteCharacteristic(const ValueCallback& callback, |
@@ -80,7 +79,7 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattCharacteristicWin |
std::unique_ptr<BTH_LE_GATT_CHARACTERISTIC_VALUE> value, |
HRESULT hr); |
void OnWriteRemoteCharacteristicValueCallback(HRESULT hr); |
- BluetoothGattService::GattErrorCode HRESULTToGattErrorCode(HRESULT hr); |
+ BluetoothRemoteGattService::GattErrorCode HRESULTToGattErrorCode(HRESULT hr); |
void OnGattCharacteristicValueChanged( |
std::unique_ptr<std::vector<uint8_t>> new_value); |
void GattEventRegistrationCallback(PVOID event_handle, HRESULT hr); |