Let Contraints Controll Mute/Unmute Audio Local Playback For Desktop Sharing

chrome/browser/media/webrtc/desktop_capture_access_handler.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media/webrtc/desktop_capture_access_handler.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 131 matching lines @@
   }
   return base::string16();
 }
 // Helper to get list of media stream devices for desktop capture in |devices|.
 // Registers to display notification if |display_notification| is true.
 // Returns an instance of MediaStreamUI to be passed to content layer.
 std::unique_ptr<content::MediaStreamUI> GetDevicesForDesktopCapture(
     content::MediaStreamDevices* devices,
     content::DesktopMediaID media_id,
     bool capture_audio,
-    bool mute_system_audio,
+    bool disable_local_echo,
     bool display_notification,
     const base::string16& application_title,
     const base::string16& registered_extension_name) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   std::unique_ptr<content::MediaStreamUI> ui;
 
   DVLOG(2) << __FUNCTION__ << ": media_id " << media_id.ToString()
-           << ", capture_audio " << capture_audio << ", mute_system_audio "
-           << mute_system_audio << ", display_notification "
+           << ", capture_audio " << capture_audio << ", disable_local_echo "
+           << disable_local_echo << ", display_notification "
            << display_notification << ", application_title "
            << application_title << ", extension_name "
            << registered_extension_name;
 
   // Add selected desktop source to the list.
   devices->push_back(content::MediaStreamDevice(
       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.disable_local_echo = disable_local_echo;
       devices->push_back(
           content::MediaStreamDevice(content::MEDIA_DESKTOP_AUDIO_CAPTURE,
-                                     media_id.ToString(), "Tab audio"));
-    } else if (mute_system_audio) {
+                                     web_id.ToString(), "Tab audio"));
+    } else if (disable_local_echo) {
       // Use the special loopback device ID for system audio capture.
       devices->push_back(content::MediaStreamDevice(
           content::MEDIA_DESKTOP_AUDIO_CAPTURE,
           media::AudioDeviceDescription::kLoopbackWithMuteDeviceId,
           "System Audio"));
     } else {
       // Use the special loopback device ID for system audio capture.
       devices->push_back(content::MediaStreamDevice(
           content::MEDIA_DESKTOP_AUDIO_CAPTURE,
           media::AudioDeviceDescription::kLoopbackInputDeviceId,
@@ skipping 133 matching lines @@
                                           webrtc::kFullDesktopScreenId);
 #endif  // !defined(OS_CHROMEOS)
 
       bool capture_audio =
           (request.audio_type == content::MEDIA_DESKTOP_AUDIO_CAPTURE &&
            loopback_audio_supported);
 
       // Determine if the extension is required to display a notification.
       const bool display_notification = ShouldDisplayNotification(extension);
 
-      ui = GetDevicesForDesktopCapture(&devices, screen_id, capture_audio, true,
-                                       display_notification, application_title,
-                                       application_title);
+      ui = GetDevicesForDesktopCapture(
+          &devices, screen_id, capture_audio, request.disable_local_echo,
+          display_notification, application_title, application_title);
       DCHECK(!devices.empty());
     }
 
     // The only case when devices can be empty is if the user has denied
     // permission.
     result = devices.empty() ? content::MEDIA_DEVICE_PERMISSION_DENIED
                              : content::MEDIA_DEVICE_OK;
   }
 
   callback.Run(devices, result, std::move(ui));
@@ skipping 97 matching lines @@
   const bool check_audio_permission =
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           extensions::switches::kDisableDesktopCaptureAudio);
   const bool capture_audio =
       (check_audio_permission ? audio_permitted : true) && audio_requested &&
       audio_supported;
 
   // Determine if the extension is required to display a notification.
   const bool display_notification = ShouldDisplayNotification(extension);
 
-  ui = GetDevicesForDesktopCapture(&devices, media_id, capture_audio, false,
+  ui = GetDevicesForDesktopCapture(&devices, media_id, capture_audio,
+                                   request.disable_local_echo,
                                    display_notification,
                                    GetApplicationTitle(web_contents, extension),
                                    base::UTF8ToUTF16(original_extension_name));
   UpdateExtensionTrusted(request, extension);
   callback.Run(devices, content::MEDIA_DEVICE_OK, std::move(ui));
 }