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

Side by Side Diff: device/usb/mojo/device_manager_impl.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 unified diff | Download patch
« no previous file with comments | « chrome/browser/usb/usb_chooser_controller.cc ('k') | device/usb/usb_device_filter.h » ('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 <string>
10 #include <utility> 11 #include <utility>
12 #include <vector>
11 13
12 #include "base/bind.h" 14 #include "base/bind.h"
13 #include "base/memory/ptr_util.h" 15 #include "base/memory/ptr_util.h"
14 #include "device/base/device_client.h" 16 #include "device/base/device_client.h"
15 #include "device/usb/mojo/device_impl.h" 17 #include "device/usb/mojo/device_impl.h"
16 #include "device/usb/mojo/permission_provider.h" 18 #include "device/usb/mojo/permission_provider.h"
17 #include "device/usb/mojo/type_converters.h" 19 #include "device/usb/mojo/type_converters.h"
18 #include "device/usb/public/interfaces/device.mojom.h" 20 #include "device/usb/public/interfaces/device.mojom.h"
19 #include "device/usb/usb_device.h" 21 #include "device/usb/usb_device.h"
20 #include "device/usb/usb_device_filter.h" 22 #include "device/usb/usb_device_filter.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 void DeviceManagerImpl::OnGetDevices( 87 void DeviceManagerImpl::OnGetDevices(
86 EnumerationOptionsPtr options, 88 EnumerationOptionsPtr options,
87 const GetDevicesCallback& callback, 89 const GetDevicesCallback& callback,
88 const std::vector<scoped_refptr<UsbDevice>>& devices) { 90 const std::vector<scoped_refptr<UsbDevice>>& devices) {
89 std::vector<UsbDeviceFilter> filters; 91 std::vector<UsbDeviceFilter> filters;
90 if (options && options->filters) 92 if (options && options->filters)
91 filters.swap(*options->filters); 93 filters.swap(*options->filters);
92 94
93 std::vector<DeviceInfoPtr> device_infos; 95 std::vector<DeviceInfoPtr> device_infos;
94 for (const auto& device : devices) { 96 for (const auto& device : devices) {
95 if (UsbDeviceFilter::MatchesAny(device, filters)) { 97 if (UsbDeviceFilter::MatchesAny(*device, filters)) {
96 if (permission_provider_ && 98 if (permission_provider_ &&
97 permission_provider_->HasDevicePermission(device)) { 99 permission_provider_->HasDevicePermission(device)) {
98 device_infos.push_back(DeviceInfo::From(*device)); 100 device_infos.push_back(DeviceInfo::From(*device));
99 } 101 }
100 } 102 }
101 } 103 }
102 104
103 callback.Run(std::move(device_infos)); 105 callback.Run(std::move(device_infos));
104 } 106 }
105 107
106 void DeviceManagerImpl::OnDeviceAdded(scoped_refptr<UsbDevice> device) { 108 void DeviceManagerImpl::OnDeviceAdded(scoped_refptr<UsbDevice> device) {
107 if (client_ && permission_provider_ && 109 if (client_ && permission_provider_ &&
108 permission_provider_->HasDevicePermission(device)) 110 permission_provider_->HasDevicePermission(device))
109 client_->OnDeviceAdded(DeviceInfo::From(*device)); 111 client_->OnDeviceAdded(DeviceInfo::From(*device));
110 } 112 }
111 113
112 void DeviceManagerImpl::OnDeviceRemoved(scoped_refptr<UsbDevice> device) { 114 void DeviceManagerImpl::OnDeviceRemoved(scoped_refptr<UsbDevice> device) {
113 if (client_ && permission_provider_ && 115 if (client_ && permission_provider_ &&
114 permission_provider_->HasDevicePermission(device)) 116 permission_provider_->HasDevicePermission(device))
115 client_->OnDeviceRemoved(DeviceInfo::From(*device)); 117 client_->OnDeviceRemoved(DeviceInfo::From(*device));
116 } 118 }
117 119
118 void DeviceManagerImpl::WillDestroyUsbService() { 120 void DeviceManagerImpl::WillDestroyUsbService() {
119 delete this; 121 delete this;
120 } 122 }
121 123
122 } // namespace usb 124 } // namespace usb
123 } // namespace device 125 } // namespace device
OLDNEW
« no previous file with comments | « chrome/browser/usb/usb_chooser_controller.cc ('k') | device/usb/usb_device_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698