| Index: device/usb/usb_device.h
|
| diff --git a/device/usb/usb_device.h b/device/usb/usb_device.h
|
| index 53087c8c79ddc5e7fb16f1cf1362824a1f9b513a..44daa58752fbefe783984513a5bed96b8d730dca 100644
|
| --- a/device/usb/usb_device.h
|
| +++ b/device/usb/usb_device.h
|
| @@ -9,11 +9,13 @@
|
| #include "base/callback.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/strings/string16.h"
|
| +#include "url/gurl.h"
|
|
|
| namespace device {
|
|
|
| class UsbDeviceHandle;
|
| struct UsbConfigDescriptor;
|
| +struct WebUsbDescriptorSet;
|
|
|
| // A UsbDevice object represents a detected USB device, providing basic
|
| // information about it. Methods other than simple property accessors must be
|
| @@ -37,6 +39,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
|
| @@ -68,6 +74,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_;
|
|
|
| private:
|
| friend class base::RefCountedThreadSafe<UsbDevice>;
|
|
|