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

Side by Side Diff: device/usb/mojo/device_manager_impl.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, 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 unified diff | Download patch
« no previous file with comments | « no previous file | device/usb/usb_device_filter.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "device/usb/mojo/device_manager_impl.h" 5 #include "device/usb/mojo/device_manager_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <utility> 10 #include <utility>
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 void DeviceManagerImpl::OnGetDevices( 84 void DeviceManagerImpl::OnGetDevices(
85 EnumerationOptionsPtr options, 85 EnumerationOptionsPtr options,
86 const GetDevicesCallback& callback, 86 const GetDevicesCallback& callback,
87 const std::vector<scoped_refptr<UsbDevice>>& devices) { 87 const std::vector<scoped_refptr<UsbDevice>>& devices) {
88 std::vector<UsbDeviceFilter> filters; 88 std::vector<UsbDeviceFilter> filters;
89 if (options && options->filters) 89 if (options && options->filters)
90 filters = mojo::ConvertTo<std::vector<UsbDeviceFilter>>(*options->filters); 90 filters = mojo::ConvertTo<std::vector<UsbDeviceFilter>>(*options->filters);
91 91
92 std::vector<DeviceInfoPtr> device_infos; 92 std::vector<DeviceInfoPtr> device_infos;
93 for (const auto& device : devices) { 93 for (const auto& device : devices) {
94 if (filters.empty() || UsbDeviceFilter::MatchesAny(device, filters)) { 94 if (UsbDeviceFilter::MatchesAny(device, filters)) {
95 if (permission_provider_ && 95 if (permission_provider_ &&
96 permission_provider_->HasDevicePermission(device)) { 96 permission_provider_->HasDevicePermission(device)) {
97 device_infos.push_back(DeviceInfo::From(*device)); 97 device_infos.push_back(DeviceInfo::From(*device));
98 } 98 }
99 } 99 }
100 } 100 }
101 101
102 callback.Run(std::move(device_infos)); 102 callback.Run(std::move(device_infos));
103 } 103 }
104 104
105 void DeviceManagerImpl::OnDeviceAdded(scoped_refptr<UsbDevice> device) { 105 void DeviceManagerImpl::OnDeviceAdded(scoped_refptr<UsbDevice> device) {
106 if (client_ && permission_provider_ && 106 if (client_ && permission_provider_ &&
107 permission_provider_->HasDevicePermission(device)) 107 permission_provider_->HasDevicePermission(device))
108 client_->OnDeviceAdded(DeviceInfo::From(*device)); 108 client_->OnDeviceAdded(DeviceInfo::From(*device));
109 } 109 }
110 110
111 void DeviceManagerImpl::OnDeviceRemoved(scoped_refptr<UsbDevice> device) { 111 void DeviceManagerImpl::OnDeviceRemoved(scoped_refptr<UsbDevice> device) {
112 if (client_ && permission_provider_ && 112 if (client_ && permission_provider_ &&
113 permission_provider_->HasDevicePermission(device)) 113 permission_provider_->HasDevicePermission(device))
114 client_->OnDeviceRemoved(DeviceInfo::From(*device)); 114 client_->OnDeviceRemoved(DeviceInfo::From(*device));
115 } 115 }
116 116
117 void DeviceManagerImpl::WillDestroyUsbService() { 117 void DeviceManagerImpl::WillDestroyUsbService() {
118 delete this; 118 delete this;
119 } 119 }
120 120
121 } // namespace usb 121 } // namespace usb
122 } // namespace device 122 } // namespace device
OLDNEW
« no previous file with comments | « no previous file | device/usb/usb_device_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698