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

Unified Diff: chrome/browser/media/media_capture_devices_dispatcher.cc

Issue 649543002: Replacing MEDIA_LOOPBACK_AUDIO_CAPTURE with MEDIA_DESKTOP_AUDIO_CAPTURE (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase the patchset Created 6 years, 1 month 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
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/media/media_capture_devices_dispatcher.cc
diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc
index 48e484f2ad0e3b9245585461b79868be394929b4..cc776b30b5a8543c61c6a8e61ab190ae201e47a7 100644
--- a/chrome/browser/media/media_capture_devices_dispatcher.cc
+++ b/chrome/browser/media/media_capture_devices_dispatcher.cc
@@ -171,7 +171,7 @@ scoped_ptr<content::MediaStreamUI> GetDevicesForDesktopCapture(
if (capture_audio) {
// Use the special loopback device ID for system audio capture.
devices->push_back(content::MediaStreamDevice(
- content::MEDIA_LOOPBACK_AUDIO_CAPTURE,
+ content::MEDIA_DESKTOP_AUDIO_CAPTURE,
media::AudioManagerBase::kLoopbackInputDeviceId, "System Audio"));
}
@@ -328,7 +328,7 @@ void MediaCaptureDevicesDispatcher::ProcessMediaAccessRequest(
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (request.video_type == content::MEDIA_DESKTOP_VIDEO_CAPTURE ||
- request.audio_type == content::MEDIA_LOOPBACK_AUDIO_CAPTURE) {
+ request.audio_type == content::MEDIA_DESKTOP_AUDIO_CAPTURE) {
ProcessDesktopCaptureAccessRequest(
web_contents, request, callback, extension);
} else if (request.video_type == content::MEDIA_TAB_VIDEO_CAPTURE ||
@@ -524,7 +524,7 @@ void MediaCaptureDevicesDispatcher::ProcessDesktopCaptureAccessRequest(
// Audio is only supported for screen capture streams.
bool capture_audio =
(media_id.type == content::DesktopMediaID::TYPE_SCREEN &&
- request.audio_type == content::MEDIA_LOOPBACK_AUDIO_CAPTURE &&
+ request.audio_type == content::MEDIA_DESKTOP_AUDIO_CAPTURE &&
loopback_audio_supported);
ui = GetDevicesForDesktopCapture(
@@ -634,7 +634,7 @@ void MediaCaptureDevicesDispatcher::ProcessScreenCaptureAccessRequest(
#endif // !defined(OS_CHROMEOS)
bool capture_audio =
- (request.audio_type == content::MEDIA_LOOPBACK_AUDIO_CAPTURE &&
+ (request.audio_type == content::MEDIA_DESKTOP_AUDIO_CAPTURE &&
loopback_audio_supported);
// Unless we're being invoked from a component extension, register to
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698