Skip to content

Commit

Permalink
chore: reland “fix ambiguous reference gcc compile error”
Browse files Browse the repository at this point in the history
This is a reland of electron#35714. The broken code got reintroduced in electron#35310 due to a mismerge.
  • Loading branch information
brjsp committed Dec 2, 2022
1 parent 79d2fc9 commit 7342506
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions shell/browser/serial/electron_serial_delegate.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit 7342506

Please sign in to comment.