Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5100)

Unified Diff: chrome/browser/extensions/api/usb/usb_api.h

Issue 22914023: Introducing chrome.usb.getDevices/openDevice API (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@usb-interface
Patch Set: Rebase to origin/master Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/extensions/api/usb/usb_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 a778503b58123f9adb3558a95db7d16d0ed282e6..69ce0cf8d0e6596591cdd1a0c26664f2edc4ea42 100644
--- a/chrome/browser/extensions/api/usb/usb_api.h
+++ b/chrome/browser/extensions/api/usb/usb_api.h
@@ -9,6 +9,7 @@
#include <vector>
#include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
#include "chrome/browser/extensions/api/api_function.h"
#include "chrome/browser/extensions/api/api_resource_manager.h"
#include "chrome/browser/usb/usb_device.h"
@@ -16,6 +17,7 @@
#include "chrome/common/extensions/api/usb.h"
#include "net/base/io_buffer.h"
+class UsbDevice;
class UsbDeviceHandle;
class UsbService;
@@ -33,7 +35,12 @@ class UsbAsyncApiFunction : public AsyncApiFunction {
virtual bool PrePrepare() OVERRIDE;
virtual bool Respond() OVERRIDE;
- UsbDeviceResource* GetUsbDeviceResource(int api_resource_id);
+ scoped_refptr<UsbDevice> GetDeviceOrOrCompleteWithError(
+ const extensions::api::usb::Device& input_device);
+
+ scoped_refptr<UsbDeviceHandle> GetDeviceHandleOrCompleteWithError(
+ const extensions::api::usb::ConnectionHandle& input_device_handle);
+
void RemoveUsbDeviceResource(int api_resource_id);
void CompleteWithError(const std::string& error);
@@ -64,8 +71,6 @@ class UsbFindDevicesFunction : public UsbAsyncApiFunction {
UsbFindDevicesFunction();
- static void SetDeviceForTest(UsbDevice* device);
-
protected:
virtual ~UsbFindDevicesFunction();
@@ -73,14 +78,68 @@ class UsbFindDevicesFunction : public UsbAsyncApiFunction {
virtual void AsyncWorkStart() OVERRIDE;
private:
- void EnumerationCompletedFileThread(
- scoped_ptr<std::vector<scoped_refptr<UsbDevice> > > devices);
+ void OpenDevices(scoped_ptr<std::vector<scoped_refptr<UsbDevice> > > devices);
- scoped_ptr<base::ListValue> result_;
std::vector<scoped_refptr<UsbDeviceHandle> > device_handles_;
scoped_ptr<extensions::api::usb::FindDevices::Params> parameters_;
};
+class UsbGetDevicesFunction : public UsbAsyncApiFunction {
+ public:
+ DECLARE_EXTENSION_FUNCTION("usb.getDevices", USB_GETDEVICES)
+
+ UsbGetDevicesFunction();
+
+ static void SetDeviceForTest(UsbDevice* device);
+
+ virtual bool Prepare() OVERRIDE;
+ virtual void AsyncWorkStart() OVERRIDE;
+
+ protected:
+ virtual ~UsbGetDevicesFunction();
+
+ private:
+ void EnumerationCompletedFileThread(
+ scoped_ptr<std::vector<scoped_refptr<UsbDevice> > > devices);
+
+ scoped_ptr<extensions::api::usb::GetDevices::Params> parameters_;
+};
+
+class UsbRequestAccessFunction : public UsbAsyncApiFunction {
+ public:
+ DECLARE_EXTENSION_FUNCTION("usb.requestAccess", USB_REQUESTACCESS)
+
+ UsbRequestAccessFunction();
+
+ virtual bool Prepare() OVERRIDE;
+ virtual void AsyncWorkStart() OVERRIDE;
+
+ protected:
+ virtual ~UsbRequestAccessFunction();
+
+ void OnCompleted(bool success);
+
+ private:
+ scoped_ptr<extensions::api::usb::RequestAccess::Params> parameters_;
+};
+
+class UsbOpenDeviceFunction : public UsbAsyncApiFunction {
+ public:
+ DECLARE_EXTENSION_FUNCTION("usb.openDevice", USB_OPENDEVICE)
+
+ UsbOpenDeviceFunction();
+
+ virtual bool Prepare() OVERRIDE;
+ virtual void AsyncWorkStart() OVERRIDE;
+
+ protected:
+ virtual ~UsbOpenDeviceFunction();
+
+ private:
+ scoped_refptr<UsbDeviceHandle> handle_;
+ scoped_ptr<extensions::api::usb::OpenDevice::Params> parameters_;
+};
+
class UsbListInterfacesFunction : public UsbAsyncApiFunction {
public:
DECLARE_EXTENSION_FUNCTION("usb.listInterfaces", USB_LISTINTERFACES)
« no previous file with comments | « no previous file | chrome/browser/extensions/api/usb/usb_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698