From 6cc69122ce298fd2025e08b891240084309370d5 Mon Sep 17 00:00:00 2001 From: Bruno Pitrus Date: Tue, 20 Sep 2022 00:05:24 +0200 Subject: [PATCH] chore: fix ambiguous reference gcc compile error (#35714) --- shell/browser/serial/electron_serial_delegate.cc | 10 ++++++---- shell/browser/serial/electron_serial_delegate.h | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/shell/browser/serial/electron_serial_delegate.cc b/shell/browser/serial/electron_serial_delegate.cc index 2306be383db..0c7f63d4ab9 100644 --- a/shell/browser/serial/electron_serial_delegate.cc +++ b/shell/browser/serial/electron_serial_delegate.cc @@ -66,16 +66,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); } diff --git a/shell/browser/serial/electron_serial_delegate.h b/shell/browser/serial/electron_serial_delegate.h index 5876d7e5110..add2c4471f1 100644 --- a/shell/browser/serial/electron_serial_delegate.h +++ b/shell/browser/serial/electron_serial_delegate.h @@ -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;