Skip to content

Commit

Permalink
Fix compiler errors
Browse files Browse the repository at this point in the history
  • Loading branch information
John Kleinschmidt committed Aug 1, 2019
1 parent 87c2ac1 commit c04c073
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
5 changes: 3 additions & 2 deletions shell/browser/common_web_contents_delegate.cc
Expand Up @@ -641,15 +641,16 @@ 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) {
#if BUILDFLAG(ENABLE_PICTURE_IN_PICTURE)
return PictureInPictureWindowManager::GetInstance()->EnterPictureInPicture(
web_contents, surface_id, natural_size);
#else
return gfx::Size();
return content::PictureInPictureResult::kNotSupported;
#endif
}

Expand Down
7 changes: 4 additions & 3 deletions shell/browser/common_web_contents_delegate.h
Expand Up @@ -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.
Expand Down

0 comments on commit c04c073

Please sign in to comment.