| Index: chrome/browser/usb/usb_chooser_controller.h
|
| diff --git a/chrome/browser/usb/usb_chooser_controller.h b/chrome/browser/usb/usb_chooser_controller.h
|
| index 95f5807053a8adcedee6ffad777608eb7b39ea80..b990e8887f24aef1222ac0e66eb41d2d85e8a336 100644
|
| --- a/chrome/browser/usb/usb_chooser_controller.h
|
| +++ b/chrome/browser/usb/usb_chooser_controller.h
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/chooser_controller/chooser_controller.h"
|
| #include "device/usb/public/interfaces/chooser_service.mojom.h"
|
| #include "device/usb/usb_service.h"
|
| +#include "url/gurl.h"
|
|
|
| namespace content {
|
| class RenderFrameHost;
|
| @@ -26,6 +27,8 @@ class UsbDevice;
|
| struct UsbDeviceFilter;
|
| }
|
|
|
| +class UsbChooserContext;
|
| +
|
| // UsbChooserController creates a chooser for WebUSB.
|
| // It is owned by ChooserBubbleDelegate.
|
| class UsbChooserController : public ChooserController,
|
| @@ -59,11 +62,16 @@ class UsbChooserController : public ChooserController,
|
| const std::vector<scoped_refptr<device::UsbDevice>>& devices);
|
| bool DisplayDevice(scoped_refptr<device::UsbDevice> device) const;
|
|
|
| - content::RenderFrameHost* const render_frame_host_;
|
| + std::vector<device::UsbDeviceFilter> filters_;
|
| device::usb::ChooserService::GetPermissionCallback callback_;
|
| + GURL requesting_origin_;
|
| + GURL embedding_origin_;
|
| + bool is_embedded_frame_;
|
| +
|
| + base::WeakPtr<UsbChooserContext> chooser_context_;
|
| ScopedObserver<device::UsbService, device::UsbService::Observer>
|
| usb_service_observer_;
|
| - std::vector<device::UsbDeviceFilter> filters_;
|
| +
|
| // Each pair is a (device, device name).
|
| std::vector<std::pair<scoped_refptr<device::UsbDevice>, base::string16>>
|
| devices_;
|
|
|