Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1001)

Side by Side Diff: content/common/media/media_stream_messages.h

Issue 629953002: Remove obsolete path of getSources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 content::MediaStreamRequestResult /* result */) 71 content::MediaStreamRequestResult /* result */)
72 72
73 // The browser reports that a media device has been stopped. Stopping was 73 // The browser reports that a media device has been stopped. Stopping was
74 // triggered from the browser process. 74 // triggered from the browser process.
75 IPC_MESSAGE_ROUTED2(MediaStreamMsg_DeviceStopped, 75 IPC_MESSAGE_ROUTED2(MediaStreamMsg_DeviceStopped,
76 std::string /* label */, 76 std::string /* label */,
77 content::StreamDeviceInfo /* the device */) 77 content::StreamDeviceInfo /* the device */)
78 78
79 // The browser has enumerated devices. If no devices are found 79 // The browser has enumerated devices. If no devices are found
80 // |device_list| is empty. 80 // |device_list| is empty.
81 // Used by Pepper. 81 // Used by Pepper and WebRTC.
82 // TODO(vrk,wjia): Move this to pepper code.
83 IPC_MESSAGE_ROUTED2(MediaStreamMsg_DevicesEnumerated, 82 IPC_MESSAGE_ROUTED2(MediaStreamMsg_DevicesEnumerated,
84 int /* request id */, 83 int /* request id */,
85 content::StreamDeviceInfoArray /* device_list */) 84 content::StreamDeviceInfoArray /* device_list */)
86 85
87 // TODO(wjia): should DeviceOpen* messages be merged with 86 // TODO(wjia): should DeviceOpen* messages be merged with
88 // StreamGenerat* ones? 87 // StreamGenerat* ones?
89 // The browser has opened a device successfully. 88 // The browser has opened a device successfully.
90 IPC_MESSAGE_ROUTED3(MediaStreamMsg_DeviceOpened, 89 IPC_MESSAGE_ROUTED3(MediaStreamMsg_DeviceOpened,
91 int /* request id */, 90 int /* request id */,
92 std::string /* label */, 91 std::string /* label */,
93 content::StreamDeviceInfo /* the device */) 92 content::StreamDeviceInfo /* the device */)
94 93
95 // The browser has failed to open a device. 94 // The browser has failed to open a device.
96 IPC_MESSAGE_ROUTED1(MediaStreamMsg_DeviceOpenFailed, 95 IPC_MESSAGE_ROUTED1(MediaStreamMsg_DeviceOpenFailed,
97 int /* request id */) 96 int /* request id */)
98 97
99 // Response to enumerate devices request.
100 IPC_MESSAGE_CONTROL2(MediaStreamMsg_GetSourcesACK,
101 int /* request id */,
102 content::StreamDeviceInfoArray /* device_list */)
103
104 // Messages sent from the renderer to the browser. 98 // Messages sent from the renderer to the browser.
105 99
106 // Request a new media stream. 100 // Request a new media stream.
107 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_GenerateStream, 101 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_GenerateStream,
108 int /* render frame id */, 102 int /* render frame id */,
109 int /* request id */, 103 int /* request id */,
110 content::StreamOptions /* components */, 104 content::StreamOptions /* components */,
111 GURL /* security origin */, 105 GURL /* security origin */,
112 bool /* user_gesture */) 106 bool /* user_gesture */)
113 107
114 // Request to cancel the request for a new media stream. 108 // Request to cancel the request for a new media stream.
115 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelGenerateStream, 109 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelGenerateStream,
116 int /* render frame id */, 110 int /* render frame id */,
117 int /* request id */) 111 int /* request id */)
118 112
119 // Request to close a device that has been opened by GenerateStream. 113 // Request to close a device that has been opened by GenerateStream.
120 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_StopStreamDevice, 114 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_StopStreamDevice,
121 int /* render frame id */, 115 int /* render frame id */,
122 std::string /*device_id*/) 116 std::string /*device_id*/)
123 117
124 // Request to enumerate devices. 118 // Request to enumerate devices.
125 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_GetSources,
126 int /* request id */,
127 GURL /* origin */)
128
129 // Request to enumerate devices.
130 // Used by Pepper and WebRTC. 119 // Used by Pepper and WebRTC.
131 IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_EnumerateDevices, 120 IPC_MESSAGE_CONTROL4(MediaStreamHostMsg_EnumerateDevices,
132 int /* render frame id */, 121 int /* render frame id */,
133 int /* request id */, 122 int /* request id */,
134 content::MediaStreamType /* type */, 123 content::MediaStreamType /* type */,
135 GURL /* security origin */) 124 GURL /* security origin */)
136 125
137 // Request to stop enumerating devices. 126 // Request to stop enumerating devices.
138 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelEnumerateDevices, 127 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CancelEnumerateDevices,
139 int /* render frame id */, 128 int /* render frame id */,
140 int /* request id */) 129 int /* request id */)
141 130
142 // Request to open the device. 131 // Request to open the device.
143 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice, 132 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice,
144 int /* render frame id */, 133 int /* render frame id */,
145 int /* request id */, 134 int /* request id */,
146 std::string /* device_id */, 135 std::string /* device_id */,
147 content::MediaStreamType /* type */, 136 content::MediaStreamType /* type */,
148 GURL /* security origin */) 137 GURL /* security origin */)
149 138
150 // Request to close a device. 139 // Request to close a device.
151 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CloseDevice, 140 IPC_MESSAGE_CONTROL2(MediaStreamHostMsg_CloseDevice,
152 int /* render frame id */, 141 int /* render frame id */,
153 std::string /*label*/) 142 std::string /*label*/)
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698