| Index: device/bluetooth/dbus/bluetooth_agent_service_provider.h
|
| diff --git a/chromeos/dbus/bluetooth_agent_service_provider.h b/device/bluetooth/dbus/bluetooth_agent_service_provider.h
|
| similarity index 94%
|
| rename from chromeos/dbus/bluetooth_agent_service_provider.h
|
| rename to device/bluetooth/dbus/bluetooth_agent_service_provider.h
|
| index 411cc1dae982ef0f28faf610da343e51a9a36d47..e31ef8f9a67647b8155d7ce49454f7878ee40671 100644
|
| --- a/chromeos/dbus/bluetooth_agent_service_provider.h
|
| +++ b/device/bluetooth/dbus/bluetooth_agent_service_provider.h
|
| @@ -2,18 +2,18 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROMEOS_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
|
| -#define CHROMEOS_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
|
| +#ifndef DEVICE_BLUETOOTH_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
|
| +#define DEVICE_BLUETOOTH_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
|
|
|
| #include <string>
|
|
|
| #include "base/basictypes.h"
|
| #include "base/callback.h"
|
| -#include "chromeos/chromeos_export.h"
|
| #include "dbus/bus.h"
|
| #include "dbus/object_path.h"
|
| +#include "device/bluetooth/bluetooth_export.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| // BluetoothAgentServiceProvider is used to provide a D-Bus object that
|
| // the bluetooth daemon can communicate with during a remote device pairing
|
| @@ -28,7 +28,7 @@ namespace chromeos {
|
| // make calls to this agent 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 BluetoothAgentServiceProvider {
|
| +class DEVICE_BLUETOOTH_EXPORT BluetoothAgentServiceProvider {
|
| public:
|
| // Interface for reacting to agent requests.
|
| class Delegate {
|
| @@ -40,11 +40,7 @@ class CHROMEOS_EXPORT BluetoothAgentServiceProvider {
|
| // granted; rejected indicates the user rejected the request or denied
|
| // permission; cancelled indicates the user cancelled the request
|
| // without confirming either way.
|
| - enum Status {
|
| - SUCCESS,
|
| - REJECTED,
|
| - CANCELLED
|
| - };
|
| + enum Status { SUCCESS, REJECTED, CANCELLED };
|
|
|
| // The PinCodeCallback is used for the RequestPinCode() method, it should
|
| // be called with two arguments, the |status| of the request (success,
|
| @@ -117,7 +113,8 @@ class CHROMEOS_EXPORT BluetoothAgentServiceProvider {
|
| // As the user enters the passkey onto the device, |entered| will be
|
| // updated to reflect the number of digits entered so far.
|
| virtual void DisplayPasskey(const dbus::ObjectPath& device_path,
|
| - uint32 passkey, uint16 entered) = 0;
|
| + uint32 passkey,
|
| + uint16 entered) = 0;
|
|
|
| // This method will be called when the Bluetooth daemon requires that the
|
| // user confirm that the Passkey |passkey| is displayed on the screen
|
| @@ -176,6 +173,6 @@ class CHROMEOS_EXPORT BluetoothAgentServiceProvider {
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothAgentServiceProvider);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|
| -#endif // CHROMEOS_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
|
| +#endif // DEVICE_BLUETOOTH_DBUS_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
|
|
|