mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fix: systemMediaPermissionDenied should not check camera perms when the request is asking for screen share (#43543)

Browse source 
* fix: systemMediaPermissionDenied: should check for screen capture perms instead of camera

Co-authored-by: George Xu <george.xu@slack-corp.com>

* Revert "fix: systemMediaPermissionDenied: should check for screen capture perms instead of camera"

This reverts commit e9cc67216558263402867056ed332f8781da3153.

Co-authored-by: George Xu <george.xu@slack-corp.com>

* should only do these checks for audio or video, but not screenshare

Co-authored-by: George Xu <george.xu@slack-corp.com>

* no service

Co-authored-by: George Xu <george.xu@slack-corp.com>

* oops

Co-authored-by: George Xu <george.xu@slack-corp.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: George Xu <george.xu@slack-corp.com>
This commit is contained in:
trop[bot] 2024-09-04 22:52:18 -05:00 committed by GitHub
parent 40316df338
commit 5d340577b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
shell/browser/web_contents_permission_helper.cc
View file

@ -57,7 +57,7 @@ namespace {
#if BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_MAC)
bool SystemMediaPermissionDenied(const content::MediaStreamRequest& request) { 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 = const auto system_audio_permission =
system_media_permissions::CheckSystemAudioCapturePermission(); system_media_permissions::CheckSystemAudioCapturePermission();
return system_audio_permission == return system_audio_permission ==
@ -65,7 +65,7 @@ bool SystemMediaPermissionDenied(const content::MediaStreamRequest& request) {
system_audio_permission == system_audio_permission ==
system_media_permissions::SystemPermission::kDenied; 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 = const auto system_video_permission =
system_media_permissions::CheckSystemVideoCapturePermission(); system_media_permissions::CheckSystemVideoCapturePermission();
return system_video_permission == return system_video_permission ==
@ -73,6 +73,7 @@ bool SystemMediaPermissionDenied(const content::MediaStreamRequest& request) {
system_video_permission == system_video_permission ==
system_media_permissions::SystemPermission::kDenied; system_media_permissions::SystemPermission::kDenied;
} }
return false; return false;
} }
#endif #endif