| Index: chrome/browser/usb/usb_chooser_controller.cc
|
| diff --git a/chrome/browser/usb/usb_chooser_controller.cc b/chrome/browser/usb/usb_chooser_controller.cc
|
| index c5fcfffb9a5cd5eafdafe4f7403585b9597f5080..3bc7d435a32a4920155f8a15a856569a98c0d769 100644
|
| --- a/chrome/browser/usb/usb_chooser_controller.cc
|
| +++ b/chrome/browser/usb/usb_chooser_controller.cc
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
|
| +#include "chrome/browser/usb/usb_blocklist.h"
|
| #include "chrome/browser/usb/usb_chooser_context.h"
|
| #include "chrome/browser/usb/usb_chooser_context_factory.h"
|
| #include "chrome/browser/usb/web_usb_histograms.h"
|
| @@ -223,6 +224,7 @@ void UsbChooserController::GotUsbDeviceList(
|
| bool UsbChooserController::DisplayDevice(
|
| scoped_refptr<device::UsbDevice> device) const {
|
| return device::UsbDeviceFilter::MatchesAny(device, filters_) &&
|
| + !UsbBlocklist::Get().IsExcluded(device) &&
|
| (base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| switches::kDisableWebUsbSecurity) ||
|
| device::FindInWebUsbAllowedOrigins(
|
|
|