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

Unified Diff: device/usb/usb_device.h

Issue 1369643002: Add configuration and interface permission checks to DeviceImpl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add new method ot Android USB mocks. Created 5 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
Index: device/usb/usb_device.h
diff --git a/device/usb/usb_device.h b/device/usb/usb_device.h
index 64fa6810f44cbf98c87ec8d0dc45fa95ce79c8e0..beb78036e57d92f9df47939df0ca58de760cc580 100644
--- a/device/usb/usb_device.h
+++ b/device/usb/usb_device.h
@@ -44,6 +44,9 @@ class UsbDevice : public base::RefCountedThreadSafe<UsbDevice> {
return webusb_allowed_origins_.get();
}
const GURL& webusb_landing_page() const { return webusb_landing_page_; }
+ const std::vector<UsbConfigDescriptor>& configurations() const {
+ return configurations_;
+ }
// On ChromeOS the permission_broker service is used to change the ownership
// of USB device nodes so that Chrome can open them. On other platforms these
@@ -61,11 +64,6 @@ class UsbDevice : public base::RefCountedThreadSafe<UsbDevice> {
// if the device is unconfigured.
virtual const UsbConfigDescriptor* GetActiveConfiguration() = 0;
- // Gets all of the device's UsbConfigDescriptors.
- const std::vector<UsbConfigDescriptor>& configurations() const {
- return configurations_;
- }
-
protected:
UsbDevice(uint16_t vendor_id,
uint16_t product_id,

Powered by Google App Engine
This is Rietveld 408576698