From 635d421123b996086f459ec3c6f97513e2e358cf Mon Sep 17 00:00:00 2001 From: George Xu <33054982+georgexu99@users.noreply.github.com> Date: Wed, 4 Sep 2024 04:56:26 -0400 Subject: [PATCH] fix: systemMediaPermissionDenied should not check camera perms when the request is asking for screen share (#43517) * fix: systemMediaPermissionDenied: should check for screen capture perms instead of camera * Revert "fix: systemMediaPermissionDenied: should check for screen capture perms instead of camera" This reverts commit e9cc67216558263402867056ed332f8781da3153. * should only do these checks for audio or video, but not screenshare * no service * oops --------- Co-authored-by: John Kleinschmidt --- shell/browser/web_contents_permission_helper.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/shell/browser/web_contents_permission_helper.cc b/shell/browser/web_contents_permission_helper.cc index 40f77feed169..ff3c01c34bc0 100644 --- a/shell/browser/web_contents_permission_helper.cc +++ b/shell/browser/web_contents_permission_helper.cc @@ -57,7 +57,7 @@ namespace { #if BUILDFLAG(IS_MAC) bool SystemMediaPermissionDenied(const content::MediaStreamRequest& request) { - if (request.audio_type != MediaStreamType::NO_SERVICE) { + if (request.audio_type == MediaStreamType::DEVICE_AUDIO_CAPTURE) { const auto system_audio_permission = system_media_permissions::CheckSystemAudioCapturePermission(); return system_audio_permission == @@ -65,7 +65,7 @@ bool SystemMediaPermissionDenied(const content::MediaStreamRequest& request) { system_audio_permission == system_media_permissions::SystemPermission::kDenied; } - if (request.video_type != MediaStreamType::NO_SERVICE) { + if (request.video_type == MediaStreamType::DEVICE_VIDEO_CAPTURE) { const auto system_video_permission = system_media_permissions::CheckSystemVideoCapturePermission(); return system_video_permission == @@ -73,6 +73,7 @@ bool SystemMediaPermissionDenied(const content::MediaStreamRequest& request) { system_video_permission == system_media_permissions::SystemPermission::kDenied; } + return false; } #endif