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

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

Issue 17022008: Pass InitializeCDM() call through IPC to the browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase only Created 7 years, 6 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 | Annotate | Revision Log
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 android media player. 5 // IPC messages for android media player.
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 "base/time.h" 10 #include "base/time.h"
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 // Notify the player about the external surface, requesting it if necessary. 208 // Notify the player about the external surface, requesting it if necessary.
209 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface, 209 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
210 int /* player_id */, 210 int /* player_id */,
211 bool /* is_request */, 211 bool /* is_request */,
212 gfx::RectF /* rect */) 212 gfx::RectF /* rect */)
213 213
214 #endif 214 #endif
215 215
216 // Messages for encrypted media extensions API ------------------------------ 216 // Messages for encrypted media extensions API ------------------------------
217 217
218 IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_InitializeCDM,
219 int /* media_keys_id */,
220 std::vector<uint8> /* uuid */)
221
218 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_GenerateKeyRequest, 222 IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_GenerateKeyRequest,
ddorwin 2013/06/20 22:07:01 Should the prefix be changed to MediaKeysHostMsg?
xhwang 2013/06/21 00:50:13 Done.
219 int /* player_id */, 223 int /* media_keys_id */,
220 std::string /* type */, 224 std::string /* type */,
221 std::vector<uint8> /* init_data */) 225 std::vector<uint8> /* init_data */)
222 226
223 IPC_MESSAGE_ROUTED4(MediaPlayerHostMsg_AddKey, 227 IPC_MESSAGE_ROUTED4(MediaPlayerHostMsg_AddKey,
224 int /* player_id */, 228 int /* media_keys_id */,
225 std::vector<uint8> /* key */, 229 std::vector<uint8> /* key */,
226 std::vector<uint8> /* init_data */, 230 std::vector<uint8> /* init_data */,
227 std::string /* session_id */) 231 std::string /* session_id */)
228 232
229 IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_CancelKeyRequest, 233 IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_CancelKeyRequest,
230 int /* player_id */, 234 int /* media_keys_id */,
231 std::string /* session_id */) 235 std::string /* session_id */)
232 236
233 IPC_MESSAGE_ROUTED2(MediaPlayerMsg_KeyAdded, 237 IPC_MESSAGE_ROUTED2(MediaPlayerMsg_KeyAdded,
234 int /* player_id */, 238 int /* media_keys_id */,
235 std::string /* session_id */) 239 std::string /* session_id */)
236 240
237 IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyError, 241 IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyError,
238 int /* player_id */, 242 int /* media_keys_id */,
239 std::string /* session_id */, 243 std::string /* session_id */,
240 media::MediaKeys::KeyError /* error_code */, 244 media::MediaKeys::KeyError /* error_code */,
241 int /* system_code */) 245 int /* system_code */)
242 246
243 IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyMessage, 247 IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyMessage,
244 int /* player_id */, 248 int /* media_keys_id */,
245 std::string /* session_id */, 249 std::string /* session_id */,
246 std::string /* message */, 250 std::string /* message */,
247 std::string /* destination_url */) 251 std::string /* destination_url */)
248 252
249 // NeedKey is fired and handled in the renderer. Hence no message is needed. 253 // NeedKey is fired and handled in the renderer. Hence no message is needed.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698