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

Unified Diff: device/usb/usb_device.h

Issue 1646783002: Update webusb_descriptors.cc to parse the new WebUSB descriptors. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@io_buffer
Patch Set: Sometimes MSVC complains about passing size_type to BarrierClosure. Created 4 years, 11 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
« no previous file with comments | « device/devices_app/usb/type_converters.cc ('k') | device/usb/usb_device_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/usb_device.h
diff --git a/device/usb/usb_device.h b/device/usb/usb_device.h
index 92d0e295532be355248f85fcc45fe8ae2b7be5ba..27454051a010e113b3c3e15766e2da5a587a0f0e 100644
--- a/device/usb/usb_device.h
+++ b/device/usb/usb_device.h
@@ -20,7 +20,7 @@
namespace device {
class UsbDeviceHandle;
-struct WebUsbDescriptorSet;
+struct WebUsbAllowedOrigins;
// A UsbDevice object represents a detected USB device, providing basic
// information about it. Methods other than simple property accessors must be
@@ -44,7 +44,7 @@ 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 {
+ const WebUsbAllowedOrigins* webusb_allowed_origins() const {
return webusb_allowed_origins_.get();
}
const GURL& webusb_landing_page() const { return webusb_landing_page_; }
@@ -78,7 +78,7 @@ class UsbDevice : public base::RefCountedThreadSafe<UsbDevice> {
base::string16 manufacturer_string_;
base::string16 product_string_;
base::string16 serial_number_;
- scoped_ptr<WebUsbDescriptorSet> webusb_allowed_origins_;
+ scoped_ptr<WebUsbAllowedOrigins> webusb_allowed_origins_;
GURL webusb_landing_page_;
// All of the device's configuration descriptors.
« no previous file with comments | « device/devices_app/usb/type_converters.cc ('k') | device/usb/usb_device_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698