| Index: device/bluetooth/dbus/fake_bluetooth_input_client.cc
|
| diff --git a/chromeos/dbus/fake_bluetooth_input_client.cc b/device/bluetooth/dbus/fake_bluetooth_input_client.cc
|
| similarity index 82%
|
| rename from chromeos/dbus/fake_bluetooth_input_client.cc
|
| rename to device/bluetooth/dbus/fake_bluetooth_input_client.cc
|
| index d32bbefe0d74805fdc46d7bbf40421d99818d22b..849c3bee537ea5c32ad753b1fea71c0bc9cc1a76 100644
|
| --- a/chromeos/dbus/fake_bluetooth_input_client.cc
|
| +++ b/device/bluetooth/dbus/fake_bluetooth_input_client.cc
|
| @@ -2,31 +2,29 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chromeos/dbus/fake_bluetooth_input_client.h"
|
| +#include "device/bluetooth/dbus/fake_bluetooth_input_client.h"
|
|
|
| #include <map>
|
|
|
| #include "base/logging.h"
|
| #include "base/stl_util.h"
|
| -#include "chromeos/dbus/fake_bluetooth_device_client.h"
|
| #include "dbus/bus.h"
|
| #include "dbus/message.h"
|
| #include "dbus/object_manager.h"
|
| #include "dbus/object_proxy.h"
|
| +#include "device/bluetooth/dbus/fake_bluetooth_device_client.h"
|
| #include "third_party/cros_system_api/dbus/service_constants.h"
|
|
|
| -namespace chromeos {
|
| +namespace bluez {
|
|
|
| FakeBluetoothInputClient::Properties::Properties(
|
| const PropertyChangedCallback& callback)
|
| : BluetoothInputClient::Properties(
|
| NULL,
|
| bluetooth_input::kBluetoothInputInterface,
|
| - callback) {
|
| -}
|
| + callback) {}
|
|
|
| -FakeBluetoothInputClient::Properties::~Properties() {
|
| -}
|
| +FakeBluetoothInputClient::Properties::~Properties() {}
|
|
|
| void FakeBluetoothInputClient::Properties::Get(
|
| dbus::PropertyBase* property,
|
| @@ -40,23 +38,20 @@ void FakeBluetoothInputClient::Properties::GetAll() {
|
| }
|
|
|
| void FakeBluetoothInputClient::Properties::Set(
|
| - dbus::PropertyBase *property,
|
| + dbus::PropertyBase* property,
|
| dbus::PropertySet::SetCallback callback) {
|
| VLOG(1) << "Set " << property->name();
|
| callback.Run(false);
|
| }
|
|
|
| -
|
| -FakeBluetoothInputClient::FakeBluetoothInputClient() {
|
| -}
|
| +FakeBluetoothInputClient::FakeBluetoothInputClient() {}
|
|
|
| FakeBluetoothInputClient::~FakeBluetoothInputClient() {
|
| // Clean up Properties structures
|
| STLDeleteValues(&properties_map_);
|
| }
|
|
|
| -void FakeBluetoothInputClient::Init(dbus::Bus* bus) {
|
| -}
|
| +void FakeBluetoothInputClient::Init(dbus::Bus* bus) {}
|
|
|
| void FakeBluetoothInputClient::AddObserver(Observer* observer) {
|
| observers_.AddObserver(observer);
|
| @@ -66,8 +61,8 @@ void FakeBluetoothInputClient::RemoveObserver(Observer* observer) {
|
| observers_.RemoveObserver(observer);
|
| }
|
|
|
| -FakeBluetoothInputClient::Properties*
|
| -FakeBluetoothInputClient::GetProperties(const dbus::ObjectPath& object_path) {
|
| +FakeBluetoothInputClient::Properties* FakeBluetoothInputClient::GetProperties(
|
| + const dbus::ObjectPath& object_path) {
|
| PropertiesMap::iterator iter = properties_map_.find(object_path);
|
| if (iter != properties_map_.end())
|
| return iter->second;
|
| @@ -79,10 +74,9 @@ void FakeBluetoothInputClient::AddInputDevice(
|
| if (properties_map_.find(object_path) != properties_map_.end())
|
| return;
|
|
|
| - Properties* properties = new Properties(base::Bind(
|
| - &FakeBluetoothInputClient::OnPropertyChanged,
|
| - base::Unretained(this),
|
| - object_path));
|
| + Properties* properties =
|
| + new Properties(base::Bind(&FakeBluetoothInputClient::OnPropertyChanged,
|
| + base::Unretained(this), object_path));
|
|
|
| // The LegacyAutopair and DisplayPinCode devices represent a typical mouse
|
| // and keyboard respectively, so mark them as ReconnectMode "any". The
|
| @@ -126,4 +120,4 @@ void FakeBluetoothInputClient::OnPropertyChanged(
|
| InputPropertyChanged(object_path, property_name));
|
| }
|
|
|
| -} // namespace chromeos
|
| +} // namespace bluez
|
|
|