| Index: device/bluetooth/bluetooth_device_chromeos.h
|
| diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h b/device/bluetooth/bluetooth_device_chromeos.h
|
| similarity index 95%
|
| rename from chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h
|
| rename to device/bluetooth/bluetooth_device_chromeos.h
|
| index a4202c5dd348ae1eafb8e4c1ebb884d9244ca8ee..4b2d3b52e19ca308be0172ff8b2fa7a8980c2f5b 100644
|
| --- a/chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h
|
| +++ b/device/bluetooth/bluetooth_device_chromeos.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 CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
|
| -#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
|
| +#ifndef DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
|
| +#define DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
|
|
|
| #include <string>
|
| #include <vector>
|
| @@ -13,23 +13,29 @@
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/string16.h"
|
| -#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
|
| #include "chromeos/dbus/bluetooth_agent_service_provider.h"
|
| #include "chromeos/dbus/bluetooth_device_client.h"
|
| #include "dbus/object_path.h"
|
| +#include "device/bluetooth/bluetooth_device.h"
|
|
|
| -namespace chromeos {
|
| +namespace device {
|
|
|
| -class BluetoothAdapterChromeOs;
|
| class BluetoothServiceRecord;
|
| -
|
| +class MockBluetoothDevice;
|
| struct BluetoothOutOfBandPairingData;
|
|
|
| +} // namespace device
|
| +
|
| +namespace chromeos {
|
| +
|
| +class BluetoothAdapterChromeOs;
|
| +
|
| // The BluetoothDeviceChromeOs class is an implementation of BluetoothDevice
|
| // for Chrome OS platform.
|
| -class BluetoothDeviceChromeOs : public BluetoothDevice,
|
| - public BluetoothDeviceClient::Observer,
|
| - public BluetoothAgentServiceProvider::Delegate {
|
| +class BluetoothDeviceChromeOs
|
| + : public device::BluetoothDevice,
|
| + public BluetoothDeviceClient::Observer,
|
| + public BluetoothAgentServiceProvider::Delegate {
|
| public:
|
| virtual ~BluetoothDeviceChromeOs();
|
|
|
| @@ -47,7 +53,7 @@ class BluetoothDeviceChromeOs : public BluetoothDevice,
|
| virtual bool ExpectingPasskey() const OVERRIDE;
|
| virtual bool ExpectingConfirmation() const OVERRIDE;
|
| virtual void Connect(
|
| - BluetoothDevice::PairingDelegate* pairing_delegate,
|
| + device::BluetoothDevice::PairingDelegate* pairing_delegate,
|
| const base::Closure& callback,
|
| const ErrorCallback& error_callback) OVERRIDE;
|
| virtual void SetPinCode(const std::string& pincode) OVERRIDE;
|
| @@ -63,7 +69,7 @@ class BluetoothDeviceChromeOs : public BluetoothDevice,
|
| const std::string& service_uuid,
|
| const SocketCallback& callback) OVERRIDE;
|
| virtual void SetOutOfBandPairingData(
|
| - const chromeos::BluetoothOutOfBandPairingData& data,
|
| + const device::BluetoothOutOfBandPairingData& data,
|
| const base::Closure& callback,
|
| const ErrorCallback& error_callback) OVERRIDE;
|
| virtual void ClearOutOfBandPairingData(
|
| @@ -72,7 +78,7 @@ class BluetoothDeviceChromeOs : public BluetoothDevice,
|
|
|
| private:
|
| friend class BluetoothAdapterChromeOs;
|
| - friend class MockBluetoothDevice;
|
| + friend class device::MockBluetoothDevice;
|
|
|
| explicit BluetoothDeviceChromeOs(BluetoothAdapterChromeOs* adapter);
|
|
|
| @@ -341,7 +347,7 @@ class BluetoothDeviceChromeOs : public BluetoothDevice,
|
| // During pairing this is set to an object that we don't own, but on which
|
| // we can make method calls to request, display or confirm PIN Codes and
|
| // Passkeys. Generally it is the object that owns this one.
|
| - BluetoothDevice::PairingDelegate* pairing_delegate_;
|
| + device::BluetoothDevice::PairingDelegate* pairing_delegate_;
|
|
|
| // During pairing this is set to an instance of a D-Bus agent object
|
| // intialized with our own class as its delegate.
|
| @@ -366,4 +372,4 @@ class BluetoothDeviceChromeOs : public BluetoothDevice,
|
|
|
| } // namespace chromeos
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
|
| +#endif // DEVICE_BLUETOOTH_BLUETOOTH_DEVICE_CHROMEOS_H_
|
|
|