Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(235)

Unified Diff: content/browser/bluetooth/bluetooth_device_chooser_controller.h

Issue 2304213002: Show device connection and paired status in chooser on Mac (Closed)
Patch Set: updated variable name Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..e9a95aed9ef8eb9121cd9c0efb2a0eebc7010ce1 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,
+ 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
@@ -146,6 +153,9 @@ class CONTENT_EXPORT BluetoothDeviceChooserController final {
// 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

Powered by Google App Engine
This is Rietveld 408576698