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

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

Issue 185993004: Encrypted Media: Confine UUID code to MediaDrmBridge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: comments addressed Created 6 years, 9 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 content decryption module (CDM) implementation. 5 // IPC messages for content decryption module (CDM) implementation.
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
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
13 #include "content/common/media/cdm_messages_enums.h" 13 #include "content/common/media/cdm_messages_enums.h"
14 #include "ipc/ipc_message_macros.h" 14 #include "ipc/ipc_message_macros.h"
15 #include "media/base/media_keys.h" 15 #include "media/base/media_keys.h"
16 #include "url/gurl.h" 16 #include "url/gurl.h"
17 17
18 #undef IPC_MESSAGE_EXPORT 18 #undef IPC_MESSAGE_EXPORT
19 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT 19 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
20 #define IPC_MESSAGE_START CdmMsgStart 20 #define IPC_MESSAGE_START CdmMsgStart
21 21
22 IPC_ENUM_TRAITS(media::MediaKeys::KeyError) 22 IPC_ENUM_TRAITS(media::MediaKeys::KeyError)
23 IPC_ENUM_TRAITS(CdmHostMsg_CreateSession_ContentType) 23 IPC_ENUM_TRAITS(CdmHostMsg_CreateSession_ContentType)
24 24
25 IPC_MESSAGE_ROUTED3(CdmHostMsg_InitializeCdm, 25 IPC_MESSAGE_ROUTED3(CdmHostMsg_InitializeCdm,
26 int /* cdm_id */, 26 int /* cdm_id */,
27 std::vector<uint8> /* uuid */, 27 std::string /* key_system */,
28 GURL /* frame url */) 28 GURL /* frame url */)
29 29
30 IPC_MESSAGE_ROUTED4(CdmHostMsg_CreateSession, 30 IPC_MESSAGE_ROUTED4(CdmHostMsg_CreateSession,
31 int /* cdm_id */, 31 int /* cdm_id */,
32 uint32_t /* session_id */, 32 uint32_t /* session_id */,
33 CdmHostMsg_CreateSession_ContentType /* content_type */, 33 CdmHostMsg_CreateSession_ContentType /* content_type */,
34 std::vector<uint8> /* init_data */) 34 std::vector<uint8> /* init_data */)
35 35
36 IPC_MESSAGE_ROUTED3(CdmHostMsg_UpdateSession, 36 IPC_MESSAGE_ROUTED3(CdmHostMsg_UpdateSession,
37 int /* cdm_id */, 37 int /* cdm_id */,
(...skipping 23 matching lines...) Expand all
61 61
62 IPC_MESSAGE_ROUTED2(CdmMsg_SessionClosed, 62 IPC_MESSAGE_ROUTED2(CdmMsg_SessionClosed,
63 int /* cdm_id */, 63 int /* cdm_id */,
64 uint32_t /* session_id */) 64 uint32_t /* session_id */)
65 65
66 IPC_MESSAGE_ROUTED4(CdmMsg_SessionError, 66 IPC_MESSAGE_ROUTED4(CdmMsg_SessionError,
67 int /* cdm_id */, 67 int /* cdm_id */,
68 uint32_t /* session_id */, 68 uint32_t /* session_id */,
69 media::MediaKeys::KeyError /* error_code */, 69 media::MediaKeys::KeyError /* error_code */,
70 uint32_t /* system_code */) 70 uint32_t /* system_code */)
OLDNEW
« no previous file with comments | « content/browser/media/android/media_drm_credential_manager.cc ('k') | content/public/renderer/key_system_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698