| Index: device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h
|
| diff --git a/device/bluetooth/bluetooth_local_gatt_service_bluez.h b/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h
|
| similarity index 67%
|
| rename from device/bluetooth/bluetooth_local_gatt_service_bluez.h
|
| rename to device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h
|
| index ad2523aa4d0a1f142fd30ffe50acae21908d4b12..4f5b6718be8c5f8e861fb7a776ad631f2e115a2e 100644
|
| --- a/device/bluetooth/bluetooth_local_gatt_service_bluez.h
|
| +++ b/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h
|
| @@ -2,8 +2,8 @@
|
| // 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_SERVICE_BLUEZ_H_
|
| -#define DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_SERVICE_BLUEZ_H_
|
| +#ifndef DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_LOCAL_GATT_SERVICE_BLUEZ_H_
|
| +#define DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_LOCAL_GATT_SERVICE_BLUEZ_H_
|
|
|
| #include <string>
|
|
|
| @@ -11,14 +11,13 @@
|
| #include "base/macros.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "dbus/object_path.h"
|
| -#include "device/bluetooth/bluetooth_gatt_service_bluez.h"
|
| -#include "device/bluetooth/bluetooth_uuid.h"
|
| +#include "device/bluetooth/bluetooth_local_gatt_service.h"
|
| +#include "device/bluetooth/bluez/bluetooth_gatt_service_bluez.h"
|
|
|
| namespace device {
|
|
|
| class BluetoothAdapter;
|
| class BluetoothDevice;
|
| -class BluetoothGattCharacteristic;
|
|
|
| } // namespace device
|
|
|
| @@ -29,16 +28,11 @@ class BluetoothDeviceBlueZ;
|
|
|
| // The BluetoothLocalGattServiceBlueZ class implements BluetootGattService
|
| // for local GATT services for platforms that use BlueZ.
|
| -class BluetoothLocalGattServiceBlueZ : public BluetoothGattServiceBlueZ {
|
| +class BluetoothLocalGattServiceBlueZ
|
| + : public BluetoothGattServiceBlueZ,
|
| + public device::BluetoothLocalGattService {
|
| public:
|
| - // device::BluetoothGattService overrides.
|
| - device::BluetoothUUID GetUUID() const override;
|
| - bool IsLocal() const override;
|
| - bool IsPrimary() const override;
|
| - device::BluetoothDevice* GetDevice() const override;
|
| - bool AddCharacteristic(
|
| - device::BluetoothGattCharacteristic* characteristic) override;
|
| - bool AddIncludedService(device::BluetoothGattService* service) override;
|
| + // device::BluetoothLocalGattService overrides.
|
| void Register(const base::Closure& callback,
|
| const ErrorCallback& error_callback) override;
|
| void Unregister(const base::Closure& callback,
|
| @@ -66,4 +60,4 @@ class BluetoothLocalGattServiceBlueZ : public BluetoothGattServiceBlueZ {
|
|
|
| } // namespace bluez
|
|
|
| -#endif // DEVICE_BLUETOOTH_BLUETOOTH_LOCAL_GATT_SERVICE_BLUEZ_H_
|
| +#endif // DEVICE_BLUETOOTH_BLUEZ_BLUETOOTH_LOCAL_GATT_SERVICE_BLUEZ_H_
|
|
|