| 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 97%
|
| rename from chrome/browser/chromeos/bluetooth/bluetooth_adapter_chromeos.cc
|
| rename to device/bluetooth/bluetooth_adapter_chromeos.cc
|
| index d71dae40d70f6740112a6e53d7921a6f0b8efd4b..36699e556843ed732046c26631f5f137f0b57736 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,14 +10,18 @@
|
| #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"
|
| +
|
| +using device::BluetoothAdapter;
|
| +using device::BluetoothDevice;
|
| +using device::BluetoothOutOfBandPairingData;
|
|
|
| namespace chromeos {
|
|
|
| @@ -127,7 +131,7 @@ const BluetoothDevice* BluetoothAdapterChromeOs::GetDevice(
|
| }
|
|
|
| void BluetoothAdapterChromeOs::ReadLocalOutOfBandPairingData(
|
| - const BluetoothOutOfBandPairingDataCallback& callback,
|
| + const BluetoothAdapter::BluetoothOutOfBandPairingDataCallback& callback,
|
| const ErrorCallback& error_callback) {
|
| DBusThreadManager::Get()->GetBluetoothOutOfBandClient()->
|
| ReadLocalData(object_path_,
|
| @@ -294,7 +298,7 @@ void BluetoothAdapterChromeOs::DiscoveringChanged(bool discovering) {
|
| }
|
|
|
| void BluetoothAdapterChromeOs::OnReadLocalData(
|
| - const BluetoothOutOfBandPairingDataCallback& callback,
|
| + const BluetoothAdapter::BluetoothOutOfBandPairingDataCallback& callback,
|
| const ErrorCallback& error_callback,
|
| const BluetoothOutOfBandPairingData& data,
|
| bool success) {
|
|
|