Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Side by Side Diff: device/bluetooth/dbus/bluetooth_device_client.cc

Issue 2421713002: arc: bluetooth: Expose missing advertise data. (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
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::kFlagsProperty, &flags);
ortuno 2016/10/14 00:15:10 I might be missing something but I don't see this
Rahul Chaturvedi 2016/10/17 20:41:21 I've asked Opal to upstream the patch to BlueZ. I
puthik_chromium 2016/10/17 23:30:32 I sent it to upstream http://marc.info/?l=linux-bl
208 } 211 }
209 212
210 BluetoothDeviceClient::Properties::~Properties() {} 213 BluetoothDeviceClient::Properties::~Properties() {}
211 214
212 // The BluetoothDeviceClient implementation used in production. 215 // The BluetoothDeviceClient implementation used in production.
213 class BluetoothDeviceClientImpl : public BluetoothDeviceClient, 216 class BluetoothDeviceClientImpl : public BluetoothDeviceClient,
214 public dbus::ObjectManager::Interface { 217 public dbus::ObjectManager::Interface {
215 public: 218 public:
216 BluetoothDeviceClientImpl() 219 BluetoothDeviceClientImpl()
217 : object_manager_(NULL), weak_ptr_factory_(this) {} 220 : object_manager_(NULL), weak_ptr_factory_(this) {}
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
563 566
564 BluetoothDeviceClient::BluetoothDeviceClient() {} 567 BluetoothDeviceClient::BluetoothDeviceClient() {}
565 568
566 BluetoothDeviceClient::~BluetoothDeviceClient() {} 569 BluetoothDeviceClient::~BluetoothDeviceClient() {}
567 570
568 BluetoothDeviceClient* BluetoothDeviceClient::Create() { 571 BluetoothDeviceClient* BluetoothDeviceClient::Create() {
569 return new BluetoothDeviceClientImpl(); 572 return new BluetoothDeviceClientImpl();
570 } 573 }
571 574
572 } // namespace bluez 575 } // namespace bluez
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698