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

Unified Diff: device/usb/mojo/type_converters.cc

Issue 1857033002: Include USB device version in chrome.usb.Device fields. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 4 years, 8 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/usb/mock_usb_device.cc ('k') | device/usb/usb_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/mojo/type_converters.cc
diff --git a/device/usb/mojo/type_converters.cc b/device/usb/mojo/type_converters.cc
index 1761f0a4daecd8f391e493ce5132406bb725d960..f6d84af7e0299094338a6b257c4f501bd74741a3 100644
--- a/device/usb/mojo/type_converters.cc
+++ b/device/usb/mojo/type_converters.cc
@@ -257,8 +257,17 @@ TypeConverter<device::usb::DeviceInfoPtr, device::UsbDevice>::Convert(
const device::UsbDevice& device) {
device::usb::DeviceInfoPtr info = device::usb::DeviceInfo::New();
info->guid = device.guid();
+ info->usb_version_major = device.usb_version() >> 8;
+ info->usb_version_minor = device.usb_version() >> 4 & 0xf;
+ info->usb_version_subminor = device.usb_version() & 0xf;
+ info->class_code = device.device_class();
+ info->subclass_code = device.device_subclass();
+ info->protocol_code = device.device_protocol();
info->vendor_id = device.vendor_id();
info->product_id = device.product_id();
+ info->device_version_major = device.device_version() >> 8;
+ info->device_version_minor = device.device_version() >> 4 & 0xf;
+ info->device_version_subminor = device.device_version() & 0xf;
info->manufacturer_name = base::UTF16ToUTF8(device.manufacturer_string());
info->product_name = base::UTF16ToUTF8(device.product_string());
info->serial_number = base::UTF16ToUTF8(device.serial_number());
« no previous file with comments | « device/usb/mock_usb_device.cc ('k') | device/usb/usb_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698