| Index: device/bluetooth/dbus/fake_bluetooth_agent_service_provider.h
|
| diff --git a/chromeos/dbus/fake_bluetooth_agent_service_provider.h b/device/bluetooth/dbus/fake_bluetooth_agent_service_provider.h
|
| similarity index 83%
|
| rename from chromeos/dbus/fake_bluetooth_agent_service_provider.h
|
| rename to device/bluetooth/dbus/fake_bluetooth_agent_service_provider.h
|
| index 9de89bf1a22ba73f968ff6b765bfa56879a80634..c6bb45468529ec6be5cfcd4f85dcda813e7e9fbf 100644
|
| --- a/chromeos/dbus/fake_bluetooth_agent_service_provider.h
|
| +++ b/device/bluetooth/dbus/fake_bluetooth_agent_service_provider.h
|
| @@ -9,11 +9,11 @@
|
| #include "base/callback.h"
|
| #include "base/observer_list.h"
|
| #include "chromeos/chromeos_export.h"
|
| -#include "chromeos/dbus/bluetooth_agent_service_provider.h"
|
| #include "dbus/object_path.h"
|
| #include "dbus/property.h"
|
| +#include "device/bluetooth/dbus/bluetooth_agent_service_provider.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| class FakeBluetoothAgentManagerClient;
|
|
|
| @@ -24,7 +24,7 @@ class CHROMEOS_EXPORT FakeBluetoothAgentServiceProvider
|
| : public BluetoothAgentServiceProvider {
|
| public:
|
| FakeBluetoothAgentServiceProvider(const dbus::ObjectPath& object_path,
|
| - Delegate *delegate);
|
| + Delegate* delegate);
|
| ~FakeBluetoothAgentServiceProvider() override;
|
|
|
| // Each of these calls the equivalent BluetoothAgentServiceProvider::Delegate
|
| @@ -37,7 +37,8 @@ class CHROMEOS_EXPORT FakeBluetoothAgentServiceProvider
|
| virtual void RequestPasskey(const dbus::ObjectPath& device_path,
|
| const Delegate::PasskeyCallback& callback);
|
| virtual void DisplayPasskey(const dbus::ObjectPath& device_path,
|
| - uint32 passkey, int16 entered);
|
| + uint32 passkey,
|
| + int16 entered);
|
| virtual void RequestConfirmation(
|
| const dbus::ObjectPath& device_path,
|
| uint32 passkey,
|
| @@ -45,10 +46,9 @@ class CHROMEOS_EXPORT FakeBluetoothAgentServiceProvider
|
| virtual void RequestAuthorization(
|
| const dbus::ObjectPath& device_path,
|
| const Delegate::ConfirmationCallback& callback);
|
| - virtual void AuthorizeService(
|
| - const dbus::ObjectPath& device_path,
|
| - const std::string& uuid,
|
| - const Delegate::ConfirmationCallback& callback);
|
| + virtual void AuthorizeService(const dbus::ObjectPath& device_path,
|
| + const std::string& uuid,
|
| + const Delegate::ConfirmationCallback& callback);
|
| virtual void Cancel();
|
|
|
| private:
|
| @@ -63,6 +63,6 @@ class CHROMEOS_EXPORT FakeBluetoothAgentServiceProvider
|
| Delegate* delegate_;
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|
| #endif // CHROMEOS_DBUS_FAKE_BLUETOOTH_AGENT_SERVICE_PROVIDER_H_
|
|
|