summaryrefslogtreecommitdiffstats
path: root/apps/custom_launcher_page_contents.h
diff options
context:
space:
mode:
authorgrunell <grunell@chromium.org>2014-09-17 17:09:43 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-18 00:09:55 +0000
commit657d4d8c7d26c89c0846479ac322931bfaba4f86 (patch)
tree2a853ed570eb321b1f0a77fc8afe656a0f0e0210 /apps/custom_launcher_page_contents.h
parentee83dcef7d2552d2221ac5be9f8ac831942ba670 (diff)
downloadchromium_src-657d4d8c7d26c89c0846479ac322931bfaba4f86.zip
chromium_src-657d4d8c7d26c89c0846479ac322931bfaba4f86.tar.gz
chromium_src-657d4d8c7d26c89c0846479ac322931bfaba4f86.tar.bz2
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}
Diffstat (limited to 'apps/custom_launcher_page_contents.h')
-rw-r--r--apps/custom_launcher_page_contents.h4
1 files changed, 4 insertions, 0 deletions
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: