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 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 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
282 // Messages for encrypted media extensions API ------------------------------ | 282 // Messages for encrypted media extensions API ------------------------------ |
283 // TODO(xhwang): Move the following messages to a separate file. | 283 // TODO(xhwang): Move the following messages to a separate file. |
284 | 284 |
285 IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_InitializeCDM, | 285 IPC_MESSAGE_ROUTED3(MediaKeysHostMsg_InitializeCDM, |
286 int /* media_keys_id */, | 286 int /* media_keys_id */, |
287 std::vector<uint8> /* uuid */, | 287 std::vector<uint8> /* uuid */, |
288 GURL /* frame url */) | 288 GURL /* frame url */) |
289 | 289 |
290 IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_GenerateKeyRequest, | 290 IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_GenerateKeyRequest, |
291 int /* media_keys_id */, | 291 int /* media_keys_id */, |
292 uint32_t /* reference_id */, | 292 uint32_t /* session_id */, |
293 std::string /* type */, | 293 std::string /* type */, |
294 std::vector<uint8> /* init_data */) | 294 std::vector<uint8> /* init_data */) |
295 | 295 |
296 IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_AddKey, | 296 IPC_MESSAGE_ROUTED4(MediaKeysHostMsg_AddKey, |
297 int /* media_keys_id */, | 297 int /* media_keys_id */, |
298 uint32_t /* reference_id */, | 298 uint32_t /* session_id */, |
299 std::vector<uint8> /* key */, | 299 std::vector<uint8> /* key */, |
300 std::vector<uint8> /* init_data */) | 300 std::vector<uint8> /* init_data */) |
301 | 301 |
302 IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_CancelKeyRequest, | 302 IPC_MESSAGE_ROUTED2(MediaKeysHostMsg_CancelKeyRequest, |
303 int /* media_keys_id */, | 303 int /* media_keys_id */, |
304 uint32_t /* reference_id */) | 304 uint32_t /* session_id */) |
305 | 305 |
306 IPC_MESSAGE_ROUTED2(MediaKeysMsg_KeyAdded, | 306 IPC_MESSAGE_ROUTED2(MediaKeysMsg_KeyAdded, |
307 int /* media_keys_id */, | 307 int /* media_keys_id */, |
308 uint32_t /* reference_id */) | 308 uint32_t /* session_id */) |
309 | 309 |
310 IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyError, | 310 IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyError, |
311 int /* media_keys_id */, | 311 int /* media_keys_id */, |
312 uint32_t /* reference_id */, | 312 uint32_t /* session_id */, |
313 media::MediaKeys::KeyError /* error_code */, | 313 media::MediaKeys::KeyError /* error_code */, |
314 int /* system_code */) | 314 int /* system_code */) |
315 | 315 |
316 IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyMessage, | 316 IPC_MESSAGE_ROUTED4(MediaKeysMsg_KeyMessage, |
317 int /* media_keys_id */, | 317 int /* media_keys_id */, |
318 uint32_t /* reference_id */, | 318 uint32_t /* session_id */, |
319 std::vector<uint8> /* message */, | 319 std::vector<uint8> /* message */, |
320 std::string /* destination_url */) | 320 std::string /* destination_url */) |
321 | 321 |
322 IPC_MESSAGE_ROUTED3(MediaKeysMsg_SetSessionId, | 322 IPC_MESSAGE_ROUTED3(MediaKeysMsg_SetSessionId, |
ddorwin
2013/12/05 00:44:52
Are these all being renamed when they are extracte
jrummell
2013/12/06 23:42:35
Updated in https://codereview.chromium.org/1003230
| |
323 int /* media_keys_id */, | 323 int /* media_keys_id */, |
324 uint32_t /* reference_id */, | 324 uint32_t /* session_id */, |
325 std::string /* session_id */) | 325 std::string /* web_session_id */) |
OLD | NEW |