| 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/bluetooth_adapter_chromeos.h" | 5 #include "device/bluetooth/bluetooth_adapter_chromeos.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 366 DBusThreadManager::Get()->GetBluetoothDeviceClient()-> | 366 DBusThreadManager::Get()->GetBluetoothDeviceClient()-> |
| 367 GetProperties(object_path); | 367 GetProperties(object_path); |
| 368 | 368 |
| 369 if (property_name == properties->bluetooth_class.name() || | 369 if (property_name == properties->bluetooth_class.name() || |
| 370 property_name == properties->address.name() || | 370 property_name == properties->address.name() || |
| 371 property_name == properties->alias.name() || | 371 property_name == properties->alias.name() || |
| 372 property_name == properties->paired.name() || | 372 property_name == properties->paired.name() || |
| 373 property_name == properties->trusted.name() || | 373 property_name == properties->trusted.name() || |
| 374 property_name == properties->connected.name() || | 374 property_name == properties->connected.name() || |
| 375 property_name == properties->uuids.name() || | 375 property_name == properties->uuids.name() || |
| 376 property_name == properties->rssi.name() || | 376 property_name == properties->rssi.name()) |
| 377 property_name == properties->connection_rssi.name() || | |
| 378 property_name == properties->connection_tx_power.name()) | |
| 379 NotifyDeviceChanged(device_chromeos); | 377 NotifyDeviceChanged(device_chromeos); |
| 380 | 378 |
| 381 // When a device becomes paired, mark it as trusted so that the user does | 379 // When a device becomes paired, mark it as trusted so that the user does |
| 382 // not need to approve every incoming connection | 380 // not need to approve every incoming connection |
| 383 if (property_name == properties->paired.name() && | 381 if (property_name == properties->paired.name() && |
| 384 properties->paired.value() && !properties->trusted.value()) | 382 properties->paired.value() && !properties->trusted.value()) |
| 385 device_chromeos->SetTrusted(); | 383 device_chromeos->SetTrusted(); |
| 386 | 384 |
| 387 // UMA connection counting | 385 // UMA connection counting |
| 388 if (property_name == properties->connected.name()) { | 386 if (property_name == properties->connected.name()) { |
| (...skipping 668 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1057 | 1055 |
| 1058 // If the queued request resulted in a pending call, then let it | 1056 // If the queued request resulted in a pending call, then let it |
| 1059 // asynchonously process the remaining queued requests once the pending | 1057 // asynchonously process the remaining queued requests once the pending |
| 1060 // call returns. | 1058 // call returns. |
| 1061 if (discovery_request_pending_) | 1059 if (discovery_request_pending_) |
| 1062 return; | 1060 return; |
| 1063 } | 1061 } |
| 1064 } | 1062 } |
| 1065 | 1063 |
| 1066 } // namespace chromeos | 1064 } // namespace chromeos |
| OLD | NEW |