Index: content/common/media/media_stream_messages.h |
diff --git a/content/common/media/media_stream_messages.h b/content/common/media/media_stream_messages.h |
index 0d331709a1d5bbf9419c49226c7cf41d7c39736c..e88aeab66ddf3f9711ef7afb8e8651ef4eb3965e 100644 |
--- a/content/common/media/media_stream_messages.h |
+++ b/content/common/media/media_stream_messages.h |
@@ -105,7 +105,7 @@ IPC_MESSAGE_CONTROL2(MediaStreamMsg_GetSourcesACK, |
// Request a new media stream. |
IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_GenerateStream, |
- int /* render view id */, |
+ int /* render frame id */, |
int /* request id */, |
content::StreamOptions /* components */, |
GURL /* security origin */, |
@@ -113,12 +113,12 @@ IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_GenerateStream, |
// Request to cancel the request for a new media stream. |
IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelGenerateStream, |
- int /* render view id */, |
+ int /* render frame id */, |
int /* request id */) |
// Request to close a device that has been opened by GenerateStream. |
IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_StopStreamDevice, |
- int /* render view id */, |
+ int /* render frame id */, |
std::string /*device_id*/) |
// Request to enumerate devices. |
@@ -129,7 +129,7 @@ IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_GetSources, |
// Request to enumerate devices. |
// Used by Pepper and WebRTC. |
IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_EnumerateDevices, |
- int /* render view id */, |
+ int /* render frame id */, |
int /* request id */, |
content::MediaStreamType /* type */, |
GURL /* security origin */, |
@@ -137,12 +137,12 @@ IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_EnumerateDevices, |
// Request to stop enumerating devices. |
IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelEnumerateDevices, |
- int /* render view id */, |
+ int /* render frame id */, |
int /* request id */) |
// Request to open the device. |
IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice, |
- int /* render view id */, |
+ int /* render frame id */, |
int /* request id */, |
std::string /* device_id */, |
content::MediaStreamType /* type */, |
@@ -150,5 +150,5 @@ IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice, |
// Request to close a device. |
IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CloseDevice, |
- int /* render view id */, |
+ int /* render frame id */, |
std::string /*label*/) |