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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: content/common/media/media_player_messages_android.h
diff --git a/content/common/media/media_player_messages_android.h b/content/common/media/media_player_messages_android.h
index efc313c47bbcc848e67f57efa2fd46d6df6a0796..8ee87f360081deaea773af9ef0bca846552b2e10 100644
--- a/content/common/media/media_player_messages_android.h
+++ b/content/common/media/media_player_messages_android.h
@@ -215,33 +215,37 @@ IPC_MESSAGE_ROUTED3(MediaPlayerHostMsg_NotifyExternalSurface,
// Messages for encrypted media extensions API ------------------------------
+IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_InitializeCDM,
+ int /* media_keys_id */,
+ std::vector<uint8> /* uuid */)
+
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.
- int /* player_id */,
+ int /* media_keys_id */,
std::string /* type */,
std::vector<uint8> /* init_data */)
IPC_MESSAGE_ROUTED4(MediaPlayerHostMsg_AddKey,
- int /* player_id */,
+ int /* media_keys_id */,
std::vector<uint8> /* key */,
std::vector<uint8> /* init_data */,
std::string /* session_id */)
IPC_MESSAGE_ROUTED2(MediaPlayerHostMsg_CancelKeyRequest,
- int /* player_id */,
+ int /* media_keys_id */,
std::string /* session_id */)
IPC_MESSAGE_ROUTED2(MediaPlayerMsg_KeyAdded,
- int /* player_id */,
+ int /* media_keys_id */,
std::string /* session_id */)
IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyError,
- int /* player_id */,
+ int /* media_keys_id */,
std::string /* session_id */,
media::MediaKeys::KeyError /* error_code */,
int /* system_code */)
IPC_MESSAGE_ROUTED4(MediaPlayerMsg_KeyMessage,
- int /* player_id */,
+ int /* media_keys_id */,
std::string /* session_id */,
std::string /* message */,
std::string /* destination_url */)

Powered by Google App Engine
This is Rietveld 408576698