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

fix: select-usb-device should respect filters option
electron · Jan 31, 2024 · e4d5dc1 · e4d5dc1
1 parent 6df3443
commit e4d5dc1
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/shell/browser/usb/usb_chooser_controller.cc b/shell/browser/usb/usb_chooser_controller.cc
@@ -120,6 +120,14 @@ void UsbChooserController::GotUsbDeviceList(
     auto* rfh = content::RenderFrameHost::FromID(render_frame_host_id_);
     v8::Isolate* isolate = JavascriptEnvironment::GetIsolate();
     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)
                                         .Set("deviceList", devices)
                                         .Set("frame", rfh)