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

fix: don't observe WebUSB for in-memory partitions (#42461)

Browse source 
Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
trop[bot] 2024-06-12 14:50:24 -05:00 committed by GitHub
parent 95e2105283
commit 987e1828d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
shell/browser/hid/electron_hid_delegate.cc
View file

@ -46,8 +46,8 @@ class ElectronHidDelegate::ContextObservation
ContextObservation(ElectronHidDelegate* parent, ContextObservation(ElectronHidDelegate* parent,
content::BrowserContext* browser_context) content::BrowserContext* browser_context)
: parent_(parent), browser_context_(browser_context) { : parent_(parent), browser_context_(browser_context) {
auto* chooser_context = GetChooserContext(browser_context_); if (auto* chooser_context = GetChooserContext(browser_context_))
device_observation_.Observe(chooser_context); device_observation_.Observe(chooser_context);
} }
ContextObservation(ContextObservation&) = delete; ContextObservation(ContextObservation&) = delete;

3
shell/browser/usb/electron_usb_delegate.cc
View file

@ -94,7 +94,8 @@ class ElectronUsbDelegate::ContextObservation
content::BrowserContext* browser_context) content::BrowserContext* browser_context)
: parent_(parent), browser_context_(browser_context) { : parent_(parent), browser_context_(browser_context) {
auto* chooser_context = GetChooserContext(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(ContextObservation&) = delete;
ContextObservation& operator=(ContextObservation&) = delete; ContextObservation& operator=(ContextObservation&) = delete;