| Index: device/bluetooth/dbus/bluetooth_profile_service_provider.h
|
| diff --git a/chromeos/dbus/bluetooth_profile_service_provider.h b/device/bluetooth/dbus/bluetooth_profile_service_provider.h
|
| similarity index 91%
|
| rename from chromeos/dbus/bluetooth_profile_service_provider.h
|
| rename to device/bluetooth/dbus/bluetooth_profile_service_provider.h
|
| index de77b5ddeef985b78689aaa900b4d103eeff2a3a..f2db22c761504ceaf20b643828027897999026b8 100644
|
| --- a/chromeos/dbus/bluetooth_profile_service_provider.h
|
| +++ b/device/bluetooth/dbus/bluetooth_profile_service_provider.h
|
| @@ -2,20 +2,20 @@
|
| // 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_SERVICE_PROVIDER_H_
|
| -#define CHROMEOS_DBUS_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
|
| +#ifndef DEVICE_BLUETOOTH_DBUS_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
|
| +#define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
|
|
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/callback.h"
|
| #include "base/memory/scoped_ptr.h"
|
| -#include "chromeos/chromeos_export.h"
|
| #include "dbus/bus.h"
|
| #include "dbus/file_descriptor.h"
|
| #include "dbus/object_path.h"
|
| +#include "device/bluetooth/bluetooth_export.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| // BluetoothProfileServiceProvider is used to provide a D-Bus object that the
|
| // Bluetooth daemon can communicate with to connect application profiles.
|
| @@ -29,7 +29,7 @@ namespace chromeos {
|
| // Bluetooth daemon will make calls to this profile object and they will be
|
| // passed on to your Delegate object for handling. Responses should be returned
|
| // using the callbacks supplied to those methods.
|
| -class CHROMEOS_EXPORT BluetoothProfileServiceProvider {
|
| +class DEVICE_BLUETOOTH_EXPORT BluetoothProfileServiceProvider {
|
| public:
|
| // Interface for reacting to profile requests.
|
| class Delegate {
|
| @@ -40,14 +40,10 @@ class CHROMEOS_EXPORT BluetoothProfileServiceProvider {
|
| // connection or a requested disconnection. Success indicates acceptance,
|
| // reject indicates the user rejected or denied the request; cancelled
|
| // means the user cancelled the request without confirming either way.
|
| - enum Status {
|
| - SUCCESS,
|
| - REJECTED,
|
| - CANCELLED
|
| - };
|
| + enum Status { SUCCESS, REJECTED, CANCELLED };
|
|
|
| // Connection-specific options.
|
| - struct CHROMEOS_EXPORT Options {
|
| + struct DEVICE_BLUETOOTH_EXPORT Options {
|
| Options() {}
|
| ~Options() {}
|
|
|
| @@ -119,6 +115,6 @@ class CHROMEOS_EXPORT BluetoothProfileServiceProvider {
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothProfileServiceProvider);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|
| -#endif // CHROMEOS_DBUS_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
|
| +#endif // DEVICE_BLUETOOTH_DBUS_BLUETOOTH_PROFILE_SERVICE_PROVIDER_H_
|
|
|