| Index: device/bluetooth/dbus/bluetooth_profile_manager_client.h
|
| diff --git a/chromeos/dbus/bluetooth_profile_manager_client.h b/device/bluetooth/dbus/bluetooth_profile_manager_client.h
|
| similarity index 88%
|
| rename from chromeos/dbus/bluetooth_profile_manager_client.h
|
| rename to device/bluetooth/dbus/bluetooth_profile_manager_client.h
|
| index 2fa48f6fc658eb1a82ab21051722de819a3e4882..5f5ffc2f3e9c863461de16504d5d85c5467c5864 100644
|
| --- a/chromeos/dbus/bluetooth_profile_manager_client.h
|
| +++ b/device/bluetooth/dbus/bluetooth_profile_manager_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_PROFILE_MANAGER_CLIENT_H_
|
| -#define CHROMEOS_DBUS_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
|
| +#ifndef DEVICE_BLUETOOTH_DBUS_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
|
| +#define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -12,23 +12,19 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/values.h"
|
| #include "chromeos/chromeos_export.h"
|
| -#include "chromeos/dbus/dbus_client.h"
|
| #include "dbus/object_path.h"
|
| +#include "device/bluetooth/dbus/bluez_dbus_client.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| // BluetoothProfileManagerClient is used to communicate with the profile
|
| // manager object of the Bluetooth daemon.
|
| -class CHROMEOS_EXPORT BluetoothProfileManagerClient : public DBusClient {
|
| +class CHROMEOS_EXPORT BluetoothProfileManagerClient : public BluezDBusClient {
|
| public:
|
| // Species the role of the object within the profile. SYMMETRIC should be
|
| // usually used unless the profile requires you specify as a CLIENT or as a
|
| // SERVER.
|
| - enum ProfileRole {
|
| - SYMMETRIC,
|
| - CLIENT,
|
| - SERVER
|
| - };
|
| + enum ProfileRole { SYMMETRIC, CLIENT, SERVER };
|
|
|
| // Options used to register a Profile object.
|
| struct CHROMEOS_EXPORT Options {
|
| @@ -93,7 +89,6 @@ class CHROMEOS_EXPORT BluetoothProfileManagerClient : public DBusClient {
|
| const base::Closure& callback,
|
| const ErrorCallback& error_callback) = 0;
|
|
|
| -
|
| // Creates the instance.
|
| static BluetoothProfileManagerClient* Create();
|
|
|
| @@ -107,6 +102,6 @@ class CHROMEOS_EXPORT BluetoothProfileManagerClient : public DBusClient {
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothProfileManagerClient);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|
| -#endif // CHROMEOS_DBUS_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
|
| +#endif // DEVICE_BLUETOOTH_DBUS_BLUETOOTH_PROFILE_MANAGER_CLIENT_H_
|
|
|