| Index: device/bluetooth/dbus/bluetooth_device_client.h
|
| diff --git a/chromeos/dbus/bluetooth_device_client.h b/device/bluetooth/dbus/bluetooth_device_client.h
|
| similarity index 94%
|
| rename from chromeos/dbus/bluetooth_device_client.h
|
| rename to device/bluetooth/dbus/bluetooth_device_client.h
|
| index 4a0d6b4a1d0e26ae8d7fa60ca954e6f114e103b7..b0991dcad5e435e79d2a1335c2f62703e27ee022 100644
|
| --- a/chromeos/dbus/bluetooth_device_client.h
|
| +++ b/device/bluetooth/dbus/bluetooth_device_client.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 CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
|
| -#define CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
|
| +#ifndef DEVICE_BLUETOOTH_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
|
| +#define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -11,16 +11,16 @@
|
| #include "base/callback.h"
|
| #include "base/observer_list.h"
|
| #include "base/values.h"
|
| -#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 {
|
|
|
| // BluetoothDeviceClient is used to communicate with objects representing
|
| // remote Bluetooth Devices.
|
| -class CHROMEOS_EXPORT BluetoothDeviceClient : public DBusClient {
|
| +class DEVICE_BLUETOOTH_EXPORT BluetoothDeviceClient : public BluezDBusClient {
|
| public:
|
| // Structure of properties associated with bluetooth devices.
|
| struct Properties : public dbus::PropertySet {
|
| @@ -46,7 +46,7 @@ class CHROMEOS_EXPORT BluetoothDeviceClient : public DBusClient {
|
|
|
| // List of 128-bit UUIDs that represent the available remote services.
|
| // Read-only.
|
| - dbus::Property<std::vector<std::string> > uuids;
|
| + dbus::Property<std::vector<std::string>> uuids;
|
|
|
| // Transmitted power level. This field is avaliable only for LE devices
|
| // that include this field in AD. Read-only.
|
| @@ -201,6 +201,6 @@ class CHROMEOS_EXPORT BluetoothDeviceClient : public DBusClient {
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothDeviceClient);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|
| -#endif // CHROMEOS_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
|
| +#endif // DEVICE_BLUETOOTH_DBUS_BLUETOOTH_DEVICE_CLIENT_H_
|
|
|