Index: chrome/browser/extensions/api/usb/usb_api.h |
diff --git a/chrome/browser/extensions/api/usb/usb_api.h b/chrome/browser/extensions/api/usb/usb_api.h |
index 55b45d93c026155840a188c913610b8e69767467..318545fe68b7a3302a2ad8a3d896133900f5afe1 100644 |
--- a/chrome/browser/extensions/api/usb/usb_api.h |
+++ b/chrome/browser/extensions/api/usb/usb_api.h |
@@ -44,7 +44,7 @@ class UsbAsyncApiTransferFunction : public UsbAsyncApiFunction { |
virtual ~UsbAsyncApiTransferFunction(); |
bool ConvertDirectionSafely(const extensions::api::usb::Direction& input, |
- UsbDevice::TransferDirection* output); |
+ UsbInterfaceDirection* output); |
Bei Zhang
2013/04/26 22:38:01
I think direction is not a property of USB interfa
Kenny Root (Google)
2013/05/08 01:15:08
Done.
|
bool ConvertRequestTypeSafely(const extensions::api::usb::RequestType& input, |
UsbDevice::TransferRequestType* output); |
bool ConvertRecipientSafely(const extensions::api::usb::Recipient& input, |
@@ -77,6 +77,38 @@ class UsbFindDevicesFunction : public UsbAsyncApiFunction { |
scoped_ptr<extensions::api::usb::FindDevices::Params> parameters_; |
}; |
+class UsbListInterfacesFunction : public UsbAsyncApiFunction { |
+ public: |
+ DECLARE_EXTENSION_FUNCTION("usb.listInterfaces", USB_LISTINTERFACES) |
+ |
+ UsbListInterfacesFunction(); |
+ |
+ static void SetDeviceForTest(UsbDevice* device); |
+ |
+ protected: |
+ virtual ~UsbListInterfacesFunction(); |
+ |
+ virtual bool Prepare() OVERRIDE; |
+ virtual void AsyncWorkStart() OVERRIDE; |
+ |
+ private: |
+ void OnCompleted(bool success); |
+ |
+ bool ConvertDirectionSafely(const UsbInterfaceDirection& input, |
+ extensions::api::usb::Direction* output); |
+ bool ConvertEndpointTypeSafely(const UsbEndpointType& input, |
+ extensions::api::usb::EndpointType* output); |
+ bool ConvertSynchronizationTypeSafely( |
+ const UsbSynchronizationType& input, |
+ extensions::api::usb::SynchronizationType* output); |
+ bool ConvertUsageTypeSafely(const UsbUsageType& input, |
+ extensions::api::usb::UsageType* output); |
+ |
+ scoped_ptr<base::ListValue> result_; |
+ scoped_refptr<UsbConfigDescriptor> config_; |
+ scoped_ptr<extensions::api::usb::ListInterfaces::Params> parameters_; |
+}; |
+ |
class UsbCloseDeviceFunction : public UsbAsyncApiFunction { |
public: |
DECLARE_EXTENSION_FUNCTION("usb.closeDevice", USB_CLOSEDEVICE) |