Show device connection and paired status in chooser on Mac

chrome/browser/ui/bluetooth/bluetooth_chooser_controller.cc

 // Copyright 2015 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 "chrome/browser/ui/bluetooth/bluetooth_chooser_controller.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 49 matching lines @@
 }
 
 size_t BluetoothChooserController::NumOptions() const {
   return devices_.size();
 }
 
 int BluetoothChooserController::GetSignalStrengthLevel(size_t index) const {
   return devices_[index].signal_strength_level;
 }
 
+bool BluetoothChooserController::IsConnected(size_t index) const {
+  return devices_[index].is_connected;
+}
+
+bool BluetoothChooserController::IsPaired(size_t index) const {
+  return devices_[index].is_paired;
+}
+
 base::string16 BluetoothChooserController::GetOption(size_t index) const {
   DCHECK_LT(index, devices_.size());
   const std::string& device_id = devices_[index].id;
   const auto& device_name_it = device_id_to_name_map_.find(device_id);
   DCHECK(device_name_it != device_id_to_name_map_.end());
   const auto& it = device_name_counts_.find(device_name_it->second);
   DCHECK(it != device_name_counts_.end());
   return it->second == 1
              ? device_name_it->second
              : l10n_util::GetStringFUTF16(
@@ skipping 121 matching lines @@
       ++device_name_counts_[device_name];
     }
 
     auto device_it =
         std::find_if(devices_.begin(), devices_.end(),
                      [&device_id](const BluetoothDeviceInfo& device) {
                        return device.id == device_id;
                      });
 
     DCHECK(device_it != devices_.end());
-    // http://crbug.com/543466 Update connection and paired status
-
     // When Bluetooth device scanning stops, the |signal_strength_level|
     // is -1, and in this case, should still use the previously stored
     // signal strength level value.
     if (signal_strength_level != -1)
       device_it->signal_strength_level = signal_strength_level;
+    device_it->is_connected = is_gatt_connected;
+    device_it->is_paired = is_paired;
     if (view())
       view()->OnOptionUpdated(device_it - devices_.begin());
     return;
   }
 
-  devices_.push_back({device_id, signal_strength_level});
+  devices_.push_back(
+      {device_id, signal_strength_level, is_gatt_connected, is_paired});
   device_id_to_name_map_.insert({device_id, device_name});
   ++device_name_counts_[device_name];
   if (view())
     view()->OnOptionAdded(devices_.size() - 1);
 }
 
 void BluetoothChooserController::RemoveDevice(const std::string& device_id) {
   const auto& name_it = device_id_to_name_map_.find(device_id);
   if (name_it == device_id_to_name_map_.end())
     return;
@@ skipping 24 matching lines @@
 
 void BluetoothChooserController::ResetEventHandler() {
   event_handler_.Reset();
 }
 
 void BluetoothChooserController::ClearAllDevices() {
   devices_.clear();
   device_id_to_name_map_.clear();
   device_name_counts_.clear();
 }