| Index: public/platform/modules/webusb/WebUSBDevice.h
|
| diff --git a/public/platform/modules/webusb/WebUSBDevice.h b/public/platform/modules/webusb/WebUSBDevice.h
|
| index cb424c0df226c06f4cdb8b8bbd70ffc39a033e0f..dd05bf941deb310f8b110218bd5ed6733f1a6f3f 100644
|
| --- a/public/platform/modules/webusb/WebUSBDevice.h
|
| +++ b/public/platform/modules/webusb/WebUSBDevice.h
|
| @@ -23,9 +23,13 @@ using WebUSBDeviceReleaseInterfaceCallbacks = WebCallbacks<void, const WebUSBErr
|
| using WebUSBDeviceResetCallbacks = WebCallbacks<void, const WebUSBError&>;
|
| using WebUSBDeviceSetInterfaceAlternateSettingCallbacks = WebCallbacks<void, const WebUSBError&>;
|
| using WebUSBDeviceClearHaltCallbacks = WebCallbacks<void, const WebUSBError&>;
|
| -using WebUSBDeviceControlTransferCallbacks = WebCallbacks<WebPassOwnPtr<WebUSBTransferInfo>, const WebUSBError&>;
|
| -using WebUSBDeviceBulkTransferCallbacks = WebCallbacks<WebPassOwnPtr<WebUSBTransferInfo>, const WebUSBError&>;
|
| -using WebUSBDeviceInterruptTransferCallbacks = WebCallbacks<WebPassOwnPtr<WebUSBTransferInfo>, const WebUSBError&>;
|
| +using WebUSBDeviceTransferCallbacks = WebCallbacks<WebPassOwnPtr<WebUSBTransferInfo>, const WebUSBError&>;
|
| +
|
| +// TODO(rockot): Eliminate these aliases once they're no longer used outside of
|
| +// Blink code.
|
| +using WebUSBDeviceControlTransferCallbacks = WebUSBDeviceTransferCallbacks;
|
| +using WebUSBDeviceBulkTransferCallbacks = WebUSBDeviceTransferCallbacks;
|
| +using WebUSBDeviceInterruptTransferCallbacks = WebUSBDeviceTransferCallbacks;
|
|
|
| class WebUSBDevice {
|
| public:
|
| @@ -40,7 +44,7 @@ public:
|
| Vendor,
|
| };
|
|
|
| - enum RequestRecipient {
|
| + enum class RequestRecipient {
|
| Device,
|
| Interface,
|
| Endpoint,
|
|
|