| Index: device/bluetooth/bluetooth_adapter_chromeos.h
|
| diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.h b/device/bluetooth/bluetooth_adapter_chromeos.h
|
| similarity index 93%
|
| rename from chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.h
|
| rename to device/bluetooth/bluetooth_adapter_chromeos.h
|
| index 2a0db654923426b15ac0758709fada03bd72233d..ddcaf4e8a8436b673bc441db643498decba92438 100644
|
| --- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.h
|
| +++ b/device/bluetooth/bluetooth_adapter_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_ADAPTER_CHROMEOS_H_
|
| -#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
|
| +#ifndef DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
|
| +#define DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
|
|
|
| #include <map>
|
| #include <string>
|
| @@ -12,13 +12,13 @@
|
| #include "base/basictypes.h"
|
| #include "base/callback.h"
|
| #include "base/observer_list.h"
|
| -#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
|
| #include "chromeos/dbus/bluetooth_adapter_client.h"
|
| #include "chromeos/dbus/bluetooth_device_client.h"
|
| #include "chromeos/dbus/bluetooth_manager_client.h"
|
| #include "dbus/object_path.h"
|
| +#include "device/bluetooth/bluetooth_adapter.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluetooth {
|
|
|
| class BluetoothDeviceChromeOs;
|
|
|
| @@ -26,10 +26,11 @@ struct BluetoothOutOfBandPairingData;
|
|
|
| // The BluetoothAdapterChromeOs class is an implementation of BluetoothAdapter
|
| // for Chrome OS platform.
|
| -class BluetoothAdapterChromeOs : public BluetoothAdapter,
|
| - public BluetoothManagerClient::Observer,
|
| - public BluetoothAdapterClient::Observer,
|
| - public BluetoothDeviceClient::Observer {
|
| +class BluetoothAdapterChromeOs
|
| + : public BluetoothAdapter,
|
| + public chromeos::BluetoothManagerClient::Observer,
|
| + public chromeos::BluetoothAdapterClient::Observer,
|
| + public chromeos::BluetoothDeviceClient::Observer {
|
| public:
|
| // BluetoothAdapter override
|
| virtual void AddObserver(BluetoothAdapter::Observer* observer) OVERRIDE;
|
| @@ -189,7 +190,7 @@ class BluetoothAdapterChromeOs : public BluetoothAdapter,
|
| virtual void DeviceFound(
|
| const dbus::ObjectPath& adapter_path,
|
| const std::string& address,
|
| - const BluetoothDeviceClient::Properties& properties) OVERRIDE;
|
| + const chromeos::BluetoothDeviceClient::Properties& properties) OVERRIDE;
|
|
|
| // BluetoothAdapterClient::Observer override.
|
| //
|
| @@ -227,6 +228,6 @@ class BluetoothAdapterChromeOs : public BluetoothAdapter,
|
| DISALLOW_COPY_AND_ASSIGN(BluetoothAdapterChromeOs);
|
| };
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluetooth
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
|
| +#endif // DEVICE_BLUETOOTH_BLUETOOTH_ADAPTER_CHROMEOS_H_
|
|
|