| Index: device/bluetooth/bluez/bluetooth_local_gatt_characteristic_bluez.h
|
| diff --git a/device/bluetooth/bluetooth_local_gatt_characteristic_bluez.h b/device/bluetooth/bluez/bluetooth_local_gatt_characteristic_bluez.h
|
| similarity index 39%
|
| rename from device/bluetooth/bluetooth_local_gatt_characteristic_bluez.h
|
| rename to device/bluetooth/bluez/bluetooth_local_gatt_characteristic_bluez.h
|
| index 386200d3b13ac87dbb86678838c76d1282befbc5..466d67debc8b44e2e42d5eccfbec7891d9435e6c 100644
|
| --- a/device/bluetooth/bluetooth_local_gatt_characteristic_bluez.h
|
| +++ b/device/bluetooth/bluez/bluetooth_local_gatt_characteristic_bluez.h
|
| @@ -2,53 +2,26 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_CHARACTERISTIC_BLUEZ_H_
|
| -#define DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_CHARACTERISTIC_BLUEZ_H_
|
| +#ifndef DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_LOCAL_GATT_CHARACTERISTIC_BLUEZ_H_
|
| +#define DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_LOCAL_GATT_CHARACTERISTIC_BLUEZ_H_
|
|
|
| -#include <stdint.h>
|
| -#include <vector>
|
| -
|
| -#include "base/callback_forward.h"
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "dbus/object_path.h"
|
| -#include "device/bluetooth/bluetooth_gatt_characteristic_bluez.h"
|
| -#include "device/bluetooth/bluetooth_uuid.h"
|
| -
|
| -namespace device {
|
| -
|
| -class BluetoothGattDescriptor;
|
| -class BluetoothGattService;
|
| -
|
| -} // namespace device
|
| +#include "device/bluetooth/bluetooth_local_gatt_characteristic.h"
|
| +#include "device/bluetooth/bluez/bluetooth_gatt_characteristic_bluez.h"
|
|
|
| namespace bluez {
|
|
|
| -class BluetoothLocalGattDescriptorBlueZ;
|
| class BluetoothLocalGattServiceBlueZ;
|
|
|
| // The BluetoothLocalGattCharacteristicBlueZ class implements
|
| -// BluetoothGattCharacteristic for remote GATT characteristics for platforms
|
| -// that use BlueZ.
|
| +// BluetoothLocalGattCharacteristic for local GATT characteristics for
|
| +// platforms that use BlueZ.
|
| class BluetoothLocalGattCharacteristicBlueZ
|
| - : public BluetoothGattCharacteristicBlueZ {
|
| + : public BluetoothGattCharacteristicBlueZ,
|
| + public device::BluetoothLocalGattCharacteristic {
|
| public:
|
| - // device::BluetoothGattCharacteristic overrides.
|
| - device::BluetoothUUID GetUUID() const override;
|
| - bool IsLocal() const override;
|
| - const std::vector<uint8_t>& GetValue() const override;
|
| - Properties GetProperties() const override;
|
| - bool IsNotifying() const override;
|
| - bool AddDescriptor(device::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,
|
| - const ErrorCallback& error_callback) override;
|
| - void WriteRemoteCharacteristic(const std::vector<uint8_t>& new_value,
|
| - const base::Closure& callback,
|
| - const ErrorCallback& error_callback) override;
|
| -
|
| private:
|
| friend class BluetoothLocalGattServiceBlueZ;
|
|
|
| @@ -65,4 +38,4 @@ class BluetoothLocalGattCharacteristicBlueZ
|
|
|
| } // namespace bluez
|
|
|
| -#endif // DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_CHARACTERISTIC_BLUEZ_H_
|
| +#endif // DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_LOCAL_GATT_CHARACTERISTIC_BLUEZ_H_
|
|
|