| Index: device/bluetooth/bluez/bluetooth_gatt_characteristic_bluez.cc
|
| diff --git a/device/bluetooth/bluetooth_gatt_characteristic_bluez.cc b/device/bluetooth/bluez/bluetooth_gatt_characteristic_bluez.cc
|
| similarity index 27%
|
| rename from device/bluetooth/bluetooth_gatt_characteristic_bluez.cc
|
| rename to device/bluetooth/bluez/bluetooth_gatt_characteristic_bluez.cc
|
| index 378fd9ddb8fa51d0555e17f68c8e04afd805805d..2051ef84eb3a7d2f1616609ee0ff74b6e3dee329 100644
|
| --- a/device/bluetooth/bluetooth_gatt_characteristic_bluez.cc
|
| +++ b/device/bluetooth/bluez/bluetooth_gatt_characteristic_bluez.cc
|
| @@ -2,17 +2,16 @@
|
| // 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_characteristic_bluez.h"
|
| +#include "device/bluetooth/bluez/bluetooth_gatt_characteristic_bluez.h"
|
|
|
| -#include "device/bluetooth/bluetooth_gatt_descriptor_bluez.h"
|
| -#include "device/bluetooth/bluetooth_gatt_service_bluez.h"
|
| +#include "device/bluetooth/bluez/bluetooth_gatt_descriptor_bluez.h"
|
| +#include "device/bluetooth/bluez/bluetooth_gatt_service_bluez.h"
|
|
|
| namespace bluez {
|
|
|
| BluetoothGattCharacteristicBlueZ::BluetoothGattCharacteristicBlueZ(
|
| - BluetoothGattServiceBlueZ* service,
|
| const dbus::ObjectPath& object_path)
|
| - : service_(service), object_path_(object_path), weak_ptr_factory_(this) {}
|
| + : object_path_(object_path), weak_ptr_factory_(this) {}
|
|
|
| BluetoothGattCharacteristicBlueZ::~BluetoothGattCharacteristicBlueZ() {}
|
|
|
| @@ -20,35 +19,4 @@ std::string BluetoothGattCharacteristicBlueZ::GetIdentifier() const {
|
| return object_path_.value();
|
| }
|
|
|
| -device::BluetoothGattService* BluetoothGattCharacteristicBlueZ::GetService()
|
| - const {
|
| - return service_;
|
| -}
|
| -
|
| -device::BluetoothGattCharacteristic::Permissions
|
| -BluetoothGattCharacteristicBlueZ::GetPermissions() const {
|
| - // TODO(armansito): Once BlueZ defines the permissions, return the correct
|
| - // values here.
|
| - return PERMISSION_NONE;
|
| -}
|
| -
|
| -std::vector<device::BluetoothGattDescriptor*>
|
| -BluetoothGattCharacteristicBlueZ::GetDescriptors() const {
|
| - std::vector<device::BluetoothGattDescriptor*> descriptors;
|
| - for (DescriptorMap::const_iterator iter = descriptors_.begin();
|
| - iter != descriptors_.end(); ++iter)
|
| - descriptors.push_back(iter->second);
|
| - return descriptors;
|
| -}
|
| -
|
| -device::BluetoothGattDescriptor*
|
| -BluetoothGattCharacteristicBlueZ::GetDescriptor(
|
| - const std::string& identifier) const {
|
| - DescriptorMap::const_iterator iter =
|
| - descriptors_.find(dbus::ObjectPath(identifier));
|
| - if (iter == descriptors_.end())
|
| - return nullptr;
|
| - return iter->second;
|
| -}
|
| -
|
| } // namespace bluez
|
|
|