| Index: device/bluetooth/dbus/bluetooth_gatt_service_client.h
|
| diff --git a/chromeos/dbus/bluetooth_gatt_service_client.h b/device/bluetooth/dbus/bluetooth_gatt_service_client.h
|
| similarity index 83%
|
| rename from chromeos/dbus/bluetooth_gatt_service_client.h
|
| rename to device/bluetooth/dbus/bluetooth_gatt_service_client.h
|
| index 080ca8f4b07abdf01aec07e1d46449095c8c8879..5828c507def88a0e3a873c52e23a7169cba34f48 100644
|
| --- a/chromeos/dbus/bluetooth_gatt_service_client.h
|
| +++ b/device/bluetooth/dbus/bluetooth_gatt_service_client.h
|
| @@ -2,22 +2,23 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROMEOS_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_
|
| -#define CHROMEOS_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_
|
| +#ifndef DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_
|
| +#define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_
|
|
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "chromeos/chromeos_export.h"
|
| -#include "chromeos/dbus/dbus_client.h"
|
| #include "dbus/object_path.h"
|
| #include "dbus/property.h"
|
| +#include "device/bluetooth/bluetooth_export.h"
|
| +#include "device/bluetooth/dbus/bluez_dbus_client.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| // BluetoothGattServiceClient is used to communicate with remote GATT service
|
| // objects exposed by the Bluetooth daemon.
|
| -class CHROMEOS_EXPORT BluetoothGattServiceClient : public DBusClient {
|
| +class DEVICE_BLUETOOTH_EXPORT BluetoothGattServiceClient
|
| + : public BluezDBusClient {
|
| public:
|
| // Structure of properties associated with GATT services.
|
| struct Properties : public dbus::PropertySet {
|
| @@ -32,11 +33,11 @@ class CHROMEOS_EXPORT BluetoothGattServiceClient : public DBusClient {
|
|
|
| // Array of object paths representing the characteristics of this service.
|
| // [read-only]
|
| - dbus::Property<std::vector<dbus::ObjectPath> > characteristics;
|
| + dbus::Property<std::vector<dbus::ObjectPath>> characteristics;
|
|
|
| // Array of object paths representing the included services of this service.
|
| // [read-only]
|
| - dbus::Property<std::vector<dbus::ObjectPath> > includes;
|
| + dbus::Property<std::vector<dbus::ObjectPath>> includes;
|
|
|
| Properties(dbus::ObjectProxy* object_proxy,
|
| const std::string& interface_name,
|
| @@ -88,6 +89,6 @@ class CHROMEOS_EXPORT BluetoothGattServiceClient : public DBusClient {
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothGattServiceClient);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|
| -#endif // CHROMEOS_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_
|
| +#endif // DEVICE_BLUETOOTH_DBUS_BLUETOOTH_GATT_SERVICE_CLIENT_H_
|
|
|