From 657d4d8c7d26c89c0846479ac322931bfaba4f86 Mon Sep 17 00:00:00 2001 From: grunell Date: Wed, 17 Sep 2014 17:09:43 -0700 Subject: Check media permissions through RenderFrameHostDelegate. * Add function CheckMediaAccessPermission on RenderFrameHostDelegate, WebContentsDelegate, classes implementing those and chain it to MediaCaptureDevicesDispatcher::CheckMediaAccessPermission through the different paths. (Essentially add this function side-by-side with RequestMediaAccessPermission.) * Change MediaStreamManager to use this function for checking permission when determining if device labels should be visible. BUG=406094 Review URL: https://codereview.chromium.org/562263002 Cr-Commit-Position: refs/heads/master@{#295379} --- apps/custom_launcher_page_contents.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'apps/custom_launcher_page_contents.h') diff --git a/apps/custom_launcher_page_contents.h b/apps/custom_launcher_page_contents.h index 36e7f79..eaa7673 100644 --- a/apps/custom_launcher_page_contents.h +++ b/apps/custom_launcher_page_contents.h @@ -71,6 +71,10 @@ class CustomLauncherPageContents content::WebContents* web_contents, const content::MediaStreamRequest& request, const content::MediaResponseCallback& callback) OVERRIDE; + virtual bool CheckMediaAccessPermission( + content::WebContents* web_contents, + const GURL& security_origin, + content::MediaStreamType type) OVERRIDE; private: // content::WebContentsObserver overrides: -- cgit v1.1