From c04c073f48986de89eb16cbba4ed7d04170c9032 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Thu, 1 Aug 2019 10:46:19 -0400 Subject: [PATCH] Fix compiler errors --- shell/browser/common_web_contents_delegate.cc | 5 +++-- shell/browser/common_web_contents_delegate.h | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/shell/browser/common_web_contents_delegate.cc b/shell/browser/common_web_contents_delegate.cc index abf3a7a098580..97c8229cb1644 100644 --- a/shell/browser/common_web_contents_delegate.cc +++ b/shell/browser/common_web_contents_delegate.cc @@ -641,7 +641,8 @@ void CommonWebContentsDelegate::SetHtmlApiFullscreen(bool enter_fullscreen) { native_fullscreen_ = false; } -gfx::Size CommonWebContentsDelegate::EnterPictureInPicture( +content::PictureInPictureResult +CommonWebContentsDelegate::EnterPictureInPicture( content::WebContents* web_contents, const viz::SurfaceId& surface_id, const gfx::Size& natural_size) { @@ -649,7 +650,7 @@ gfx::Size CommonWebContentsDelegate::EnterPictureInPicture( return PictureInPictureWindowManager::GetInstance()->EnterPictureInPicture( web_contents, surface_id, natural_size); #else - return gfx::Size(); + return content::PictureInPictureResult::kNotSupported; #endif } diff --git a/shell/browser/common_web_contents_delegate.h b/shell/browser/common_web_contents_delegate.h index 9dfad0458e47d..2dd79c32c8a0a 100644 --- a/shell/browser/common_web_contents_delegate.h +++ b/shell/browser/common_web_contents_delegate.h @@ -106,9 +106,10 @@ class CommonWebContentsDelegate : public content::WebContentsDelegate, bool HandleKeyboardEvent( content::WebContents* source, const content::NativeWebKeyboardEvent& event) override; - gfx::Size EnterPictureInPicture(content::WebContents* web_contents, - const viz::SurfaceId&, - const gfx::Size& natural_size) override; + content::PictureInPictureResult EnterPictureInPicture( + content::WebContents* web_contents, + const viz::SurfaceId&, + const gfx::Size& natural_size) override; void ExitPictureInPicture() override; // Autofill related events.