summaryrefslogtreecommitdiffstats
path: root/content/public/common/media_stream_request.h
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-09 06:53:28 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-09 06:53:28 +0000
commita6cb8bca67f3cf4daf2a9ef86ade994efb7554d4 (patch)
treebc2f769ee81bc9a97be48e8f6e45f5713fceb42f /content/public/common/media_stream_request.h
parent6eb4d94bf5cb9c8896c2544eeea9e81c800e38b9 (diff)
downloadchromium_src-a6cb8bca67f3cf4daf2a9ef86ade994efb7554d4.zip
chromium_src-a6cb8bca67f3cf4daf2a9ef86ade994efb7554d4.tar.gz
chromium_src-a6cb8bca67f3cf4daf2a9ef86ade994efb7554d4.tar.bz2
Add DesktopMediaId type to identify desktop media source.
Also replaced content::MEDIA_SCREEN_VIDEO_CAPTURE with content::MEDIA_DESKTOP_VIDEO_CAPTURE which will be used to identify all types of desktop media sources. BUG=237907 R=jam@chromium.org, xians@chromium.org Review URL: https://codereview.chromium.org/22370010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/public/common/media_stream_request.h')
-rw-r--r--content/public/common/media_stream_request.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/content/public/common/media_stream_request.h b/content/public/common/media_stream_request.h
index d01e7a8..cbbf232 100644
--- a/content/public/common/media_stream_request.h
+++ b/content/public/common/media_stream_request.h
@@ -26,14 +26,18 @@ enum MediaStreamType {
MEDIA_DEVICE_VIDEO_CAPTURE,
// Mirroring of a browser tab.
+ //
+ // TODO(serygeu): Remove these values and use MEDIA_DESKTOP_VIDEO_CAPTURE and
+ // MEDIA_DESKTOP_AUDIO_CAPTURE.
MEDIA_TAB_AUDIO_CAPTURE,
MEDIA_TAB_VIDEO_CAPTURE,
// Desktop media sources.
- MEDIA_SCREEN_VIDEO_CAPTURE,
- MEDIA_WINDOW_VIDEO_CAPTURE,
+ MEDIA_DESKTOP_VIDEO_CAPTURE,
// Capture system audio (post-mix loopback stream).
+ //
+ // TODO(sergeyu): Replace with MEDIA_DESKTOP_AUDIO_CAPTURE.
MEDIA_SYSTEM_AUDIO_CAPTURE,
NUM_MEDIA_TYPES