| Index: device/bluetooth/bluez/bluetooth_local_gatt_characteristic_bluez.cc
|
| diff --git a/device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.cc b/device/bluetooth/bluez/bluetooth_local_gatt_characteristic_bluez.cc
|
| similarity index 25%
|
| copy from device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.cc
|
| copy to device/bluetooth/bluez/bluetooth_local_gatt_characteristic_bluez.cc
|
| index 5b8b5731281bca5e699daac67d30181d892d45c0..95d5cd50be372ed426292b54c12f3cbe759e096b 100644
|
| --- a/device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.cc
|
| +++ b/device/bluetooth/bluez/bluetooth_local_gatt_characteristic_bluez.cc
|
| @@ -2,25 +2,24 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "device/bluetooth/dbus/dbus_bluez_manager_wrapper_linux.h"
|
| +#include "device/bluetooth/bluez/bluetooth_local_gatt_characteristic_bluez.h"
|
|
|
| -#include "device/bluetooth/dbus/bluez_dbus_manager.h"
|
| -#include "device/bluetooth/dbus/dbus_thread_manager_linux.h"
|
| +#include <string>
|
| +
|
| +#include "base/logging.h"
|
| +#include "device/bluetooth/bluez/bluetooth_local_gatt_service_bluez.h"
|
|
|
| namespace bluez {
|
|
|
| -// static
|
| -void DBusBluezManagerWrapperLinux::Initialize() {
|
| - DBusThreadManagerLinux::Initialize();
|
| - BluezDBusManager::Initialize(
|
| - bluez::DBusThreadManagerLinux::Get()->GetSystemBus(),
|
| - false /* use_dbus_stub */);
|
| +BluetoothLocalGattCharacteristicBlueZ::BluetoothLocalGattCharacteristicBlueZ(
|
| + BluetoothLocalGattServiceBlueZ* service,
|
| + const dbus::ObjectPath& object_path)
|
| + : BluetoothGattCharacteristicBlueZ(object_path), weak_ptr_factory_(this) {
|
| + VLOG(1) << "Creating local GATT characteristic with identifier: "
|
| + << GetIdentifier();
|
| }
|
|
|
| -// static
|
| -void DBusBluezManagerWrapperLinux::Shutdown() {
|
| - bluez::BluezDBusManager::Shutdown();
|
| - bluez::DBusThreadManagerLinux::Shutdown();
|
| -}
|
| +BluetoothLocalGattCharacteristicBlueZ::
|
| + ~BluetoothLocalGattCharacteristicBlueZ() {}
|
|
|
| } // namespace bluez
|
|
|