Show device connection and paired status in chooser on Mac

content/browser/bluetooth/bluetooth_device_chooser_controller.h

 // 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.
 
 #ifndef CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DEVICE_CHOOSER_CONTROLLER_H_
 #define CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DEVICE_CHOOSER_CONTROLLER_H_
 
 #include <string>
 
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/bluetooth_chooser.h"
 #include "third_party/WebKit/public/platform/modules/bluetooth/web_bluetooth.mojom.h"
 
 namespace device {
 class BluetoothAdapter;
 class BluetoothDevice;
 class BluetoothDiscoveryFilter;
 class BluetoothDiscoverySession;
 }
 
+namespace url {
+class Origin;
+}
+
 namespace content {
 
+class BluetoothAllowedDevicesMap;
 class RenderFrameHost;
 class WebContents;
 class WebBluetoothServiceImpl;
 
 // Class that interacts with a chooser and starts a bluetooth discovery session.
 // This class needs to be re-instantiated for each call to GetDevice(). Calling
 // GetDevice() twice for the same instance will DCHECK.
 class CONTENT_EXPORT BluetoothDeviceChooserController final {
  public:
   typedef base::Callback<void(blink::mojom::WebBluetoothRequestDeviceOptionsPtr,
                               const std::string& device_address)>
       SuccessCallback;
   typedef base::Callback<void(blink::mojom::WebBluetoothError error)>
       ErrorCallback;
 
   // |web_bluetooth_service_| service that owns this class.
   // |render_frame_host| should be the RenderFrameHost that owns the
   // |web_bluetooth_service_|.
   // |adapter| should be the adapter used to scan for Bluetooth devices.
   BluetoothDeviceChooserController(
       WebBluetoothServiceImpl* web_bluetooth_service_,
       RenderFrameHost* render_frame_host,
-      device::BluetoothAdapter* adapter);
+      device::BluetoothAdapter* adapter,
+      BluetoothAllowedDevicesMap* bluetooth_allowed_devices_map,

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

Would it be too much work to pass in a const& here?

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

Done.

+      const url::Origin& origin);
   ~BluetoothDeviceChooserController();
 
   // This function performs the following checks before starting a discovery
   // session:
   //   - Validates filters in |request_device_options|.
   //   - Removes any blacklisted UUIDs from
   //     |request_device_options.optinal_services|.
   //   - Checks if the request came from a cross-origin iframe.
   //   - Checks if the request came from a unique origin.
   //   - Checks if the adapter is present.
@@ skipping 80 matching lines @@
   // Automatically stops Bluetooth discovery a set amount of time after it was
   // started.
   base::Timer discovery_session_timer_;
 
   // The last discovery session to be started.
   // TODO(ortuno): This should be null unless there is an active discovery
   // session. We need to null it when the platform stops discovery.
   // http://crbug.com/611852
   std::unique_ptr<device::BluetoothDiscoverySession> discovery_session_;
 
+  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
   // invalidate its weak pointers before any other members are destroyed.
   base::WeakPtrFactory<BluetoothDeviceChooserController> weak_ptr_factory_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BLUETOOTH_BLUETOOTH_DEVICE_CHOOSER_CONTROLLER_H_