github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-01-27 16:28:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11492 from timmyhadwen/master

Browse Source 
Fixed Bluetooth chooser bug. Closes #11399
This commit is contained in:
Cheng Zhao
2018-02-05 20:44:42 +09:00
committed by GitHub
parent 8ac52b418b a6bab71215
commit 42fa018277
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
atom/browser/lib/bluetooth_chooser.cc
View File

@@ -97,6 +97,17 @@ void BluetoothChooser::AddOrUpdateDevice(const std::string& device_id,
int signal_strength_level) {
DeviceInfo info = {device_id, device_name};
device_list_.push_back(info);
// Emit a select-bluetooth-device handler to allow for user to listen for
// bluetooth device found.
bool prevent_default = api_web_contents_->Emit("select-bluetooth-device",
device_list_, base::Bind(&OnDeviceChosen, event_handler_));
// If emit not implimented select first device that matches the filters
// provided.
if (!prevent_default) {
event_handler_.Run(Event::SELECTED, device_id);
}
}
void BluetoothChooser::RemoveDevice(const std::string& device_id) {