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

Unified Diff: device/usb/usb_device_filter.cc

Issue 2727633004: Change UsbDeviceFilter to use const references instead of (Closed)
Patch Set: Fix callsite missed earlier due to not building for CrOS Created 3 years, 9 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 | « device/usb/usb_device_filter.h ('k') | device/usb/usb_device_filter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/usb/usb_device_filter.cc
diff --git a/device/usb/usb_device_filter.cc b/device/usb/usb_device_filter.cc
index 82f0a43de48c9383944bcc6d3cb2bab05d521452..3d6372284209356093d04a0cfd0b5b327d627396 100644
--- a/device/usb/usb_device_filter.cc
+++ b/device/usb/usb_device_filter.cc
@@ -31,22 +31,22 @@ UsbDeviceFilter::UsbDeviceFilter(const UsbDeviceFilter& other) = default;
UsbDeviceFilter::~UsbDeviceFilter() = default;
-bool UsbDeviceFilter::Matches(scoped_refptr<UsbDevice> device) const {
+bool UsbDeviceFilter::Matches(const UsbDevice& device) const {
if (vendor_id) {
- if (device->vendor_id() != *vendor_id)
+ if (device.vendor_id() != *vendor_id)
return false;
- if (product_id && device->product_id() != *product_id)
+ if (product_id && device.product_id() != *product_id)
return false;
}
if (serial_number &&
- device->serial_number() != base::UTF8ToUTF16(*serial_number)) {
+ device.serial_number() != base::UTF8ToUTF16(*serial_number)) {
return false;
}
if (interface_class) {
- for (const UsbConfigDescriptor& config : device->configurations()) {
+ for (const UsbConfigDescriptor& config : device.configurations()) {
for (const UsbInterfaceDescriptor& iface : config.interfaces) {
if (iface.interface_class == *interface_class &&
(!interface_subclass ||
@@ -86,7 +86,7 @@ std::unique_ptr<base::Value> UsbDeviceFilter::ToValue() const {
}
// static
-bool UsbDeviceFilter::MatchesAny(scoped_refptr<UsbDevice> device,
+bool UsbDeviceFilter::MatchesAny(const UsbDevice& device,
const std::vector<UsbDeviceFilter>& filters) {
if (filters.empty())
return true;
« no previous file with comments | « device/usb/usb_device_filter.h ('k') | device/usb/usb_device_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698