|
|
We cannot run adapter callbacks inside BluetoothAdapterWin because passing scoped_refptr<BluetoothAdapter>(this) will destroy the adapter itself after the callback is finished.
Instead, bluetooth_adapter_factory.cc maintains a vector of callbacks and they will be run once the adapter is initialized.
I also put Bluetooth API initialization code into bluetooth_init_win.h and bluetooth_init_win.cc. From now on any code that wants to use Windows Bluetooth APIs should just include bluetooth_init_win.h.
BUG= 135470
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=178311
Total comments: 6
Total comments: 1
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+195 lines, -145 lines) |
Patch |
 |
M |
chrome/browser/chromeos/system/ash_system_tray_delegate.cc
|
View
|
1
2
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h
|
View
|
1
2
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/bluetooth/bluetooth_event_router.cc
|
View
|
1
2
|
2 chunks |
+5 lines, -6 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/bluetooth/bluetooth_extension_function.h
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/extensions/api/bluetooth/bluetooth_extension_function.cc
|
View
|
1
2
|
3 chunks |
+7 lines, -9 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc
|
View
|
1
2
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
chrome/common/extensions/permissions/bluetooth_device_permission.cc
|
View
|
1
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_adapter.h
|
View
|
|
3 chunks |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_adapter.cc
|
View
|
|
1 chunk |
+0 lines, -4 lines |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_adapter_chromeos_unittest.cc
|
View
|
1
2
|
29 chunks |
+29 lines, -29 lines |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_adapter_devices_chromeos_unittest.cc
|
View
|
1
2
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_adapter_factory.h
|
View
|
1
2
3
|
1 chunk |
+11 lines, -6 lines |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_adapter_factory.cc
|
View
|
1
2
3
4
|
7 chunks |
+29 lines, -6 lines |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_adapter_win.h
|
View
|
|
3 chunks |
+5 lines, -1 line |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_adapter_win.cc
|
View
|
|
3 chunks |
+8 lines, -2 lines |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_adapter_win_unittest.cc
|
View
|
|
2 chunks |
+18 lines, -2 lines |
0 comments
|
Download
|
 |
D |
device/bluetooth/bluetooth_includes_win.h
|
View
|
1
2
3
|
1 chunk |
+0 lines, -20 lines |
0 comments
|
Download
|
 |
A + |
device/bluetooth/bluetooth_init_win.h
|
View
|
1
2
3
|
2 chunks |
+14 lines, -3 lines |
0 comments
|
Download
|
 |
A |
device/bluetooth/bluetooth_init_win.cc
|
View
|
|
1 chunk |
+45 lines, -0 lines |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_service_record_win.cc
|
View
|
1
2
3
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_task_manager_win.h
|
View
|
|
1 chunk |
+0 lines, -5 lines |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_task_manager_win.cc
|
View
|
1
2
3
|
4 chunks |
+13 lines, -33 lines |
0 comments
|
Download
|
 |
M |
device/bluetooth/bluetooth_task_manager_win_unittest.cc
|
View
|
|
2 chunks |
+2 lines, -1 line |
0 comments
|
Download
|
 |
M |
device/device.gyp
|
View
|
1
2
3
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
Total messages: 16 (0 generated)
|