summaryrefslogtreecommitdiffstats
path: root/device/usb/usb_device_impl.h
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 /device/usb/usb_device_impl.h
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 'device/usb/usb_device_impl.h')
-rw-r--r--device/usb/usb_device_impl.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/device/usb/usb_device_impl.h b/device/usb/usb_device_impl.h
index 40bfd1e..9a4f8c3 100644
--- a/device/usb/usb_device_impl.h
+++ b/device/usb/usb_device_impl.h
@@ -47,7 +47,7 @@ class UsbDeviceImpl : public UsbDevice {
void CheckUsbAccess(const ResultCallback& callback) override;
#endif // OS_CHROMEOS
void Open(const OpenCallback& callback) override;
- const UsbConfigDescriptor* GetActiveConfiguration() override;
+ const UsbConfigDescriptor* GetActiveConfiguration() const override;
// These functions are used during enumeration only. The values must not
// change during the object's lifetime.