Show device connection and paired status in chooser on Mac

content/browser/bluetooth/bluetooth_device_chooser_controller.h

Index: content/browser/bluetooth/bluetooth_device_chooser_controller.h
diff --git a/content/browser/bluetooth/bluetooth_device_chooser_controller.h b/content/browser/bluetooth/bluetooth_device_chooser_controller.h
index b9e21cc55689db5dee842442b57243593c81dcb2..75d8bfea7ccf00e80f6aacded9e3b90d3758555d 100644
--- a/content/browser/bluetooth/bluetooth_device_chooser_controller.h
+++ b/content/browser/bluetooth/bluetooth_device_chooser_controller.h
@@ -21,8 +21,13 @@ class BluetoothDiscoveryFilter;
 class BluetoothDiscoverySession;
 }
 
+namespace url {
+class Origin;
+}
+
 namespace content {
 
+class BluetoothAllowedDevicesMap;
 class RenderFrameHost;
 class WebContents;
 class WebBluetoothServiceImpl;
@@ -45,7 +50,9 @@ class CONTENT_EXPORT BluetoothDeviceChooserController final {
   BluetoothDeviceChooserController(
       WebBluetoothServiceImpl* web_bluetooth_service_,
       RenderFrameHost* render_frame_host,
-      device::BluetoothAdapter* adapter);
+      device::BluetoothAdapter* adapter,
+      const BluetoothAllowedDevicesMap& bluetooth_allowed_devices_map,

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

Taking this by reference requires that the ChooserController be destroyed before
the BluetoothAllowedDevicesMap. That's guaranteed if web_bluetooth_service_ owns
the bluetooth_allowed_devices_map, and you should comment that requirement in
this function's comment block.

I'd be a little more comfortable if you added a method to
WebBluetoothServiceImpl that allowed the controller to call through there to
check the contents of the AllowedDevicesMap, instead of adding this extra
constraint on lifetimes.

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

Done.

+      const url::Origin& origin);
   ~BluetoothDeviceChooserController();
 
   // This function performs the following checks before starting a discovery
@@ -146,6 +153,9 @@ class CONTENT_EXPORT BluetoothDeviceChooserController final {
   // http://crbug.com/611852
   std::unique_ptr<device::BluetoothDiscoverySession> discovery_session_;
 
+  const BluetoothAllowedDevicesMap& bluetooth_allowed_devices_map_;
+  url::Origin origin_;
+
   // Weak pointer factory for generating 'this' pointers that might live longer
   // than we do.
   // Note: This should remain the last member so it'll be destroyed and