From c519ee59b2e77668b5f0f6104195ff865c5250f2 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 15:04:46 -0500 Subject: [PATCH] fix: don't observe WebUSB for in-memory partitions (#42462) Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr --- shell/browser/hid/electron_hid_delegate.cc | 4 ++-- shell/browser/usb/electron_usb_delegate.cc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/shell/browser/hid/electron_hid_delegate.cc b/shell/browser/hid/electron_hid_delegate.cc index 10aa32c41dcf..b7078bf26332 100644 --- a/shell/browser/hid/electron_hid_delegate.cc +++ b/shell/browser/hid/electron_hid_delegate.cc @@ -46,8 +46,8 @@ class ElectronHidDelegate::ContextObservation ContextObservation(ElectronHidDelegate* parent, content::BrowserContext* browser_context) : parent_(parent), browser_context_(browser_context) { - auto* chooser_context = GetChooserContext(browser_context_); - device_observation_.Observe(chooser_context); + if (auto* chooser_context = GetChooserContext(browser_context_)) + device_observation_.Observe(chooser_context); } ContextObservation(ContextObservation&) = delete; diff --git a/shell/browser/usb/electron_usb_delegate.cc b/shell/browser/usb/electron_usb_delegate.cc index 18d833eaf9e0..0f0f6c0a5d4a 100644 --- a/shell/browser/usb/electron_usb_delegate.cc +++ b/shell/browser/usb/electron_usb_delegate.cc @@ -94,7 +94,8 @@ class ElectronUsbDelegate::ContextObservation content::BrowserContext* browser_context) : parent_(parent), browser_context_(browser_context) { auto* chooser_context = GetChooserContext(browser_context_); - device_observation_.Observe(chooser_context); + if (chooser_context) + device_observation_.Observe(chooser_context); } ContextObservation(ContextObservation&) = delete; ContextObservation& operator=(ContextObservation&) = delete;