| 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 <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 RegisterProperty(bluetooth_device::kPairedProperty, &paired); | 195 RegisterProperty(bluetooth_device::kPairedProperty, &paired); |
| 196 RegisterProperty(bluetooth_device::kConnectedProperty, &connected); | 196 RegisterProperty(bluetooth_device::kConnectedProperty, &connected); |
| 197 RegisterProperty(bluetooth_device::kTrustedProperty, &trusted); | 197 RegisterProperty(bluetooth_device::kTrustedProperty, &trusted); |
| 198 RegisterProperty(bluetooth_device::kBlockedProperty, &blocked); | 198 RegisterProperty(bluetooth_device::kBlockedProperty, &blocked); |
| 199 RegisterProperty(bluetooth_device::kAliasProperty, &alias); | 199 RegisterProperty(bluetooth_device::kAliasProperty, &alias); |
| 200 RegisterProperty(bluetooth_device::kAdapterProperty, &adapter); | 200 RegisterProperty(bluetooth_device::kAdapterProperty, &adapter); |
| 201 RegisterProperty(bluetooth_device::kLegacyPairingProperty, &legacy_pairing); | 201 RegisterProperty(bluetooth_device::kLegacyPairingProperty, &legacy_pairing); |
| 202 RegisterProperty(bluetooth_device::kModaliasProperty, &modalias); | 202 RegisterProperty(bluetooth_device::kModaliasProperty, &modalias); |
| 203 RegisterProperty(bluetooth_device::kRSSIProperty, &rssi); | 203 RegisterProperty(bluetooth_device::kRSSIProperty, &rssi); |
| 204 RegisterProperty(bluetooth_device::kTxPowerProperty, &tx_power); | 204 RegisterProperty(bluetooth_device::kTxPowerProperty, &tx_power); |
| 205 RegisterProperty(bluetooth_device::kManufacturerDataProperty, |
| 206 &manufacturer_data); |
| 205 RegisterProperty(bluetooth_device::kServiceDataProperty, &service_data); | 207 RegisterProperty(bluetooth_device::kServiceDataProperty, &service_data); |
| 206 RegisterProperty(bluetooth_device::kServicesResolvedProperty, | 208 RegisterProperty(bluetooth_device::kServicesResolvedProperty, |
| 207 &services_resolved); | 209 &services_resolved); |
| 210 RegisterProperty(bluetooth_device::kAdvertisingDataFlagsProperty, |
| 211 &advertising_data_flags); |
| 208 } | 212 } |
| 209 | 213 |
| 210 BluetoothDeviceClient::Properties::~Properties() {} | 214 BluetoothDeviceClient::Properties::~Properties() {} |
| 211 | 215 |
| 212 // The BluetoothDeviceClient implementation used in production. | 216 // The BluetoothDeviceClient implementation used in production. |
| 213 class BluetoothDeviceClientImpl : public BluetoothDeviceClient, | 217 class BluetoothDeviceClientImpl : public BluetoothDeviceClient, |
| 214 public dbus::ObjectManager::Interface { | 218 public dbus::ObjectManager::Interface { |
| 215 public: | 219 public: |
| 216 BluetoothDeviceClientImpl() | 220 BluetoothDeviceClientImpl() |
| 217 : object_manager_(NULL), weak_ptr_factory_(this) {} | 221 : object_manager_(NULL), weak_ptr_factory_(this) {} |
| (...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 563 | 567 |
| 564 BluetoothDeviceClient::BluetoothDeviceClient() {} | 568 BluetoothDeviceClient::BluetoothDeviceClient() {} |
| 565 | 569 |
| 566 BluetoothDeviceClient::~BluetoothDeviceClient() {} | 570 BluetoothDeviceClient::~BluetoothDeviceClient() {} |
| 567 | 571 |
| 568 BluetoothDeviceClient* BluetoothDeviceClient::Create() { | 572 BluetoothDeviceClient* BluetoothDeviceClient::Create() { |
| 569 return new BluetoothDeviceClientImpl(); | 573 return new BluetoothDeviceClientImpl(); |
| 570 } | 574 } |
| 571 | 575 |
| 572 } // namespace bluez | 576 } // namespace bluez |
| OLD | NEW |