OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "device/bluetooth/dbus/bluetooth_device_client.h" | 5 #include "device/bluetooth/dbus/bluetooth_device_client.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/logging.h" | 8 #include "base/logging.h" |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 RegisterProperty(bluetooth_device::kPairedProperty, &paired); | 42 RegisterProperty(bluetooth_device::kPairedProperty, &paired); |
43 RegisterProperty(bluetooth_device::kConnectedProperty, &connected); | 43 RegisterProperty(bluetooth_device::kConnectedProperty, &connected); |
44 RegisterProperty(bluetooth_device::kTrustedProperty, &trusted); | 44 RegisterProperty(bluetooth_device::kTrustedProperty, &trusted); |
45 RegisterProperty(bluetooth_device::kBlockedProperty, &blocked); | 45 RegisterProperty(bluetooth_device::kBlockedProperty, &blocked); |
46 RegisterProperty(bluetooth_device::kAliasProperty, &alias); | 46 RegisterProperty(bluetooth_device::kAliasProperty, &alias); |
47 RegisterProperty(bluetooth_device::kAdapterProperty, &adapter); | 47 RegisterProperty(bluetooth_device::kAdapterProperty, &adapter); |
48 RegisterProperty(bluetooth_device::kLegacyPairingProperty, &legacy_pairing); | 48 RegisterProperty(bluetooth_device::kLegacyPairingProperty, &legacy_pairing); |
49 RegisterProperty(bluetooth_device::kModaliasProperty, &modalias); | 49 RegisterProperty(bluetooth_device::kModaliasProperty, &modalias); |
50 RegisterProperty(bluetooth_device::kRSSIProperty, &rssi); | 50 RegisterProperty(bluetooth_device::kRSSIProperty, &rssi); |
51 RegisterProperty(bluetooth_device::kTxPowerProperty, &tx_power); | 51 RegisterProperty(bluetooth_device::kTxPowerProperty, &tx_power); |
52 RegisterProperty(bluetooth_device::kGattServicesProperty, &gatt_services); | 52 RegisterProperty(bluetooth_device::kServicesResolvedProperty, |
| 53 &services_resolved); |
53 } | 54 } |
54 | 55 |
55 BluetoothDeviceClient::Properties::~Properties() {} | 56 BluetoothDeviceClient::Properties::~Properties() {} |
56 | 57 |
57 // The BluetoothDeviceClient implementation used in production. | 58 // The BluetoothDeviceClient implementation used in production. |
58 class BluetoothDeviceClientImpl : public BluetoothDeviceClient, | 59 class BluetoothDeviceClientImpl : public BluetoothDeviceClient, |
59 public dbus::ObjectManager::Interface { | 60 public dbus::ObjectManager::Interface { |
60 public: | 61 public: |
61 BluetoothDeviceClientImpl() | 62 BluetoothDeviceClientImpl() |
62 : object_manager_(NULL), weak_ptr_factory_(this) {} | 63 : object_manager_(NULL), weak_ptr_factory_(this) {} |
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
371 | 372 |
372 BluetoothDeviceClient::BluetoothDeviceClient() {} | 373 BluetoothDeviceClient::BluetoothDeviceClient() {} |
373 | 374 |
374 BluetoothDeviceClient::~BluetoothDeviceClient() {} | 375 BluetoothDeviceClient::~BluetoothDeviceClient() {} |
375 | 376 |
376 BluetoothDeviceClient* BluetoothDeviceClient::Create() { | 377 BluetoothDeviceClient* BluetoothDeviceClient::Create() { |
377 return new BluetoothDeviceClientImpl(); | 378 return new BluetoothDeviceClientImpl(); |
378 } | 379 } |
379 | 380 |
380 } // namespace bluez | 381 } // namespace bluez |
OLD | NEW |