Add getUserSelectedDevices to the USB extensions API.

extensions/browser/api/usb/usb_api.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef EXTENSIONS_BROWSER_API_USB_USB_API_H_
 #define EXTENSIONS_BROWSER_API_USB_USB_API_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "device/usb/usb_device.h"
 #include "device/usb/usb_device_filter.h"
 #include "device/usb/usb_device_handle.h"
 #include "extensions/browser/api/api_resource_manager.h"
 #include "extensions/browser/api/async_api_function.h"
+#include "extensions/browser/api/device_permissions_prompt.h"
 #include "extensions/common/api/usb.h"
 #include "net/base/io_buffer.h"
 
 namespace extensions {
 
+class DevicePermissions;
 class UsbDeviceResource;
 
 class UsbAsyncApiFunction : public AsyncApiFunction {
  public:
   UsbAsyncApiFunction();
 
  protected:
   virtual ~UsbAsyncApiFunction();
 
   virtual bool PrePrepare() override;
   virtual bool Respond() override;
 
-  static void CreateDeviceFilter(
-      const extensions::core_api::usb::DeviceFilter& input,
-      device::UsbDeviceFilter* output);
-
   bool HasDevicePermission(scoped_refptr<device::UsbDevice> device);
-
   scoped_refptr<device::UsbDevice> GetDeviceOrCompleteWithError(
       const extensions::core_api::usb::Device& input_device);
-
   scoped_refptr<device::UsbDeviceHandle> GetDeviceHandleOrCompleteWithError(
       const extensions::core_api::usb::ConnectionHandle& input_device_handle);
 
   void RemoveUsbDeviceResource(int api_resource_id);
 
   void CompleteWithError(const std::string& error);
 
   ApiResourceManager<UsbDeviceResource>* manager_;
+  scoped_ptr<DevicePermissions> device_permissions_;
 };
 
 class UsbAsyncApiTransferFunction : public UsbAsyncApiFunction {
  protected:
   UsbAsyncApiTransferFunction();
   virtual ~UsbAsyncApiTransferFunction();
 
   bool ConvertDirectionSafely(const extensions::core_api::usb::Direction& input,
                               device::UsbEndpointDirection* output);
   bool ConvertRequestTypeSafely(
@@ skipping 34 matching lines @@
 
   UsbGetDevicesFunction();
 
   virtual bool Prepare() override;
   virtual void AsyncWorkStart() override;
 
  protected:
   virtual ~UsbGetDevicesFunction();
 
  private:
-  void EnumerationCompletedFileThread(
-      scoped_ptr<std::vector<scoped_refptr<device::UsbDevice> > > devices);
+  scoped_ptr<extensions::core_api::usb::GetDevices::Params> parameters_;
+};
 
-  scoped_ptr<extensions::core_api::usb::GetDevices::Params> parameters_;
+class UsbGetUserSelectedDevicesFunction
+    : public UIThreadExtensionFunction,
+      public DevicePermissionsPrompt::Delegate {
+ public:
+  DECLARE_EXTENSION_FUNCTION("usb.getUserSelectedDevices",
+                             USB_GETUSERSELECTEDDEVICES)
+
+  UsbGetUserSelectedDevicesFunction();
+
+ protected:
+  virtual ~UsbGetUserSelectedDevicesFunction();
+  virtual ResponseAction Run() override;
+
+ private:
+  virtual void UsbDevicesChosen(
+      const std::vector<scoped_refptr<device::UsbDevice>>& devices) override;

[Finnur, 2014/10/15 09:33:08]

style: s/>>/> >/

[Reilly Grant (use Gerrit), 2014/10/15 19:12:43]

clang-format has been updated to prefer the no-spaces style.

+
+  std::vector<uint32> device_ids_;
+  std::vector<scoped_refptr<device::UsbDevice>> devices_;

[Finnur, 2014/10/15 09:33:08]

style: s/>>/> >/

+  std::vector<base::string16> serial_numbers_;
 };
 
 class UsbRequestAccessFunction : public UsbAsyncApiFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("usb.requestAccess", USB_REQUESTACCESS)
 
   UsbRequestAccessFunction();
 
   virtual bool Prepare() override;
   virtual void AsyncWorkStart() override;
@@ skipping 197 matching lines @@
 
   virtual bool Prepare() override;
   virtual void AsyncWorkStart() override;
 
  private:
   scoped_ptr<extensions::core_api::usb::ResetDevice::Params> parameters_;
 };
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_USB_USB_API_H_