OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bluetooth/bluetooth_adapter_win.h" | 5 #include "device/bluetooth/bluetooth_adapter_win.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
(...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
220 for (auto& observer : observers_) | 220 for (auto& observer : observers_) |
221 observer.AdapterPoweredChanged(this, powered_); | 221 observer.AdapterPoweredChanged(this, powered_); |
222 } | 222 } |
223 if (!initialized_) { | 223 if (!initialized_) { |
224 initialized_ = true; | 224 initialized_ = true; |
225 init_callback_.Run(); | 225 init_callback_.Run(); |
226 } | 226 } |
227 } | 227 } |
228 | 228 |
229 void BluetoothAdapterWin::DevicesPolled( | 229 void BluetoothAdapterWin::DevicesPolled( |
230 const ScopedVector<BluetoothTaskManagerWin::DeviceState>& devices) { | 230 const std::vector<std::unique_ptr<BluetoothTaskManagerWin::DeviceState>>& |
231 devices) { | |
231 DCHECK(thread_checker_.CalledOnValidThread()); | 232 DCHECK(thread_checker_.CalledOnValidThread()); |
232 | 233 |
233 // We are receiving a new list of all devices known to the system. Merge this | 234 // We are receiving a new list of all devices known to the system. Merge this |
234 // new list with the list we know of (|devices_|) and raise corresponding | 235 // new list with the list we know of (|devices_|) and raise corresponding |
235 // DeviceAdded, DeviceRemoved and DeviceChanged events. | 236 // DeviceAdded, DeviceRemoved and DeviceChanged events. |
236 | 237 |
237 typedef std::set<std::string> DeviceAddressSet; | 238 using DeviceAddressSet = std::set<std::string>; |
238 DeviceAddressSet known_devices; | 239 DeviceAddressSet known_devices; |
239 for (DevicesMap::const_iterator iter = devices_.begin(); | 240 for (DevicesMap::const_iterator iter = devices_.begin(); |
240 iter != devices_.end(); | 241 iter != devices_.end(); |
241 ++iter) { | 242 ++iter) { |
242 known_devices.insert((*iter).first); | 243 known_devices.insert((*iter).first); |
243 } | 244 } |
244 | 245 |
245 DeviceAddressSet new_devices; | 246 DeviceAddressSet new_devices; |
246 for (ScopedVector<BluetoothTaskManagerWin::DeviceState>::const_iterator iter = | 247 for (auto& device : devices) { |
247 devices.begin(); | 248 new_devices.insert(device->address); |
248 iter != devices.end(); | |
249 ++iter) { | |
250 new_devices.insert((*iter)->address); | |
251 } | 249 } |
252 | 250 |
253 // Process device removal first | 251 // Process device removal first |
254 DeviceAddressSet removed_devices = | 252 DeviceAddressSet removed_devices = |
255 base::STLSetDifference<DeviceAddressSet>(known_devices, new_devices); | 253 base::STLSetDifference<DeviceAddressSet>(known_devices, new_devices); |
256 for (DeviceAddressSet::const_iterator iter = removed_devices.begin(); | 254 for (DeviceAddressSet::const_iterator iter = removed_devices.begin(); |
257 iter != removed_devices.end(); | 255 iter != removed_devices.end(); |
258 ++iter) { | 256 ++iter) { |
259 std::unique_ptr<BluetoothDevice> device_win = | 257 auto found = devices_.find(*iter); |
260 devices_.take_and_erase(*iter); | 258 if (found == devices_.end()) { |
259 continue; | |
260 } | |
Reilly Grant (use Gerrit)
2016/12/21 22:25:13
nit: no curly braces around single-line ifs.
dougt
2016/12/22 01:18:02
Done.
| |
261 auto device_win = std::move(found->second); | |
262 devices_.erase(*iter); | |
261 for (auto& observer : observers_) | 263 for (auto& observer : observers_) |
262 observer.DeviceRemoved(this, device_win.get()); | 264 observer.DeviceRemoved(this, device_win.get()); |
263 } | 265 } |
264 | 266 |
265 // Process added and (maybe) changed devices in one pass | 267 // Process added and (maybe) changed devices in one pass |
266 DeviceAddressSet added_devices = | 268 DeviceAddressSet added_devices = |
267 base::STLSetDifference<DeviceAddressSet>(new_devices, known_devices); | 269 base::STLSetDifference<DeviceAddressSet>(new_devices, known_devices); |
268 DeviceAddressSet changed_devices = | 270 DeviceAddressSet changed_devices = |
269 base::STLSetIntersection<DeviceAddressSet>(known_devices, new_devices); | 271 base::STLSetIntersection<DeviceAddressSet>(known_devices, new_devices); |
270 for (ScopedVector<BluetoothTaskManagerWin::DeviceState>::const_iterator iter = | 272 for (auto& device_state : devices) { |
271 devices.begin(); | |
272 iter != devices.end(); | |
273 ++iter) { | |
274 BluetoothTaskManagerWin::DeviceState* device_state = (*iter); | |
275 if (added_devices.find(device_state->address) != added_devices.end()) { | 273 if (added_devices.find(device_state->address) != added_devices.end()) { |
276 BluetoothDeviceWin* device_win = | 274 auto device_win = |
Reilly Grant (use Gerrit)
2016/12/21 22:25:13
auto*, in clang we have a plugin that prevents aut
dougt
2016/12/22 01:18:02
Done.
| |
277 new BluetoothDeviceWin(this, *device_state, ui_task_runner_, | 275 new BluetoothDeviceWin(this, *device_state, ui_task_runner_, |
278 socket_thread_, NULL, net::NetLogSource()); | 276 socket_thread_, NULL, net::NetLogSource()); |
279 devices_.set(device_state->address, | 277 auto insertion = devices_.insert( |
280 std::unique_ptr<BluetoothDevice>(device_win)); | 278 std::make_pair(device_state->address, std::move(device_win))); |
279 if (!insertion.second) | |
280 continue; | |
Reilly Grant (use Gerrit)
2016/12/21 22:25:13
The previous code used set and so didn't care abou
dougt
2016/12/22 01:18:02
Sadly, I need insert() instead of set because I wa
| |
281 for (auto& observer : observers_) | 281 for (auto& observer : observers_) |
282 observer.DeviceAdded(this, device_win); | 282 observer.DeviceAdded(this, insertion.first->second.get()); |
283 } else if (changed_devices.find(device_state->address) != | 283 } else if (changed_devices.find(device_state->address) != |
284 changed_devices.end()) { | 284 changed_devices.end()) { |
285 DevicesMap::const_iterator iter = devices_.find(device_state->address); | 285 DevicesMap::const_iterator iter = devices_.find(device_state->address); |
286 DCHECK(iter != devices_.end()); | 286 DCHECK(iter != devices_.end()); |
287 BluetoothDeviceWin* device_win = | 287 BluetoothDeviceWin* device_win = |
288 static_cast<BluetoothDeviceWin*>(iter->second); | 288 static_cast<BluetoothDeviceWin*>(iter->second.get()); |
289 if (!device_win->IsEqual(*device_state)) { | 289 if (!device_win->IsEqual(*device_state)) { |
290 device_win->Update(*device_state); | 290 device_win->Update(*device_state); |
291 for (auto& observer : observers_) | 291 for (auto& observer : observers_) |
292 observer.DeviceChanged(this, device_win); | 292 observer.DeviceChanged(this, device_win); |
293 } | 293 } |
294 // Above IsEqual returns true if device name, address, status and services | 294 // Above IsEqual returns true if device name, address, status and services |
295 // (primary services of BLE device) are the same. However, in BLE tests, | 295 // (primary services of BLE device) are the same. However, in BLE tests, |
296 // we may simulate characteristic, descriptor and secondary GATT service | 296 // we may simulate characteristic, descriptor and secondary GATT service |
297 // after device has been initialized. | 297 // after device has been initialized. |
298 if (force_update_device_for_test_) | 298 if (force_update_device_for_test_) |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
380 num_discovery_listeners_ -= on_stop_discovery_callbacks_.size(); | 380 num_discovery_listeners_ -= on_stop_discovery_callbacks_.size(); |
381 on_stop_discovery_callbacks_.clear(); | 381 on_stop_discovery_callbacks_.clear(); |
382 return; | 382 return; |
383 } | 383 } |
384 | 384 |
385 discovery_status_ = DISCOVERY_STOPPING; | 385 discovery_status_ = DISCOVERY_STOPPING; |
386 task_manager_->PostStopDiscoveryTask(); | 386 task_manager_->PostStopDiscoveryTask(); |
387 } | 387 } |
388 | 388 |
389 } // namespace device | 389 } // namespace device |
OLD | NEW |