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

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

Issue 1098823003: Separate USB device permissions prompt logic into subclasses. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address jyasskin@'s comments. Created 5 years, 8 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 | « extensions/browser/api/device_permissions_prompt.cc ('k') | extensions/browser/api/usb/usb_api.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/api/usb/usb_api.h
diff --git a/extensions/browser/api/usb/usb_api.h b/extensions/browser/api/usb/usb_api.h
index c7ab6c3c33fb5189573906a69906101f15cfd6b5..c06c5577d6ed87f476338272c9ec39408010414e 100644
--- a/extensions/browser/api/usb/usb_api.h
+++ b/extensions/browser/api/usb/usb_api.h
@@ -14,7 +14,6 @@
#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/device_permissions_prompt.h"
#include "extensions/browser/extension_function.h"
#include "extensions/common/api/usb.h"
#include "net/base/io_buffer.h"
@@ -23,6 +22,7 @@ namespace extensions {
class DevicePermissionEntry;
class DevicePermissions;
+class DevicePermissionsPrompt;
class DevicePermissionsManager;
class UsbDeviceResource;
@@ -108,9 +108,7 @@ class UsbGetDevicesFunction : public UsbPermissionCheckingFunction {
DISALLOW_COPY_AND_ASSIGN(UsbGetDevicesFunction);
};
-class UsbGetUserSelectedDevicesFunction
- : public UIThreadExtensionFunction,
- public DevicePermissionsPrompt::Delegate {
+class UsbGetUserSelectedDevicesFunction : public UIThreadExtensionFunction {
public:
DECLARE_EXTENSION_FUNCTION("usb.getUserSelectedDevices",
USB_GETUSERSELECTEDDEVICES)
@@ -123,8 +121,8 @@ class UsbGetUserSelectedDevicesFunction
// ExtensionFunction:
ResponseAction Run() override;
- void OnUsbDevicesChosen(
- const std::vector<scoped_refptr<device::UsbDevice>>& devices) override;
+ void OnDevicesChosen(
+ const std::vector<scoped_refptr<device::UsbDevice>>& devices);
scoped_ptr<DevicePermissionsPrompt> prompt_;
« no previous file with comments | « extensions/browser/api/device_permissions_prompt.cc ('k') | extensions/browser/api/usb/usb_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698