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: reland “fix ambiguous reference gcc compile error” (#36544)

Browse Source 
This is a reland of #35714. The broken code got reintroduced in #35310 due to a mismerge.
This commit is contained in:
Bruno Pitrus
2022-12-13 19:55:08 +01:00
committed by GitHub
parent 6a798b1c58
commit 1432f9bb65
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,9 +45,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 DeleteControllerForFrame(content::RenderFrameHost* render_frame_host);