Desktop Share Audio User Permission

chrome/browser/media/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/desktop_capture_access_handler.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 13 matching lines @@
 #include "content/public/browser/desktop_media_id.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/media_stream_request.h"
 #include "content/public/common/origin_util.h"
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/switches.h"
 #include "media/audio/audio_manager_base.h"
 #include "net/base/url_util.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_capture_types.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/shell.h"
 #include "base/sha1.h"
 #endif  // defined(OS_CHROMEOS)
 
@@ skipping 292 matching lines @@
     callback.Run(devices, content::MEDIA_DEVICE_INVALID_STATE, std::move(ui));
     return;
   }
 
   bool loopback_audio_supported = false;
 #if defined(USE_CRAS) || defined(OS_WIN)
   // Currently loopback audio capture is supported only on Windows and ChromeOS.
   loopback_audio_supported = true;
 #endif
 
-  // Audio is only supported for screen capture streams.
+  // This value essentially from the checkbox on picker window, so it
+  // corresponds to user permission.
+  bool audio_permitted = media_id.audio_share;
+
+  // This value essentially from whether getUserMedia requests audio stream.
+  bool audio_requested =
+      request.audio_type == content::MEDIA_DESKTOP_AUDIO_CAPTURE;
+
+  // This value shows for a given capture type, whether the system or our code
+  // can support audio sharing. Currently audio is only supported for screen
+  // capture streams.
+  bool audio_supported =
+      media_id.type == content::DesktopMediaID::TYPE_SCREEN &&
+      loopback_audio_supported;
+
+  bool has_flag = base::CommandLine::ForCurrentProcess()->HasSwitch(
+      extensions::switches::kEnableDesktopCaptureAudio);
   bool capture_audio =
-      (media_id.type == content::DesktopMediaID::TYPE_SCREEN &&
-       request.audio_type == content::MEDIA_DESKTOP_AUDIO_CAPTURE &&
-       loopback_audio_supported);
+      (has_flag ? audio_permitted : true) && audio_requested && audio_supported;
 
   ui = GetDevicesForDesktopCapture(&devices, media_id, capture_audio, true,
                                    GetApplicationTitle(web_contents, extension),
                                    base::UTF8ToUTF16(original_extension_name));
 
   callback.Run(devices, content::MEDIA_DEVICE_OK, std::move(ui));
 }
 
 void DesktopCaptureAccessHandler::UpdateMediaRequestState(
     int render_process_id,
@@ skipping 22 matching lines @@
         desktop_capture_sessions_.erase(it);
         break;
       }
     }
   }
 }
 
 bool DesktopCaptureAccessHandler::IsCaptureInProgress() {
   return desktop_capture_sessions_.size() > 0;
 }