Index: device/bluetooth/dbus/bluetooth_input_client.cc |
diff --git a/chromeos/dbus/bluetooth_input_client.cc b/device/bluetooth/dbus/bluetooth_input_client.cc |
similarity index 83% |
rename from chromeos/dbus/bluetooth_input_client.cc |
rename to device/bluetooth/dbus/bluetooth_input_client.cc |
index 61ff6ed5476ce7392e6797b09e4d8ca850eb5e23..42542a8063a6a6db13fe3d331160f3c7b765bb48 100644 |
--- a/chromeos/dbus/bluetooth_input_client.cc |
+++ b/device/bluetooth/dbus/bluetooth_input_client.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 "chromeos/dbus/bluetooth_input_client.h" |
+#include "device/bluetooth/dbus/bluetooth_input_client.h" |
#include <map> |
@@ -14,7 +14,7 @@ |
#include "dbus/object_proxy.h" |
#include "third_party/cros_system_api/dbus/service_constants.h" |
-namespace chromeos { |
+namespace bluez { |
BluetoothInputClient::Properties::Properties( |
dbus::ObjectProxy* object_proxy, |
@@ -24,14 +24,11 @@ BluetoothInputClient::Properties::Properties( |
RegisterProperty(bluetooth_input::kReconnectModeProperty, &reconnect_mode); |
} |
-BluetoothInputClient::Properties::~Properties() { |
-} |
- |
+BluetoothInputClient::Properties::~Properties() {} |
// The BluetoothInputClient implementation used in production. |
-class BluetoothInputClientImpl |
- : public BluetoothInputClient, |
- public dbus::ObjectManager::Interface { |
+class BluetoothInputClientImpl : public BluetoothInputClient, |
+ public dbus::ObjectManager::Interface { |
public: |
BluetoothInputClientImpl() : object_manager_(NULL), weak_ptr_factory_(this) {} |
@@ -57,21 +54,17 @@ class BluetoothInputClientImpl |
dbus::ObjectProxy* object_proxy, |
const dbus::ObjectPath& object_path, |
const std::string& interface_name) override { |
- Properties* properties = new Properties( |
- object_proxy, |
- interface_name, |
- base::Bind(&BluetoothInputClientImpl::OnPropertyChanged, |
- weak_ptr_factory_.GetWeakPtr(), |
- object_path)); |
+ Properties* properties = |
+ new Properties(object_proxy, interface_name, |
+ base::Bind(&BluetoothInputClientImpl::OnPropertyChanged, |
+ weak_ptr_factory_.GetWeakPtr(), object_path)); |
return static_cast<dbus::PropertySet*>(properties); |
} |
// BluetoothInputClient override. |
Properties* GetProperties(const dbus::ObjectPath& object_path) override { |
- return static_cast<Properties*>( |
- object_manager_->GetProperties( |
- object_path, |
- bluetooth_input::kBluetoothInputInterface)); |
+ return static_cast<Properties*>(object_manager_->GetProperties( |
+ object_path, bluetooth_input::kBluetoothInputInterface)); |
} |
protected: |
@@ -124,14 +117,12 @@ class BluetoothInputClientImpl |
DISALLOW_COPY_AND_ASSIGN(BluetoothInputClientImpl); |
}; |
-BluetoothInputClient::BluetoothInputClient() { |
-} |
+BluetoothInputClient::BluetoothInputClient() {} |
-BluetoothInputClient::~BluetoothInputClient() { |
-} |
+BluetoothInputClient::~BluetoothInputClient() {} |
BluetoothInputClient* BluetoothInputClient::Create() { |
return new BluetoothInputClientImpl(); |
} |
-} // namespace chromeos |
+} // namespace bluez |