| Index: device/bluetooth/bluetooth_adapter_chromeos.cc
|
| diff --git a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.cc b/device/bluetooth/bluetooth_adapter_chromeos.cc
|
| similarity index 98%
|
| rename from chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.cc
|
| rename to device/bluetooth/bluetooth_adapter_chromeos.cc
|
| index d71dae40d70f6740112a6e53d7921a6f0b8efd4b..740b7d17424ba280f9f104ced75d0d1c713fdd9b 100644
|
| --- a/chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.cc
|
| +++ b/device/bluetooth/bluetooth_adapter_chromeos.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.h"
|
| +#include "device/bluetooth/bluetooth_adapter_chromeos.h"
|
|
|
| #include <string>
|
|
|
| @@ -10,16 +10,20 @@
|
| #include "base/logging.h"
|
| #include "base/stl_util.h"
|
| #include "base/values.h"
|
| -#include "chrome/browser/chromeos/bluetooth/bluetooth_device_chromeos.h"
|
| #include "chromeos/dbus/bluetooth_adapter_client.h"
|
| #include "chromeos/dbus/bluetooth_device_client.h"
|
| #include "chromeos/dbus/bluetooth_manager_client.h"
|
| #include "chromeos/dbus/bluetooth_out_of_band_client.h"
|
| -#include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
|
| #include "chromeos/dbus/dbus_thread_manager.h"
|
| #include "dbus/object_path.h"
|
| +#include "device/bluetooth/bluetooth_device_chromeos.h"
|
| +#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
|
|
|
| -namespace chromeos {
|
| +using chromeos::BluetoothAdapterClient;
|
| +using chromeos::BluetoothDeviceClient;
|
| +using chromeos::DBusThreadManager;
|
| +
|
| +namespace bluetooth {
|
|
|
| BluetoothAdapterChromeOs::BluetoothAdapterChromeOs() : track_default_(false),
|
| powered_(false),
|
| @@ -532,4 +536,4 @@ void BluetoothAdapterChromeOs::DeviceDisappeared(
|
| }
|
| }
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluetooth
|
|
|