Index: device/bluetooth/dbus/bluetooth_gatt_manager_client.cc |
diff --git a/chromeos/dbus/bluetooth_gatt_manager_client.cc b/device/bluetooth/dbus/bluetooth_gatt_manager_client.cc |
similarity index 91% |
rename from chromeos/dbus/bluetooth_gatt_manager_client.cc |
rename to device/bluetooth/dbus/bluetooth_gatt_manager_client.cc |
index 8ccbb69ebb4f274888b393c8610a3ce7f8b08db3..7e471a5c34ba9251a2eab5d025f5931d6a887173 100644 |
--- a/chromeos/dbus/bluetooth_gatt_manager_client.cc |
+++ b/device/bluetooth/dbus/bluetooth_gatt_manager_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_gatt_manager_client.h" |
+#include "device/bluetooth/dbus/bluetooth_gatt_manager_client.h" |
#include "base/bind.h" |
#include "base/memory/weak_ptr.h" |
@@ -11,7 +11,7 @@ |
#include "dbus/object_proxy.h" |
#include "third_party/cros_system_api/dbus/service_constants.h" |
-namespace chromeos { |
+namespace bluez { |
const char BluetoothGattManagerClient::kNoResponseError[] = |
"org.chromium.Error.NoResponse"; |
@@ -20,9 +20,7 @@ const char BluetoothGattManagerClient::kNoResponseError[] = |
class BluetoothGattManagerClientImpl : public BluetoothGattManagerClient { |
public: |
BluetoothGattManagerClientImpl() |
- : object_proxy_(NULL), |
- weak_ptr_factory_(this) { |
- } |
+ : object_proxy_(NULL), weak_ptr_factory_(this) {} |
~BluetoothGattManagerClientImpl() override {} |
@@ -47,8 +45,7 @@ class BluetoothGattManagerClientImpl : public BluetoothGattManagerClient { |
DCHECK(object_proxy_); |
object_proxy_->CallMethodWithErrorCallback( |
- &method_call, |
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
+ &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
base::Bind(&BluetoothGattManagerClientImpl::OnSuccess, |
weak_ptr_factory_.GetWeakPtr(), callback), |
base::Bind(&BluetoothGattManagerClientImpl::OnError, |
@@ -68,8 +65,7 @@ class BluetoothGattManagerClientImpl : public BluetoothGattManagerClient { |
DCHECK(object_proxy_); |
object_proxy_->CallMethodWithErrorCallback( |
- &method_call, |
- dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
+ &method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT, |
base::Bind(&BluetoothGattManagerClientImpl::OnSuccess, |
weak_ptr_factory_.GetWeakPtr(), callback), |
base::Bind(&BluetoothGattManagerClientImpl::OnError, |
@@ -121,15 +117,13 @@ class BluetoothGattManagerClientImpl : public BluetoothGattManagerClient { |
DISALLOW_COPY_AND_ASSIGN(BluetoothGattManagerClientImpl); |
}; |
-BluetoothGattManagerClient::BluetoothGattManagerClient() { |
-} |
+BluetoothGattManagerClient::BluetoothGattManagerClient() {} |
-BluetoothGattManagerClient::~BluetoothGattManagerClient() { |
-} |
+BluetoothGattManagerClient::~BluetoothGattManagerClient() {} |
// static |
BluetoothGattManagerClient* BluetoothGattManagerClient::Create() { |
return new BluetoothGattManagerClientImpl(); |
} |
-} // namespace chromeos |
+} // namespace bluez |