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

fix: properly fire serial-port-added and serial-port-removed events (#34958)

Browse source 
Based on 2309652: [webhid] Notify chooser context observers on shutdown | 2309652
This commit is contained in:
John Kleinschmidt 2022-07-25 10:50:19 -04:00 • committed by GitHub
parent aeba6ca973
commit 648c9934c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 71 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

14
shell/browser/serial/serial_chooser_context.cc
View file

@ -90,11 +90,13 @@ base::Value PortInfoToValue(const device::mojom::SerialPortInfo& port) {
SerialChooserContext::SerialChooserContext(ElectronBrowserContext* context)
: browser_context_(context) {}
SerialChooserContext::~SerialChooserContext() = default;
void SerialChooserContext::OnPermissionRevoked(const url::Origin& origin) {
for (auto& observer : port_observer_list_)
observer.OnPermissionRevoked(origin);
SerialChooserContext::~SerialChooserContext() {
// Notify observers that the chooser context is about to be destroyed.
// Observers must remove themselves from the observer lists.
for (auto& observer : port_observer_list_) {
observer.OnSerialChooserContextShutdown();
DCHECK(!port_observer_list_.HasObserver(&observer));
}
}
void SerialChooserContext::GrantPortPermission(
@ -127,8 +129,6 @@ void SerialChooserContext::RevokePortPermissionWebInitiated(
auto it = port_info_.find(token);
if (it == port_info_.end())
return;
return OnPermissionRevoked(origin);
}
// static