Bluetooth: Show trusted devices as paired.

device/bluetooth/bluetooth_device_chromeos.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "device/bluetooth/bluetooth_device_chromeos.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 34 matching lines @@
 } // namespace
 
 namespace chromeos {
 
 BluetoothDeviceChromeOS::BluetoothDeviceChromeOS(
     BluetoothAdapterChromeOS* adapter)
     : BluetoothDevice(),
       adapter_(adapter),
       bluetooth_class_(0),
       paired_(false),
+      trusted_(false),
       connected_(false),
       connectable_(true),
       connecting_(false),
       pairing_delegate_(NULL),
       connecting_applications_counter_(0),
       connecting_calls_(0),
       service_records_loaded_(false),
       weak_ptr_factory_(this) {
 }
 
 BluetoothDeviceChromeOS::~BluetoothDeviceChromeOS() {
 }
 
 uint32 BluetoothDeviceChromeOS::GetBluetoothClass() const {
   return bluetooth_class_;
 }
 
 std::string BluetoothDeviceChromeOS::GetDeviceName() const {
   return name_;
 }
 
 std::string BluetoothDeviceChromeOS::GetAddress() const {
   return address_;
 }
 
 bool BluetoothDeviceChromeOS::IsPaired() const {
-  return paired_;
+  return paired_ || trusted_;
 }
 
 bool BluetoothDeviceChromeOS::IsConnected() const {
   return connected_;
 }
 
 bool BluetoothDeviceChromeOS::IsConnectable() const {
   return connectable_;
 }
 
@@ skipping 291 matching lines @@
 
   if (update_state) {
     // When the device reconnects and we don't have any service records for it,
     // try to update the cache or fail silently.
     if (!service_records_loaded_ && !connected_ &&
         properties->connected.value())
       GetServiceRecords(base::Bind(&DoNothingServiceRecordList),
                         base::Bind(&base::DoNothing));
 
     paired_ = properties->paired.value();
+    trusted_ = properties->trusted.value();
     connected_ = properties->connected.value();
   }
 }
 
 void BluetoothDeviceChromeOS::OnCreateDevice(
     const base::Closure& callback,
     const ConnectErrorCallback& error_callback,
     const dbus::ObjectPath& device_path) {
   VLOG(1) << "Connection successful: " << device_path.value();
   if (object_path_.value().empty()) {
@@ skipping 445 matching lines @@
 }
 
 
 // static
 BluetoothDeviceChromeOS* BluetoothDeviceChromeOS::Create(
     BluetoothAdapterChromeOS* adapter) {
   return new BluetoothDeviceChromeOS(adapter);
 }
 
 }  // namespace chromeos