mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix: select-usb-device should respect filters option (#41166)

Browse source 
fix: select-usb-device should respect filters option
This commit is contained in:
Shelley Vohr 2024-01-31 15:53:30 +01:00 committed by GitHub
parent 6df3443617
commit e4d5dc138f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
shell/browser/usb/usb_chooser_controller.cc
View file

@ -120,6 +120,14 @@ void UsbChooserController::GotUsbDeviceList(
auto* rfh = content::RenderFrameHost::FromID(render_frame_host_id_); auto* rfh = content::RenderFrameHost::FromID(render_frame_host_id_);
v8::Isolate* isolate = JavascriptEnvironment::GetIsolate(); v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
v8::HandleScope scope(isolate); v8::HandleScope scope(isolate);
// "select-usb-device" should respect |filters|.
devices.erase(std::remove_if(devices.begin(), devices.end(),
[this](const auto& device_info) {
return !DisplayDevice(*device_info);
}),
devices.end());
v8::Local<v8::Object> details = gin::DataObjectBuilder(isolate) v8::Local<v8::Object> details = gin::DataObjectBuilder(isolate)
.Set("deviceList", devices) .Set("deviceList", devices)
.Set("frame", rfh) .Set("frame", rfh)