From 833b55107d608e186c3e8bb4566160657e33683c Mon Sep 17 00:00:00 2001 From: Aleksei Kuzmin Date: Sun, 9 Sep 2018 16:30:28 +0200 Subject: [PATCH] Plumb the RenderFrameHost through for CheckMediaAccessPermission https://chromium-review.googlesource.com/938862 --- atom/browser/api/atom_api_web_contents.cc | 9 ++++++--- atom/browser/api/atom_api_web_contents.h | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index 8d2442c576e6..3057b80a131d 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -718,9 +718,12 @@ void WebContents::FindReply(content::WebContents* web_contents, Emit("found-in-page", result); } -bool WebContents::CheckMediaAccessPermission(content::WebContents* web_contents, - const GURL& security_origin, - content::MediaStreamType type) { +bool WebContents::CheckMediaAccessPermission( + content::RenderFrameHost* render_frame_host, + const GURL& security_origin, + content::MediaStreamType type) { + auto* web_contents = + content::WebContents::FromRenderFrameHost(render_frame_host); auto* permission_helper = WebContentsPermissionHelper::FromWebContents(web_contents); return permission_helper->CheckMediaAccessPermission(security_origin, type); diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h index d7de8f03c970..0dbb80885684 100644 --- a/atom/browser/api/atom_api_web_contents.h +++ b/atom/browser/api/atom_api_web_contents.h @@ -330,7 +330,7 @@ class WebContents : public mate::TrackableObject, const gfx::Rect& selection_rect, int active_match_ordinal, bool final_update) override; - bool CheckMediaAccessPermission(content::WebContents* web_contents, + bool CheckMediaAccessPermission(content::RenderFrameHost* render_frame_host, const GURL& security_origin, content::MediaStreamType type) override; void RequestMediaAccessPermission(