| Index: device/usb/usb_device_handle_impl.cc
|
| diff --git a/device/usb/usb_device_handle_impl.cc b/device/usb/usb_device_handle_impl.cc
|
| index 2d8c69018474261eb4440ec55f6b7cfbd2a6c601..1ab1f1a8fde8c0f099f6a5122dd075416b0574d3 100644
|
| --- a/device/usb/usb_device_handle_impl.cc
|
| +++ b/device/usb/usb_device_handle_impl.cc
|
| @@ -519,17 +519,16 @@ bool UsbDeviceHandleImpl::GetSerial(base::string16* serial) {
|
| return GetStringDescriptor(desc.iSerialNumber, serial);
|
| }
|
|
|
| -void UsbDeviceHandleImpl::ControlTransfer(
|
| - const UsbEndpointDirection direction,
|
| - const TransferRequestType request_type,
|
| - const TransferRecipient recipient,
|
| - const uint8 request,
|
| - const uint16 value,
|
| - const uint16 index,
|
| - net::IOBuffer* buffer,
|
| - const size_t length,
|
| - const unsigned int timeout,
|
| - const UsbTransferCallback& callback) {
|
| +void UsbDeviceHandleImpl::ControlTransfer(UsbEndpointDirection direction,
|
| + TransferRequestType request_type,
|
| + TransferRecipient recipient,
|
| + uint8 request,
|
| + uint16 value,
|
| + uint16 index,
|
| + net::IOBuffer* buffer,
|
| + size_t length,
|
| + unsigned int timeout,
|
| + const UsbTransferCallback& callback) {
|
| if (!device_) {
|
| callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0);
|
| return;
|
| @@ -569,11 +568,11 @@ void UsbDeviceHandleImpl::ControlTransfer(
|
| callback);
|
| }
|
|
|
| -void UsbDeviceHandleImpl::BulkTransfer(const UsbEndpointDirection direction,
|
| - const uint8 endpoint,
|
| +void UsbDeviceHandleImpl::BulkTransfer(UsbEndpointDirection direction,
|
| + uint8 endpoint,
|
| net::IOBuffer* buffer,
|
| - const size_t length,
|
| - const unsigned int timeout,
|
| + size_t length,
|
| + unsigned int timeout,
|
| const UsbTransferCallback& callback) {
|
| if (!device_) {
|
| callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0);
|
| @@ -595,11 +594,11 @@ void UsbDeviceHandleImpl::BulkTransfer(const UsbEndpointDirection direction,
|
| }
|
|
|
| void UsbDeviceHandleImpl::InterruptTransfer(
|
| - const UsbEndpointDirection direction,
|
| - const uint8 endpoint,
|
| + UsbEndpointDirection direction,
|
| + uint8 endpoint,
|
| net::IOBuffer* buffer,
|
| - const size_t length,
|
| - const unsigned int timeout,
|
| + size_t length,
|
| + unsigned int timeout,
|
| const UsbTransferCallback& callback) {
|
| if (!device_) {
|
| callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0);
|
| @@ -622,13 +621,13 @@ void UsbDeviceHandleImpl::InterruptTransfer(
|
| }
|
|
|
| void UsbDeviceHandleImpl::IsochronousTransfer(
|
| - const UsbEndpointDirection direction,
|
| - const uint8 endpoint,
|
| + UsbEndpointDirection direction,
|
| + uint8 endpoint,
|
| net::IOBuffer* buffer,
|
| - const size_t length,
|
| - const unsigned int packets,
|
| - const unsigned int packet_length,
|
| - const unsigned int timeout,
|
| + size_t length,
|
| + unsigned int packets,
|
| + unsigned int packet_length,
|
| + unsigned int timeout,
|
| const UsbTransferCallback& callback) {
|
| if (!device_) {
|
| callback.Run(USB_TRANSFER_DISCONNECT, buffer, 0);
|
|
|