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

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats 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( device::mojom::SerialPortManager* GetPortManager(
content::RenderFrameHost* frame) override; content::RenderFrameHost* frame) override;
void AddObserver(content::RenderFrameHost* frame, void AddObserver(content::RenderFrameHost* frame,
Observer* observer) override; content::SerialDelegate::Observer* observer) override;
void RemoveObserver(content::RenderFrameHost* frame, void RemoveObserver(content::RenderFrameHost* frame,
Observer* observer) override; content::SerialDelegate::Observer* observer) override;
void DeleteControllerForFrame(content::RenderFrameHost* render_frame_host); void DeleteControllerForFrame(content::RenderFrameHost* render_frame_host);