Show device connection and paired status in chooser on Mac

content/browser/bluetooth/bluetooth_device_chooser_controller.cc

 // Copyright 2016 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 "content/browser/bluetooth/bluetooth_device_chooser_controller.h"
 
 #include <set>
 #include <string>
 #include <unordered_set>
 
@@ skipping 180 matching lines @@
   }
   NOTREACHED();
   return UMARequestDeviceOutcome::SUCCESS;
 }
 
 }  // namespace
 
 BluetoothDeviceChooserController::BluetoothDeviceChooserController(
     WebBluetoothServiceImpl* web_bluetooth_service,
     RenderFrameHost* render_frame_host,
-    device::BluetoothAdapter* adapter)
+    device::BluetoothAdapter* adapter,
+    BluetoothAllowedDevicesMap* bluetooth_allowed_devices_map,
+    const url::Origin& origin)
     : adapter_(adapter),
       web_bluetooth_service_(web_bluetooth_service),
       render_frame_host_(render_frame_host),
       web_contents_(WebContents::FromRenderFrameHost(render_frame_host_)),
       discovery_session_timer_(
           FROM_HERE,
           // TODO(jyasskin): Add a way for tests to control the dialog
           // directly, and change this to a reasonable discovery timeout.
           base::TimeDelta::FromSeconds(
               use_test_scan_duration_ ? kTestScanDuration : kScanDuration),
           base::Bind(&BluetoothDeviceChooserController::StopDeviceDiscovery,
                      // base::Timer guarantees it won't call back after its
                      // destructor starts.
                      base::Unretained(this)),
           /*is_repeating=*/false),
+      bluetooth_allowed_devices_map_(bluetooth_allowed_devices_map),
+      origin_(origin),
       weak_ptr_factory_(this) {
   CHECK(adapter_);
 }
 
 BluetoothDeviceChooserController::~BluetoothDeviceChooserController() {
   if (chooser_) {
     DCHECK(!error_callback_.is_null());
     error_callback_.Run(blink::mojom::WebBluetoothError::CHOOSER_CANCELLED);
   }
 }
@@ skipping 116 matching lines @@
     return;
   }
 
   StartDeviceDiscovery();
 }
 
 void BluetoothDeviceChooserController::AddFilteredDevice(
     const device::BluetoothDevice& device) {
   if (chooser_.get() && MatchesFilters(device, options_->filters)) {
     base::Optional<int8_t> rssi = device.GetInquiryRSSI();
+    bool is_paired = false;
+    const WebBluetoothDeviceId* device_id_ptr =
+        bluetooth_allowed_devices_map_->GetDeviceId(origin_,
+                                                    device.GetAddress());
+    if (device_id_ptr) {

[ortuno, 2016/09/12 03:45:22]

As long as the user has paired with the device in the past we want to show the
device as paired. Besides that I don't think we can use GetUUIDs to decide if a
device contains a set of UUIDs or not, for example a device that is constantly
alternating between two different UUIDs will keep changing between paired and
not paired and that will probably confuse users. I think the following is
enough:

bool is_paired = bluetooth_allowed_devices_map->GetDeviceId(origin_,
device.GetAddress()) != nullptr;

[juncai, 2016/09/12 20:37:12]

Done.

+      device::BluetoothDevice::UUIDSet uuids = device.GetUUIDs();
+      for (const auto& uuid : uuids) {
+        if (bluetooth_allowed_devices_map_->IsOriginAllowedToAccessService(
+                origin_, *device_id_ptr, uuid)) {
+          is_paired = true;
+          break;
+        }
+      }
+    }
+
     chooser_->AddOrUpdateDevice(
         device.GetAddress(), !!device.GetName() /* should_update_name */,
         device.GetNameForDisplay(),
-        // TODO(http://crbug.com/543466): Show connection and paired status.
-        false /* is_gatt_connected */, false /* is_paired */,
+        device.IsGattConnected() /* is_gatt_connected */,

[ortuno, 2016/09/12 03:45:22]

I don't think you need the comments anymore. It's clear what the parameters are.

[juncai, 2016/09/12 20:37:12]

Done.

+        is_paired /* is_paired */,
         rssi ? CalculateSignalStrengthLevel(rssi.value()) : -1);
   }
 }
 
 void BluetoothDeviceChooserController::AdapterPoweredChanged(bool powered) {
   if (!powered && discovery_session_.get()) {
     StopDiscoverySession(std::move(discovery_session_));
   }
 
   if (chooser_.get()) {
@@ skipping 141 matching lines @@
 
 void BluetoothDeviceChooserController::PostErrorCallback(
     blink::mojom::WebBluetoothError error) {
   if (!base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(error_callback_, error))) {
     LOG(WARNING) << "No TaskRunner.";
   }
 }
 
 }  // namespace content