athena/extensions/chrome/athena_app_delegate.cc - Issue 562263002: Check media permissions through RenderFrameHostDelegate.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: athena/extensions/chrome/athena_app_delegate.cc

Issue 562263002: Check media permissions through RenderFrameHostDelegate. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@render_frame_get_sources

Patch Set: Updated unit test MediaStreamDispatcherHost. Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « athena/extensions/chrome/athena_app_delegate.h ('k') | chrome/browser/android/chrome_web_contents_delegate_android.h » ('j') | chrome/browser/ui/media_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: athena/extensions/chrome/athena_app_delegate.cc

diff --git a/athena/extensions/chrome/athena_app_delegate.cc b/athena/extensions/chrome/athena_app_delegate.cc

index 64d8d0af7289cd83776083aa448c20e04655a323..1046cc756584b9315017305c4e8e470f96933384 100644

--- a/athena/extensions/chrome/athena_app_delegate.cc

+++ b/athena/extensions/chrome/athena_app_delegate.cc

@@ -146,6 +146,16 @@ void AthenaAppDelegate::RequestMediaAccessPermission(

web_contents, request, callback, extension);

}

+bool AthenaAppDelegate::CheckMediaAccessPermission(

+ content::WebContents* web_contents,

+ const GURL& security_origin,

+ content::MediaStreamType type,

+ const extensions::Extension* extension) {

+ return MediaCaptureDevicesDispatcher::GetInstance()

+ ->CheckMediaAccessPermission(

+ web_contents, security_origin, type, extension);

int AthenaAppDelegate::PreferredIconSize() {

// TODO(oshima): Find out what to use.

return extension_misc::EXTENSION_ICON_SMALL;