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,
+    const 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 23 matching lines @@
   // Check blacklist to reject invalid filters and adjust optional_services.
   if (BluetoothBlacklist::Get().IsExcluded(options_->filters)) {
     RecordRequestDeviceOutcome(
         UMARequestDeviceOutcome::BLACKLISTED_SERVICE_IN_FILTER);
     PostErrorCallback(
         blink::mojom::WebBluetoothError::REQUEST_DEVICE_WITH_BLACKLISTED_UUID);
     return;
   }
   BluetoothBlacklist::Get().RemoveExcludedUUIDs(options_.get());
 
   const url::Origin requesting_origin =

[Jeffrey Yasskin, 2016/09/14 20:08:36]

I think we're assuming that this origin matches the one passed into the
constructor. Either DCHECK that they're the same, or just use this one.

[juncai, 2016/09/14 23:13:07]

Added WebBluetoothServiceImpl::IsDevicePaired(), so not using the origin
directly at BluetoothDeviceChooserController::AddFilteredDevice().

[Jeffrey Yasskin, 2016/09/14 23:52:03]

Great.

       render_frame_host_->GetLastCommittedOrigin();
   const url::Origin embedding_origin =
       web_contents_->GetMainFrame()->GetLastCommittedOrigin();
 
   // TODO(crbug.com/518042): Enforce correctly-delegated permissions instead of
   // matching origins. When relaxing this, take care to handle non-sandboxed
   // unique origins.
   if (!embedding_origin.IsSameOriginWith(requesting_origin)) {
     PostErrorCallback(blink::mojom::WebBluetoothError::
                           REQUEST_DEVICE_FROM_CROSS_ORIGIN_IFRAME);
@@ skipping 72 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 = bluetooth_allowed_devices_map_.GetDeviceId(
+                         origin_, device.GetAddress()) != nullptr;
     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.GetNameForDisplay(), device.IsGattConnected(), 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