Index: device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.cc |
diff --git a/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.cc b/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.cc |
index 267b04713e9daabd73653ff0815f1d5dc30f8cdf..de8c4fcdfdfd66852229bfcaef5102aaf0325564 100644 |
--- a/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.cc |
+++ b/device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.cc |
@@ -2,9 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h" |
+#include <device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h> |
-#include "base/callback.h" |
#include "base/guid.h" |
#include "base/logging.h" |
#include "base/memory/ptr_util.h" |
@@ -24,12 +23,8 @@ BluetoothLocalGattServiceBlueZ::BluetoothLocalGattServiceBlueZ( |
is_primary_(is_primary), |
delegate_(delegate), |
weak_ptr_factory_(this) { |
- // TODO(rkc): Move this code in a common location. It is used by |
- // BluetoothAdvertisementBlueZ() also. |
- std::string GuidString = base::GenerateGUID(); |
- base::RemoveChars(GuidString, "-", &GuidString); |
- object_path_ = dbus::ObjectPath(adapter_->object_path().value() + |
- "/service/" + GuidString); |
+ // TODO(rkc): Get base application path from adapter and prefix it here. |
+ object_path_ = AddGuidToObjectPath("/service"); |
VLOG(1) << "Creating local GATT service with identifier: " |
<< object_path_.value(); |
} |
@@ -63,23 +58,33 @@ BluetoothLocalGattServiceBlueZ::Create( |
void BluetoothLocalGattServiceBlueZ::Register( |
const base::Closure& callback, |
const ErrorCallback& error_callback) { |
- // TODO(rkc): Call adapter_->RegisterGattService. |
+ // GetAdapter()->RegisterGattService(this, callback, error_callback); |
} |
void BluetoothLocalGattServiceBlueZ::Unregister( |
const base::Closure& callback, |
const ErrorCallback& error_callback) { |
- // TODO(rkc): Call adapter_->UnregisterGattService. |
+ DCHECK(GetAdapter()); |
+ // GetAdapter()->UnregisterGattService(this, callback, error_callback); |
+} |
+ |
+const std::vector<std::unique_ptr<BluetoothLocalGattCharacteristicBlueZ>>& |
+BluetoothLocalGattServiceBlueZ::GetCharacteristics() const { |
+ return characteristics_; |
+} |
+ |
+void BluetoothLocalGattServiceBlueZ::AddCharacteristic( |
+ std::unique_ptr<BluetoothLocalGattCharacteristicBlueZ> characteristic) { |
+ characteristics_.push_back(std::move(characteristic)); |
} |
-void BluetoothLocalGattServiceBlueZ::OnRegistrationError( |
- const ErrorCallback& error_callback, |
- const std::string& error_name, |
- const std::string& error_message) { |
- VLOG(1) << "[Un]Register Service failed: " << error_name |
- << ", message: " << error_message; |
- error_callback.Run( |
- BluetoothGattServiceBlueZ::DBusErrorToServiceError(error_name)); |
+// static |
+dbus::ObjectPath BluetoothLocalGattServiceBlueZ::AddGuidToObjectPath( |
+ const std::string& path) { |
+ std::string GuidString = base::GenerateGUID(); |
+ base::RemoveChars(GuidString, "-", &GuidString); |
+ |
+ return dbus::ObjectPath(path + GuidString); |
} |
} // namespace bluez |