Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4324)

Unified Diff: chrome/browser/media/webrtc/desktop_capture_access_handler.cc

Issue 2291893002: Let Contraints Controll Mute/Unmute Audio Local Playback For Desktop Sharing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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
Index: chrome/browser/media/webrtc/desktop_capture_access_handler.cc
diff --git a/chrome/browser/media/webrtc/desktop_capture_access_handler.cc b/chrome/browser/media/webrtc/desktop_capture_access_handler.cc
index 557e24d610a8a481e6e64d3f6433caea4f2a3331..732ca509e82c2dc7149b6f723b8e7a988a44d257 100644
--- a/chrome/browser/media/webrtc/desktop_capture_access_handler.cc
+++ b/chrome/browser/media/webrtc/desktop_capture_access_handler.cc
@@ -152,9 +152,11 @@ std::unique_ptr<content::MediaStreamUI> GetDevicesForDesktopCapture(
content::MEDIA_DESKTOP_VIDEO_CAPTURE, media_id.ToString(), "Screen"));
if (capture_audio) {
if (media_id.type == content::DesktopMediaID::TYPE_WEB_CONTENTS) {
+ content::WebContentsMediaCaptureId web_id = media_id.web_contents_id;
+ web_id.mute_source = mute_system_audio;
devices->push_back(
content::MediaStreamDevice(content::MEDIA_DESKTOP_AUDIO_CAPTURE,
- media_id.ToString(), "Tab audio"));
+ web_id.ToString(), "Tab audio"));
} else if (mute_system_audio) {
// Use the special loopback device ID for system audio capture.
devices->push_back(content::MediaStreamDevice(
@@ -316,7 +318,8 @@ void DesktopCaptureAccessHandler::ProcessScreenCaptureAccessRequest(
// display the notification for stream capture.
bool display_notification = !component_extension;
- ui = GetDevicesForDesktopCapture(&devices, screen_id, capture_audio, true,
+ ui = GetDevicesForDesktopCapture(&devices, screen_id, capture_audio,
+ request.mute_source,
display_notification, application_title,
application_title);
DCHECK(!devices.empty());
@@ -425,7 +428,8 @@ void DesktopCaptureAccessHandler::HandleRequest(
(check_audio_permission ? audio_permitted : true) && audio_requested &&
audio_supported;
- ui = GetDevicesForDesktopCapture(&devices, media_id, capture_audio, false,
+ ui = GetDevicesForDesktopCapture(&devices, media_id, capture_audio,
+ request.mute_source,
true,
GetApplicationTitle(web_contents, extension),
base::UTF8ToUTF16(original_extension_name));

Powered by Google App Engine
This is Rietveld 408576698