3 files changed, 16 insertions, 0 deletions
diff --git a/content/common/media/media_stream_messages.h b/content/common/media/media_stream_messages.h
index 8678997..a388f85 100644
--- a/content/common/media/media_stream_messages.h
+++ b/content/common/media/media_stream_messages.h
@@ -50,6 +50,8 @@ IPC_MESSAGE_ROUTED1(MediaStreamMsg_StreamGenerationFailed,
                     int /* request id */)
 
 // The browser has enumerated devices successfully.
+// Used by Pepper.
+// TODO(vrk,wjia): Move this to pepper code.
 IPC_MESSAGE_ROUTED3(MediaStreamMsg_DevicesEnumerated,
                     int /* request id */,
                     std::string /* label */,
@@ -71,6 +73,11 @@ IPC_MESSAGE_ROUTED3(MediaStreamMsg_DeviceOpened,
 IPC_MESSAGE_ROUTED1(MediaStreamMsg_DeviceOpenFailed,
                     int /* request id */)
 
+// Response to enumerate devices request.
+IPC_MESSAGE_CONTROL2(MediaStreamMsg_GetSourcesACK,
+                     int /* request id */,
+                     content::StreamDeviceInfoArray /* device_list */)
+
 // Messages sent from the renderer to the browser.
 
 // Request a new media stream.
@@ -91,6 +98,8 @@ IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_StopGeneratedStream,
                      std::string /* label */)
 
 // Request to enumerate devices.
+// Used by Pepper.
+// TODO(vrk,wjia): Move this to pepper code.
 IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_EnumerateDevices,
                      int /* render view id */,
                      int /* request id */,
@@ -104,3 +113,8 @@ IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice,
                      std::string /* device_id */,
                      content::MediaStreamType /* type */,
                      GURL /* security origin */)
+
+// Request to enumerate devices.
+IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_GetSources,
+                     int /* request id */,
+                     GURL /* origin */)
diff --git a/content/common/media/media_stream_options.cc b/content/common/media/media_stream_options.cc
index 001fb3e..d4dec11 100644
--- a/content/common/media/media_stream_options.cc
+++ b/content/common/media/media_stream_options.cc
@@ -10,6 +10,7 @@ namespace content {
 
 const char kMediaStreamSource[] = "chromeMediaSource";
 const char kMediaStreamSourceId[] = "chromeMediaSourceId";
+const char kMediaStreamSourceInfoId[] = "sourceId";
 const char kMediaStreamSourceTab[] = "tab";
 const char kMediaStreamSourceScreen[] = "screen";
 
diff --git a/content/common/media/media_stream_options.h b/content/common/media/media_stream_options.h
index 18f0379..7e6940e 100644
--- a/content/common/media/media_stream_options.h
+++ b/content/common/media/media_stream_options.h
@@ -16,6 +16,7 @@ namespace content {
 // MediaStreamConstraint keys for constraints that are passed to getUserMedia.
 CONTENT_EXPORT extern const char kMediaStreamSource[];
 CONTENT_EXPORT extern const char kMediaStreamSourceId[];
+CONTENT_EXPORT extern const char kMediaStreamSourceInfoId[];
 CONTENT_EXPORT extern const char kMediaStreamSourceTab[];
 CONTENT_EXPORT extern const char kMediaStreamSourceScreen[];