| 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 30f3400f33551a2cefa0a4793e192bc1805e133a..9b46bd32bc93ae37a5e1f36b6d8f2e344beeb95c 100644
|
| --- a/chrome/browser/extensions/api/usb/usb_api.h
|
| +++ b/chrome/browser/extensions/api/usb/usb_api.h
|
| @@ -8,13 +8,27 @@
|
| #include <string>
|
|
|
| #include "chrome/browser/extensions/api/api_function.h"
|
| +#include "chrome/browser/extensions/api/api_resource_manager.h"
|
| #include "chrome/common/extensions/api/experimental_usb.h"
|
|
|
| namespace extensions {
|
|
|
| -class APIResourceEventNotifier;
|
| +class ApiResourceEventNotifier;
|
| +class UsbDeviceResource;
|
|
|
| -class UsbFindDeviceFunction : public AsyncAPIFunction {
|
| +class UsbAsyncApiFunction : public AsyncApiFunction {
|
| + public:
|
| + UsbAsyncApiFunction();
|
| +
|
| + protected:
|
| + virtual ~UsbAsyncApiFunction();
|
| +
|
| + virtual bool PrePrepare() OVERRIDE;
|
| +
|
| + ApiResourceManager<UsbDeviceResource>* manager_;
|
| +};
|
| +
|
| +class UsbFindDeviceFunction : public UsbAsyncApiFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION_NAME("experimental.usb.findDevice");
|
|
|
| @@ -28,10 +42,10 @@ class UsbFindDeviceFunction : public AsyncAPIFunction {
|
|
|
| private:
|
| scoped_ptr<extensions::api::experimental_usb::FindDevice::Params> parameters_;
|
| - APIResourceEventNotifier* event_notifier_;
|
| + ApiResourceEventNotifier* event_notifier_;
|
| };
|
|
|
| -class UsbCloseDeviceFunction : public AsyncAPIFunction {
|
| +class UsbCloseDeviceFunction : public UsbAsyncApiFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION_NAME("experimental.usb.closeDevice");
|
|
|
| @@ -48,7 +62,7 @@ class UsbCloseDeviceFunction : public AsyncAPIFunction {
|
| parameters_;
|
| };
|
|
|
| -class UsbControlTransferFunction : public AsyncAPIFunction {
|
| +class UsbControlTransferFunction : public UsbAsyncApiFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION_NAME("experimental.usb.controlTransfer");
|
|
|
| @@ -65,7 +79,7 @@ class UsbControlTransferFunction : public AsyncAPIFunction {
|
| parameters_;
|
| };
|
|
|
| -class UsbBulkTransferFunction : public AsyncAPIFunction {
|
| +class UsbBulkTransferFunction : public UsbAsyncApiFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION_NAME("experimental.usb.bulkTransfer");
|
|
|
| @@ -82,7 +96,7 @@ class UsbBulkTransferFunction : public AsyncAPIFunction {
|
| parameters_;
|
| };
|
|
|
| -class UsbInterruptTransferFunction : public AsyncAPIFunction {
|
| +class UsbInterruptTransferFunction : public UsbAsyncApiFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION_NAME("experimental.usb.interruptTransfer");
|
|
|
| @@ -99,7 +113,7 @@ class UsbInterruptTransferFunction : public AsyncAPIFunction {
|
| parameters_;
|
| };
|
|
|
| -class UsbIsochronousTransferFunction : public AsyncAPIFunction {
|
| +class UsbIsochronousTransferFunction : public UsbAsyncApiFunction {
|
| public:
|
| DECLARE_EXTENSION_FUNCTION_NAME("experimental.usb.isochronousTransfer");
|
|
|
|
|