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

Unified Diff: extensions/browser/api/device_permissions_prompt.cc

Issue 2266153002: Modify UsbDeviceFilter::MatchesAny to return true for empty filters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed code for unit test Created 4 years, 4 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_unittest.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/device_permissions_prompt.cc
diff --git a/extensions/browser/api/device_permissions_prompt.cc b/extensions/browser/api/device_permissions_prompt.cc
index 4a6c0e6186410976c73558a24f2af94662472d6b..96a940f0cc812d7f05afd2f495570f1c86a408b1 100644
--- a/extensions/browser/api/device_permissions_prompt.cc
+++ b/extensions/browser/api/device_permissions_prompt.cc
@@ -126,9 +126,8 @@ class UsbDevicePermissionsPrompt : public DevicePermissionsPrompt::Prompt,
// device::UsbService::Observer implementation:
void OnDeviceAdded(scoped_refptr<UsbDevice> device) override {
- if (!(filters_.empty() || UsbDeviceFilter::MatchesAny(device, filters_))) {
+ if (!UsbDeviceFilter::MatchesAny(device, filters_))
return;
- }
std::unique_ptr<DeviceInfo> device_info(new UsbDeviceInfo(device));
device->CheckUsbAccess(
« no previous file with comments | « device/usb/usb_device_filter_unittest.cc ('k') | extensions/browser/api/usb/usb_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698