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

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

Browse source
This commit is contained in:
Bruno Pitrus 2022-09-20 00:05:24 +02:00 committed by GitHub
parent 76ce6d5fb4
commit 6cc69122ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,16 +66,18 @@ device::mojom::SerialPortManager* ElectronSerialDelegate::GetPortManager(
return GetChooserContext(frame)->GetPortManager(); return GetChooserContext(frame)->GetPortManager();
} }
void ElectronSerialDelegate::AddObserver(content::RenderFrameHost* frame, void ElectronSerialDelegate::AddObserver(
Observer* observer) { content::RenderFrameHost* frame,
content::SerialDelegate::Observer* observer) {
observer_list_.AddObserver(observer); observer_list_.AddObserver(observer);
auto* chooser_context = GetChooserContext(frame); auto* chooser_context = GetChooserContext(frame);
if (!port_observation_.IsObserving()) if (!port_observation_.IsObserving())
port_observation_.Observe(chooser_context); port_observation_.Observe(chooser_context);
} }
void ElectronSerialDelegate::RemoveObserver(content::RenderFrameHost* frame, void ElectronSerialDelegate::RemoveObserver(
Observer* observer) { content::RenderFrameHost* frame,
content::SerialDelegate::Observer* observer) {
observer_list_.RemoveObserver(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( 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 RevokePortPermissionWebInitiated( void RevokePortPermissionWebInitiated(
content::RenderFrameHost* frame, content::RenderFrameHost* frame,
const base::UnguessableToken& token) override; const base::UnguessableToken& token) override;