chrome/common/extensions/request_media_access_permission_helper.cc - Issue 11759020: Implement a TODO in the media code: Change a "const MediaStreamRequest*" arg in various APIs to "co…

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: chrome/common/extensions/request_media_access_permission_helper.cc

Issue 11759020: Implement a TODO in the media code: Change a "const MediaStreamRequest*" arg in various APIs to "co… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 7 years, 12 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 | « chrome/common/extensions/request_media_access_permission_helper.h ('k') | content/browser/renderer_host/media/media_stream_ui_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/common/extensions/request_media_access_permission_helper.cc

===================================================================

--- chrome/common/extensions/request_media_access_permission_helper.cc (revision 175045)

+++ chrome/common/extensions/request_media_access_permission_helper.cc (working copy)

@@ -11,7 +11,7 @@

// static

void RequestMediaAccessPermissionHelper::AuthorizeRequest(

const content::MediaStreamDevices& devices,

- const content::MediaStreamRequest* request,

+ const content::MediaStreamRequest& request,

const content::MediaResponseCallback& callback,

const extensions::Extension* extension,

bool is_packaged_app) {

@@ -23,10 +23,10 @@

if (!accepted_an_audio_device && content::IsAudioMediaType(it->type)) {

// Require flag and tab capture permission for tab media.

// Require audio capture permission for packaged apps.

- if ((request->audio_type == content::MEDIA_TAB_AUDIO_CAPTURE &&

+ if ((request.audio_type == content::MEDIA_TAB_AUDIO_CAPTURE &&

extensions::FeatureSwitch::tab_capture()->IsEnabled() &&

extension->HasAPIPermission(APIPermission::kTabCapture)) ||

- (request->audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE &&

+ (request.audio_type == content::MEDIA_DEVICE_AUDIO_CAPTURE &&

is_packaged_app &&

extension->HasAPIPermission(APIPermission::kAudioCapture))) {

accepted_devices.push_back(*it);

@@ -36,10 +36,10 @@

content::IsVideoMediaType(it->type)) {

// Require flag and tab capture permission for tab media.

// Require video capture permission for packaged apps.

- if ((request->video_type == content::MEDIA_TAB_VIDEO_CAPTURE &&

+ if ((request.video_type == content::MEDIA_TAB_VIDEO_CAPTURE &&

extensions::FeatureSwitch::tab_capture()->IsEnabled() &&

extension->HasAPIPermission(APIPermission::kTabCapture)) ||

- (request->video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE &&

+ (request.video_type == content::MEDIA_DEVICE_VIDEO_CAPTURE &&

is_packaged_app &&

extension->HasAPIPermission(APIPermission::kVideoCapture))) {

accepted_devices.push_back(*it);