Skip to content

Commit

Permalink
chore comments from review
Browse files Browse the repository at this point in the history
  • Loading branch information
codebytere committed Sep 26, 2022
1 parent f50036a commit be1dcd8
Showing 1 changed file with 6 additions and 12 deletions.
18 changes: 6 additions & 12 deletions shell/browser/serial/serial_chooser_context.cc
Expand Up @@ -123,7 +123,7 @@ bool SerialChooserContext::HasPortPermission(
content::RenderFrameHost* render_frame_host) {
auto it = ephemeral_ports_.find(origin);
if (it != ephemeral_ports_.end()) {
const std::set<base::UnguessableToken> ports = it->second;
const std::set<base::UnguessableToken>& ports = it->second;
if (base::Contains(ports, port.token))
return true;
}
Expand Down Expand Up @@ -233,18 +233,13 @@ void SerialChooserContext::OnPortRemoved(
for (auto& observer : port_observer_list_)
observer.OnPortRemoved(*port);

std::vector<url::Origin> revoked_origins;
for (auto& map_entry : ephemeral_ports_) {
std::set<base::UnguessableToken>& ports = map_entry.second;
if (ports.erase(port->token) > 0) {
revoked_origins.push_back(map_entry.first);
}
}

port_info_.erase(port->token);
// Revoke the ephemeral ports, but keep the keys here to notify observers.
decltype(ephemeral_ports_) revoked_ports;
std::swap(ephemeral_ports_, revoked_ports);

// Notify observers that all ephemeral permissions have been revoked.
for (auto& observer : port_observer_list_) {
for (const auto& origin : revoked_origins) {
for (const auto& [origin, ports] : revoked_ports) {
observer.OnPermissionRevoked(origin);
}
}
Expand Down Expand Up @@ -297,5 +292,4 @@ void SerialChooserContext::OnPortManagerConnectionError() {
observer.OnPermissionRevoked(origin);
}
}

} // namespace electron

0 comments on commit be1dcd8

Please sign in to comment.