Introducing chrome.usb.getDevices/openDevice API

chrome/browser/usb/usb_service.h

Index: chrome/browser/usb/usb_service.h
diff --git a/chrome/browser/usb/usb_service.h b/chrome/browser/usb/usb_service.h
index e89eff9cf85eb33e3892a103853edc64d6ed3b17..7289b5ac8d1c6756af68de7cc1309236c153d547 100644
--- a/chrome/browser/usb/usb_service.h
+++ b/chrome/browser/usb/usb_service.h
@@ -10,8 +10,9 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/callback.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
-#include "chrome/browser/usb/usb_device.h"
 
 namespace base {
 
@@ -20,10 +21,14 @@ template <class T> class DeleteHelper;
 }  // namespace base
 
 template <typename T> struct DefaultSingletonTraits;
+
+typedef struct libusb_device* PlatformUsbDevice;
+
 class UsbContext;
+class UsbDevice;
 
 // The USB service handles creating and managing an event handler thread that is
-// used to manage and dispatch USB events. It is also responsbile for device
+// used to manage and dispatch USB events. It is also responsible for device
 // discovery on the system, which allows it to re-use device handles to prevent
 // competition for the same USB device.
 class UsbService {
@@ -34,16 +39,7 @@ class UsbService {
   // Must be called on FILE thread.
   static UsbService* GetInstance();
 
-  // Find all of the devices attached to the system that are identified by
-  // |vendor_id| and |product_id|, inserting them into |devices|. Clears
-  // |devices| before use. Calls |callback| once |devices| is populated.
-  // The result will be sorted by id in increasing order. Must be called on
-  // FILE thread.
-  void FindDevices(
-      const uint16 vendor_id,
-      const uint16 product_id,
-      int interface_id,
-      const base::Callback<void(ScopedDeviceVector vector)>& callback);
+  scoped_refptr<UsbDevice> GetDeviceById(uint32 unique_id);

[pfeldman, 2013/09/04 07:16:55]

What is this id? How does user obtain one? Ref-counted objects are typically
using instances for identity. It sounds like the only way to obtain this id is
to ask for it from the device. I.e. the caller has had the device reference. If
that is for client-side binding, then this mapping belongs to the client.

 
   // Get all of the devices attached to the system, inserting them into
   // |devices|. Clears |devices| before use. The result will be sorted by id
@@ -63,29 +59,13 @@ class UsbService {
                             const uint16 vendor_id,
                             const uint16 product_id);
 
-  // This method is called when permission broker replied our request.
-  // We will simply relay it to FILE thread.
-  void OnRequestUsbAccessReplied(
-      const uint16 vendor_id,
-      const uint16 product_id,
-      const base::Callback<void(ScopedDeviceVector vector)>& callback,
-      bool success);
-
-  // FindDevicesImpl is called by FindDevices on ChromeOS after the permission
-  // broker has signaled that permission has been granted to access the
-  // underlying device nodes. On other platforms, it is called directly by
-  // FindDevices.
-  void FindDevicesImpl(
-      const uint16 vendor_id,
-      const uint16 product_id,
-      const base::Callback<void(ScopedDeviceVector vector)>& callback,
-      bool success);
-
   // Enumerate USB devices from OS and Update devices_ map.
   void RefreshDevices();
 
   scoped_refptr<UsbContext> context_;
 
+  uint32 next_unique_id_;
+
   // The map from PlatformUsbDevices to UsbDevices.
   typedef std::map<PlatformUsbDevice, scoped_refptr<UsbDevice> > DeviceMap;
   DeviceMap devices_;