| Index: device/bluetooth/dbus/bluetooth_adapter_client.h
|
| diff --git a/chromeos/dbus/bluetooth_adapter_client.h b/device/bluetooth/dbus/bluetooth_adapter_client.h
|
| similarity index 94%
|
| rename from chromeos/dbus/bluetooth_adapter_client.h
|
| rename to device/bluetooth/dbus/bluetooth_adapter_client.h
|
| index 4530127744eef01905fd8da87edd092260749088..b6a6cfa1bfc0cd07a30c1e1553777f1b22917d18 100644
|
| --- a/chromeos/dbus/bluetooth_adapter_client.h
|
| +++ b/device/bluetooth/dbus/bluetooth_adapter_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_ADAPTER_CLIENT_H_
|
| -#define CHROMEOS_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
|
| +#ifndef DEVICE_BLUETOOTH_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
|
| +#define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -12,15 +12,15 @@
|
| #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/dbus/bluez_dbus_client.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| // BluetoothAdapterClient is used to communicate with objects representing
|
| // local Bluetooth Adapters.
|
| -class CHROMEOS_EXPORT BluetoothAdapterClient : public DBusClient {
|
| +class CHROMEOS_EXPORT BluetoothAdapterClient : public BluezDBusClient {
|
| public:
|
| // A DiscoveryFilter represents a filter passed to the SetDiscoveryFilter
|
| // method.
|
| @@ -84,7 +84,7 @@ class CHROMEOS_EXPORT BluetoothAdapterClient : public DBusClient {
|
|
|
| // List of 128-bit UUIDs that represent the available local services.
|
| // Read-only.
|
| - dbus::Property<std::vector<std::string> > uuids;
|
| + dbus::Property<std::vector<std::string>> uuids;
|
|
|
| // Local Device ID information in Linux kernel modalias format. Read-only.
|
| dbus::Property<std::string> modalias;
|
| @@ -179,6 +179,6 @@ class CHROMEOS_EXPORT BluetoothAdapterClient : public DBusClient {
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterClient);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|
| -#endif // CHROMEOS_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
|
| +#endif // DEVICE_BLUETOOTH_DBUS_BLUETOOTH_ADAPTER_CLIENT_H_
|
|
|