Include USB device version in chrome.usb.Device fields.

device/usb/usb_device.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef DEVICE_USB_USB_DEVICE_H_
 #define DEVICE_USB_USB_DEVICE_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 32 matching lines @@
     // This method is called when the UsbService that created this object
     // detects that the device has been disconnected from the host.
     virtual void OnDeviceRemoved(scoped_refptr<UsbDevice> device);
   };
 
   // A unique identifier which remains stable for the lifetime of this device
   // object (i.e., until the device is unplugged or the USB service dies.)
   const std::string& guid() const { return guid_; }
 
   // Accessors to basic information.
+  uint16_t usb_version() const { return usb_version_; }
+  uint8_t device_class() const { return device_class_; }
+  uint8_t device_subclass() const { return device_subclass_; }
+  uint8_t device_protocol() const { return device_protocol_; }
   uint16_t vendor_id() const { return vendor_id_; }
   uint16_t product_id() const { return product_id_; }
+  uint16_t device_version() const { return device_version_; }
   const base::string16& manufacturer_string() const {
     return manufacturer_string_;
   }
   const base::string16& product_string() const { return product_string_; }
   const base::string16& serial_number() const { return serial_number_; }
   const WebUsbAllowedOrigins* webusb_allowed_origins() const {
     return webusb_allowed_origins_.get();
   }
   const GURL& webusb_landing_page() const { return webusb_landing_page_; }
   const std::vector<UsbConfigDescriptor>& configurations() const {
@@ skipping 11 matching lines @@
   // Gets the UsbConfigDescriptor for the active device configuration or nullptr
   // if the device is unconfigured.
   virtual const UsbConfigDescriptor* GetActiveConfiguration() const = 0;
 
   void AddObserver(Observer* observer);
   void RemoveObserver(Observer* observer);
 
  protected:
   friend class UsbService;
 
-  UsbDevice(uint16_t vendor_id,
+  UsbDevice(uint16_t usb_version,
+            uint8_t device_class,
+            uint8_t device_subclass,
+            uint8_t device_protocol,
+            uint16_t vendor_id,
             uint16_t product_id,
+            uint16_t device_version,
             const base::string16& manufacturer_string,
             const base::string16& product_string,
             const base::string16& serial_number);
   virtual ~UsbDevice();
 
   void NotifyDeviceRemoved();
 
   // These members must be mutable by subclasses as necessary during device
   // enumeration. To preserve the thread safety of this object they must remain
   // constant afterwards.
   base::string16 manufacturer_string_;
   base::string16 product_string_;
   base::string16 serial_number_;
   scoped_ptr<WebUsbAllowedOrigins> webusb_allowed_origins_;
   GURL webusb_landing_page_;
 
   // All of the device's configuration descriptors.
   std::vector<UsbConfigDescriptor> configurations_;
 
  private:
   friend class base::RefCountedThreadSafe<UsbDevice>;
 
   const std::string guid_;
+  const uint16_t usb_version_;
+  const uint8_t device_class_;
+  const uint8_t device_subclass_;
+  const uint8_t device_protocol_;
   const uint16_t vendor_id_;
   const uint16_t product_id_;
+  const uint16_t device_version_;
 
   base::ObserverList<Observer, true> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(UsbDevice);
 };
 
 }  // namespace device
 
 #endif  // DEVICE_USB_USB_DEVICE_H_