Index: device/bluetooth/bluetooth_remote_gatt_service_win.h |
diff --git a/device/bluetooth/bluetooth_remote_gatt_service_win.h b/device/bluetooth/bluetooth_remote_gatt_service_win.h |
index c2822dde4f10d8ab51c0531917a7cec1ddc39ba1..c26a81d39c1d2b3371de91536cfc2c6bb96d91f9 100644 |
--- a/device/bluetooth/bluetooth_remote_gatt_service_win.h |
+++ b/device/bluetooth/bluetooth_remote_gatt_service_win.h |
@@ -11,8 +11,8 @@ |
#include "base/files/file.h" |
#include "base/memory/weak_ptr.h" |
#include "base/sequenced_task_runner.h" |
-#include "device/bluetooth/bluetooth_gatt_service.h" |
#include "device/bluetooth/bluetooth_low_energy_defs_win.h" |
+#include "device/bluetooth/bluetooth_remote_gatt_service.h" |
namespace device { |
@@ -21,10 +21,10 @@ class BluetoothDeviceWin; |
class BluetoothRemoteGattCharacteristicWin; |
class BluetoothTaskManagerWin; |
-// The BluetoothRemoteGattServiceWin class implements BluetoothGattService |
+// The BluetoothRemoteGattServiceWin class implements BluetoothRemoteGattService |
// for remote GATT services on Windows 8 and later. |
class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattServiceWin |
- : public BluetoothGattService { |
+ : public BluetoothRemoteGattService { |
public: |
BluetoothRemoteGattServiceWin( |
BluetoothDeviceWin* device, |
@@ -36,18 +36,20 @@ class DEVICE_BLUETOOTH_EXPORT BluetoothRemoteGattServiceWin |
scoped_refptr<base::SequencedTaskRunner>& ui_task_runner); |
~BluetoothRemoteGattServiceWin() override; |
- // Override BluetoothGattService interfaces. |
+ // Override BluetoothRemoteGattService interfaces. |
std::string GetIdentifier() const override; |
BluetoothUUID GetUUID() const override; |
bool IsLocal() const override; |
bool IsPrimary() const override; |
BluetoothDevice* GetDevice() const override; |
- std::vector<BluetoothGattCharacteristic*> GetCharacteristics() const override; |
- std::vector<BluetoothGattService*> GetIncludedServices() const override; |
- BluetoothGattCharacteristic* GetCharacteristic( |
+ std::vector<BluetoothRemoteGattCharacteristic*> GetCharacteristics() |
+ const override; |
+ std::vector<BluetoothRemoteGattService*> GetIncludedServices() const override; |
+ BluetoothRemoteGattCharacteristic* GetCharacteristic( |
const std::string& identifier) const override; |
- bool AddCharacteristic(BluetoothGattCharacteristic* characteristic) override; |
- bool AddIncludedService(BluetoothGattService* service) override; |
+ bool AddCharacteristic( |
+ BluetoothRemoteGattCharacteristic* characteristic) override; |
+ bool AddIncludedService(BluetoothRemoteGattService* service) override; |
void Register(const base::Closure& callback, |
const ErrorCallback& error_callback) override; |
void Unregister(const base::Closure& callback, |