| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 IPC_MESSAGE_ROUTED2(MediaStreamHostMsg_VideoDeviceFailed, | 48 IPC_MESSAGE_ROUTED2(MediaStreamHostMsg_VideoDeviceFailed, |
| 49 std::string /* label */, | 49 std::string /* label */, |
| 50 int /* index */) | 50 int /* index */) |
| 51 | 51 |
| 52 // Report of a failure of an audio device. | 52 // Report of a failure of an audio device. |
| 53 IPC_MESSAGE_ROUTED2(MediaStreamHostMsg_AudioDeviceFailed, | 53 IPC_MESSAGE_ROUTED2(MediaStreamHostMsg_AudioDeviceFailed, |
| 54 std::string /* label */, | 54 std::string /* label */, |
| 55 int /* index */) | 55 int /* index */) |
| 56 | 56 |
| 57 // The browser has enumerated devices successfully. | 57 // The browser has enumerated devices successfully. |
| 58 IPC_MESSAGE_ROUTED2(MediaStreamMsg_DevicesEnumerated, | 58 IPC_MESSAGE_ROUTED3(MediaStreamMsg_DevicesEnumerated, |
| 59 int /* request id */, | 59 int /* request id */, |
| 60 std::string /* label */, |
| 60 media_stream::StreamDeviceInfoArray /* device_list */) | 61 media_stream::StreamDeviceInfoArray /* device_list */) |
| 61 | 62 |
| 62 // The browser has failed to enumerate devices. | 63 // The browser has failed to enumerate devices. |
| 63 IPC_MESSAGE_ROUTED1(MediaStreamMsg_DevicesEnumerationFailed, | 64 IPC_MESSAGE_ROUTED1(MediaStreamMsg_DevicesEnumerationFailed, |
| 64 int /* request id */) | 65 int /* request id */) |
| 65 | 66 |
| 66 // TODO(wjia): should DeviceOpen* messages be merged with | 67 // TODO(wjia): should DeviceOpen* messages be merged with |
| 67 // StreamGenerat* ones? | 68 // StreamGenerat* ones? |
| 68 // The browser has opened a device successfully. | 69 // The browser has opened a device successfully. |
| 69 IPC_MESSAGE_ROUTED3(MediaStreamMsg_DeviceOpened, | 70 IPC_MESSAGE_ROUTED3(MediaStreamMsg_DeviceOpened, |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 media_stream::MediaStreamType /* type */, | 102 media_stream::MediaStreamType /* type */, |
| 102 GURL /* security origin */) | 103 GURL /* security origin */) |
| 103 | 104 |
| 104 // Request to open the device. | 105 // Request to open the device. |
| 105 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice, | 106 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice, |
| 106 int /* render view id */, | 107 int /* render view id */, |
| 107 int /* request id */, | 108 int /* request id */, |
| 108 std::string /* device_id */, | 109 std::string /* device_id */, |
| 109 media_stream::MediaStreamType /* type */, | 110 media_stream::MediaStreamType /* type */, |
| 110 GURL /* security origin */) | 111 GURL /* security origin */) |
| OLD | NEW |