Index: device/bluetooth/bluez/bluetooth_gatt_service_bluez.cc |
diff --git a/device/bluetooth/bluetooth_gatt_service_bluez.cc b/device/bluetooth/bluez/bluetooth_gatt_service_bluez.cc |
similarity index 65% |
rename from device/bluetooth/bluetooth_gatt_service_bluez.cc |
rename to device/bluetooth/bluez/bluetooth_gatt_service_bluez.cc |
index 64640af3efac98992b9e730c0bb08092492f69ea..5bb78125856a10e4143aba81c9e59c9adee69f0c 100644 |
--- a/device/bluetooth/bluetooth_gatt_service_bluez.cc |
+++ b/device/bluetooth/bluez/bluetooth_gatt_service_bluez.cc |
@@ -2,11 +2,10 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#include "device/bluetooth/bluetooth_gatt_service_bluez.h" |
+#include "device/bluetooth/bluez/bluetooth_gatt_service_bluez.h" |
#include "base/logging.h" |
-#include "device/bluetooth/bluetooth_adapter_bluez.h" |
-#include "device/bluetooth/bluetooth_gatt_characteristic_bluez.h" |
+#include "device/bluetooth/bluez/bluetooth_adapter_bluez.h" |
namespace bluez { |
@@ -32,36 +31,10 @@ BluetoothGattServiceBlueZ::BluetoothGattServiceBlueZ( |
BluetoothGattServiceBlueZ::~BluetoothGattServiceBlueZ() {} |
-std::vector<device::BluetoothGattCharacteristic*> |
-BluetoothGattServiceBlueZ::GetCharacteristics() const { |
- std::vector<device::BluetoothGattCharacteristic*> characteristics; |
- for (CharacteristicMap::const_iterator iter = characteristics_.begin(); |
- iter != characteristics_.end(); ++iter) { |
- characteristics.push_back(iter->second); |
- } |
- return characteristics; |
-} |
- |
std::string BluetoothGattServiceBlueZ::GetIdentifier() const { |
return object_path_.value(); |
} |
-std::vector<device::BluetoothGattService*> |
-BluetoothGattServiceBlueZ::GetIncludedServices() const { |
- // TODO(armansito): Return the actual included services here. |
- return std::vector<device::BluetoothGattService*>(); |
-} |
- |
-device::BluetoothGattCharacteristic* |
-BluetoothGattServiceBlueZ::GetCharacteristic( |
- const std::string& identifier) const { |
- CharacteristicMap::const_iterator iter = |
- characteristics_.find(dbus::ObjectPath(identifier)); |
- if (iter == characteristics_.end()) |
- return nullptr; |
- return iter->second; |
-} |
- |
// static |
device::BluetoothGattService::GattErrorCode |
BluetoothGattServiceBlueZ::DBusErrorToServiceError(std::string error_name) { |