| Index: device/usb/usb_device.h
|
| diff --git a/device/usb/usb_device.h b/device/usb/usb_device.h
|
| index 21676b64b2ff015c6a48c7a14be6128ec86e2929..33a93d10fd72ff3aab442b6d5ae7286f2b6a4197 100644
|
| --- a/device/usb/usb_device.h
|
| +++ b/device/usb/usb_device.h
|
| @@ -12,10 +12,12 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/strings/string16.h"
|
| #include "device/usb/usb_descriptors.h"
|
| +#include "url/gurl.h"
|
|
|
| namespace device {
|
|
|
| class UsbDeviceHandle;
|
| +struct WebUsbDescriptorSet;
|
|
|
| // A UsbDevice object represents a detected USB device, providing basic
|
| // information about it. Methods other than simple property accessors must be
|
| @@ -39,6 +41,10 @@ class UsbDevice : public base::RefCountedThreadSafe<UsbDevice> {
|
| }
|
| const base::string16& product_string() const { return product_string_; }
|
| const base::string16& serial_number() const { return serial_number_; }
|
| + const WebUsbDescriptorSet* webusb_allowed_origins() const {
|
| + return webusb_allowed_origins_.get();
|
| + }
|
| + const GURL& webusb_landing_page() const { return webusb_landing_page_; }
|
|
|
| // On ChromeOS the permission_broker service is used to change the ownership
|
| // of USB device nodes so that Chrome can open them. On other platforms these
|
| @@ -75,6 +81,8 @@ class UsbDevice : public base::RefCountedThreadSafe<UsbDevice> {
|
| base::string16 manufacturer_string_;
|
| base::string16 product_string_;
|
| base::string16 serial_number_;
|
| + scoped_ptr<WebUsbDescriptorSet> webusb_allowed_origins_;
|
| + GURL webusb_landing_page_;
|
|
|
| // All of the device's configuration descriptors.
|
| std::vector<UsbConfigDescriptor> configurations_;
|
|
|