| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // IPC messages for the media streaming. | 5 // IPC messages for the media streaming. |
| 6 // Multiply-included message file, hence no include guard. | 6 // Multiply-included message file, hence no include guard. |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 // refactoring MediaStreamDependencyFactory. | 106 // refactoring MediaStreamDependencyFactory. |
| 107 IPC_MESSAGE_CONTROL1(MediaStreamMsg_EnableAecDump, | 107 IPC_MESSAGE_CONTROL1(MediaStreamMsg_EnableAecDump, |
| 108 IPC::PlatformFileForTransit /* file_handle */) | 108 IPC::PlatformFileForTransit /* file_handle */) |
| 109 | 109 |
| 110 // Tell the renderer to disable AEC dump. | 110 // Tell the renderer to disable AEC dump. |
| 111 IPC_MESSAGE_CONTROL0(MediaStreamMsg_DisableAecDump) | 111 IPC_MESSAGE_CONTROL0(MediaStreamMsg_DisableAecDump) |
| 112 | 112 |
| 113 // Messages sent from the renderer to the browser. | 113 // Messages sent from the renderer to the browser. |
| 114 | 114 |
| 115 // Request a new media stream. | 115 // Request a new media stream. |
| 116 IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_GenerateStream, | 116 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_GenerateStream, |
| 117 int /* render view id */, | 117 int /* render view id */, |
| 118 int /* request id */, | 118 int /* request id */, |
| 119 content::StreamOptions /* components */, | 119 content::StreamOptions /* components */, |
| 120 GURL /* security origin */) | 120 GURL /* security origin */, |
| 121 bool /* user_gesture */) |
| 121 | 122 |
| 122 // Request to cancel the request for a new media stream. | 123 // Request to cancel the request for a new media stream. |
| 123 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelGenerateStream, | 124 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelGenerateStream, |
| 124 int /* render view id */, | 125 int /* render view id */, |
| 125 int /* request id */) | 126 int /* request id */) |
| 126 | 127 |
| 127 // Request to close a device that has been opened by GenerateStream. | 128 // Request to close a device that has been opened by GenerateStream. |
| 128 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_StopStreamDevice, | 129 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_StopStreamDevice, |
| 129 int /* render view id */, | 130 int /* render view id */, |
| 130 std::string /*device_id*/) | 131 std::string /*device_id*/) |
| (...skipping 23 matching lines...) Expand all Loading... |
| 154 int /* render view id */, | 155 int /* render view id */, |
| 155 int /* request id */, | 156 int /* request id */, |
| 156 std::string /* device_id */, | 157 std::string /* device_id */, |
| 157 content::MediaStreamType /* type */, | 158 content::MediaStreamType /* type */, |
| 158 GURL /* security origin */) | 159 GURL /* security origin */) |
| 159 | 160 |
| 160 // Request to close a device. | 161 // Request to close a device. |
| 161 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CloseDevice, | 162 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CloseDevice, |
| 162 int /* render view id */, | 163 int /* render view id */, |
| 163 std::string /*label*/) | 164 std::string /*label*/) |
| OLD | NEW |