github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix ambiguous reference gcc compile error (#35733)

Browse Source 
Co-authored-by: Bruno Pitrus <brunopitrus@hotmail.com>
This commit is contained in:
trop[bot]
2022-09-21 15:15:45 +02:00
committed by GitHub
parent 3f7f4de319
commit 57917c4b5a
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shell/browser/serial/electron_serial_delegate.cc
View File

@@ -68,16 +68,18 @@ device::mojom::SerialPortManager* ElectronSerialDelegate::GetPortManager(
return GetChooserContext(frame)->GetPortManager();
}
void ElectronSerialDelegate::AddObserver(content::RenderFrameHost* frame,
Observer* observer) {
void ElectronSerialDelegate::AddObserver(
content::RenderFrameHost* frame,
content::SerialDelegate::Observer* observer) {
observer_list_.AddObserver(observer);
auto* chooser_context = GetChooserContext(frame);
if (!port_observation_.IsObserving())
port_observation_.Observe(chooser_context);
}
void ElectronSerialDelegate::RemoveObserver(content::RenderFrameHost* frame,
Observer* observer) {
void ElectronSerialDelegate::RemoveObserver(
content::RenderFrameHost* frame,
content::SerialDelegate::Observer* observer) {
observer_list_.RemoveObserver(observer);
}

4
shell/browser/serial/electron_serial_delegate.h
View File

@@ -38,9 +38,9 @@ class ElectronSerialDelegate : public content::SerialDelegate,
device::mojom::SerialPortManager* GetPortManager(
content::RenderFrameHost* frame) override;
void AddObserver(content::RenderFrameHost* frame,
Observer* observer) override;
content::SerialDelegate::Observer* observer) override;
void RemoveObserver(content::RenderFrameHost* frame,
Observer* observer) override;
content::SerialDelegate::Observer* observer) override;
void RevokePortPermissionWebInitiated(
content::RenderFrameHost* frame,
const base::UnguessableToken& token) override;