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

Side by Side Diff: device/bluetooth/bluetooth_adapter_win.cc

Issue 1284073002: bluetooth: Add adapter to BluetoothDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bt-drop-callback-
Patch Set: Updated patchset dependency Created 5 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 unified diff | Download patch
OLDNEW
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 <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 247 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 base::STLSetDifference<DeviceAddressSet>(new_devices, known_devices); 258 base::STLSetDifference<DeviceAddressSet>(new_devices, known_devices);
259 DeviceAddressSet changed_devices = 259 DeviceAddressSet changed_devices =
260 base::STLSetIntersection<DeviceAddressSet>(known_devices, new_devices); 260 base::STLSetIntersection<DeviceAddressSet>(known_devices, new_devices);
261 for (ScopedVector<BluetoothTaskManagerWin::DeviceState>::const_iterator iter = 261 for (ScopedVector<BluetoothTaskManagerWin::DeviceState>::const_iterator iter =
262 devices.begin(); 262 devices.begin();
263 iter != devices.end(); 263 iter != devices.end();
264 ++iter) { 264 ++iter) {
265 BluetoothTaskManagerWin::DeviceState* device_state = (*iter); 265 BluetoothTaskManagerWin::DeviceState* device_state = (*iter);
266 if (added_devices.find(device_state->address) != added_devices.end()) { 266 if (added_devices.find(device_state->address) != added_devices.end()) {
267 BluetoothDeviceWin* device_win = 267 BluetoothDeviceWin* device_win =
268 new BluetoothDeviceWin(*device_state, 268 new BluetoothDeviceWin(this, *device_state, ui_task_runner_,
269 ui_task_runner_, 269 socket_thread_, NULL, net::NetLog::Source());
270 socket_thread_,
271 NULL,
272 net::NetLog::Source());
273 devices_[device_state->address] = device_win; 270 devices_[device_state->address] = device_win;
274 FOR_EACH_OBSERVER(BluetoothAdapter::Observer, 271 FOR_EACH_OBSERVER(BluetoothAdapter::Observer,
275 observers_, 272 observers_,
276 DeviceAdded(this, device_win)); 273 DeviceAdded(this, device_win));
277 } else if (changed_devices.find(device_state->address) != 274 } else if (changed_devices.find(device_state->address) !=
278 changed_devices.end()) { 275 changed_devices.end()) {
279 BluetoothDeviceWin* device_win = 276 BluetoothDeviceWin* device_win =
280 static_cast<BluetoothDeviceWin*>(devices_[device_state->address]); 277 static_cast<BluetoothDeviceWin*>(devices_[device_state->address]);
281 if (!device_win->IsEqual(*device_state)) { 278 if (!device_win->IsEqual(*device_state)) {
282 device_win->Update(*device_state); 279 device_win->Update(*device_state);
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 num_discovery_listeners_ -= on_stop_discovery_callbacks_.size(); 362 num_discovery_listeners_ -= on_stop_discovery_callbacks_.size();
366 on_stop_discovery_callbacks_.clear(); 363 on_stop_discovery_callbacks_.clear();
367 return; 364 return;
368 } 365 }
369 366
370 discovery_status_ = DISCOVERY_STOPPING; 367 discovery_status_ = DISCOVERY_STOPPING;
371 task_manager_->PostStopDiscoveryTask(); 368 task_manager_->PostStopDiscoveryTask();
372 } 369 }
373 370
374 } // namespace device 371 } // namespace device
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698