From 1432f9bb657489cabc33cd73ad4508e5782dc093 Mon Sep 17 00:00:00 2001 From: Bruno Pitrus Date: Tue, 13 Dec 2022 19:55:08 +0100 Subject: [PATCH] =?UTF-8?q?chore:=20reland=20=E2=80=9Cfix=20ambiguous=20re?= =?UTF-8?q?ference=20gcc=20compile=20error=E2=80=9D=20(#36544)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a reland of #35714. The broken code got reintroduced in #35310 due to a mismerge. --- shell/browser/serial/electron_serial_delegate.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/browser/serial/electron_serial_delegate.h b/shell/browser/serial/electron_serial_delegate.h index 5fc7317d4853..e66f6a51df23 100644 --- a/shell/browser/serial/electron_serial_delegate.h +++ b/shell/browser/serial/electron_serial_delegate.h @@ -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);