extensions/browser/api/usb/usb_api.cc - Issue 2266153002: Modify UsbDeviceFilter::MatchesAny to return true for empty filters

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/api/usb/usb_api.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 | « extensions/browser/api/device_permissions_prompt.cc ('k') | extensions/common/api/printer_provider/usb_printer_manifest_data.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/usb/usb_api.cc

diff --git a/extensions/browser/api/usb/usb_api.cc b/extensions/browser/api/usb/usb_api.cc

index 62e4c5adcdf8056d023eb7d87a8fcf5a94fa6faf..2ece8932ad2ed78f1a9314df2afc651a6c3677d9 100644

--- a/extensions/browser/api/usb/usb_api.cc

+++ b/extensions/browser/api/usb/usb_api.cc

@@ -595,7 +595,7 @@ void UsbGetDevicesFunction::OnGetDevicesComplete(

std::unique_ptr<base::ListValue> result(new base::ListValue());

UsbGuidMap* guid_map = UsbGuidMap::Get(browser_context());

for (const scoped_refptr<UsbDevice>& device : devices) {

- if ((filters_.empty() || UsbDeviceFilter::MatchesAny(device, filters_)) &&

+ if (UsbDeviceFilter::MatchesAny(device, filters_) &&

HasDevicePermission(device)) {

Device api_device;

guid_map->GetApiDevice(device, &api_device);