summaryrefslogtreecommitdiffstats
path: root/content/renderer/usb/type_converters.cc
diff options
context:
space:
mode:
authorreillyg <reillyg@chromium.org>2016-03-15 12:47:06 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-15 19:48:11 +0000
commitcc9b0c5fa36368bb012b4b4d572ada52ceb1146b (patch)
tree5cd24491c7188fb4702d69a9e08053ad3c53eb16 /content/renderer/usb/type_converters.cc
parent8b58c0d445772371cba4da0000f78917a12c79bc (diff)
downloadchromium_src-cc9b0c5fa36368bb012b4b4d572ada52ceb1146b.zip
chromium_src-cc9b0c5fa36368bb012b4b4d572ada52ceb1146b.tar.gz
chromium_src-cc9b0c5fa36368bb012b4b4d572ada52ceb1146b.tar.bz2
Track USB device configuration state in Blink.
Blink now tracks the currently selected device configuration and can thus provide it as an IDL attribute without a getConfiguration() method which has been removed. This continues the trend of being able to handle errors in Blink before calling methods on the Mojo interface. BUG=593164 R=juncai@chromium.org TBR=dgozman@chromium.org Review URL: https://codereview.chromium.org/1784733002 Cr-Commit-Position: refs/heads/master@{#381288}
Diffstat (limited to 'content/renderer/usb/type_converters.cc')
-rw-r--r--content/renderer/usb/type_converters.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/content/renderer/usb/type_converters.cc b/content/renderer/usb/type_converters.cc
index acddfaf..5c47c93 100644
--- a/content/renderer/usb/type_converters.cc
+++ b/content/renderer/usb/type_converters.cc
@@ -213,6 +213,7 @@ TypeConverter<blink::WebUSBDeviceInfo, device::usb::DeviceInfoPtr>::Convert(
device.productName = blink::WebString::fromUTF8(info->product_name);
if (!info->serial_number.is_null())
device.serialNumber = blink::WebString::fromUTF8(info->serial_number);
+ device.activeConfiguration = info->active_configuration;
device.configurations =
blink::WebVector<blink::WebUSBDeviceInfo::Configuration>(
info->configurations.size());