ppapi/proxy/ppapi_messages.h - Issue 11270057: Add type argument to pepper content decryptor method GenerateKeyRequest().

Side by Side Diff: ppapi/proxy/ppapi_messages.h

Issue 11270057: Add type argument to pepper content decryptor method GenerateKeyRequest(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased and addressed TODOs related to integration of this CL. Created 8 years, 1 month 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

« no previous file with comments | « ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c ('k') | ppapi/proxy/ppp_content_decryptor_private_proxy.h » ('j') | no next file with comments »

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 // Multiply-included message header, no traditional include guard.	5 // Multiply-included message header, no traditional include guard.

6 #include <string>	6 #include <string>

7 #include <vector>	7 #include <vector>

8	8

9 #include "base/basictypes.h"	9 #include "base/basictypes.h"

10 #include "base/file_path.h"	10 #include "base/file_path.h"

(...skipping 612 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
623 int32_t /* result */)	623 int32_t /* result */)

624 #if !defined(OS_NACL) && !defined(NACL_WIN64)	624 #if !defined(OS_NACL) && !defined(NACL_WIN64)

625 // PPB_Broker.	625 // PPB_Broker.

626 IPC_MESSAGE_ROUTED3(	626 IPC_MESSAGE_ROUTED3(

627 PpapiMsg_PPBBroker_ConnectComplete,	627 PpapiMsg_PPBBroker_ConnectComplete,

628 ppapi::HostResource /* broker */,	628 ppapi::HostResource /* broker */,

629 IPC::PlatformFileForTransit /* handle */,	629 IPC::PlatformFileForTransit /* handle */,

630 int32_t /* result */)	630 int32_t /* result */)

631	631

632 // PPP_ContentDecryptor_Dev	632 // PPP_ContentDecryptor_Dev

633 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_GenerateKeyRequest,	633 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_GenerateKeyRequest,

634 PP_Instance /* instance */,	634 PP_Instance /* instance */,

635 ppapi::proxy::SerializedVar /* key_system, String */,	635 ppapi::proxy::SerializedVar /* key_system, String */,

	636 ppapi::proxy::SerializedVar /* type, String */,

636 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */)	637 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */)

637 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_AddKey,	638 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_AddKey,

638 PP_Instance /* instance */,	639 PP_Instance /* instance */,

639 ppapi::proxy::SerializedVar /* session_id, String */,	640 ppapi::proxy::SerializedVar /* session_id, String */,

640 ppapi::proxy::SerializedVar /* key, ArrayBuffer */,	641 ppapi::proxy::SerializedVar /* key, ArrayBuffer */,

641 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */)	642 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */)

642 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest,	643 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest,

643 PP_Instance /* instance */,	644 PP_Instance /* instance */,

644 ppapi::proxy::SerializedVar /* session_id, String */)	645 ppapi::proxy::SerializedVar /* session_id, String */)

645 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt,	646 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt,

(...skipping 1082 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1728 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashFontFile_GetFontTableReply,	1729 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashFontFile_GetFontTableReply,

1729 std::string /* output */)	1730 std::string /* output */)

1730	1731

1731 // Flash functions.	1732 // Flash functions.

1732 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Flash_Create)	1733 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Flash_Create)

1733 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Flash_EnumerateVideoCaptureDevices,	1734 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Flash_EnumerateVideoCaptureDevices,

1734 ppapi::HostResource /* video_capture */)	1735 ppapi::HostResource /* video_capture */)

1735 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Flash_EnumerateVideoCaptureDevicesReply,	1736 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Flash_EnumerateVideoCaptureDevicesReply,

1736 std::vector<ppapi::DeviceRefData> /* devices */)	1737 std::vector<ppapi::DeviceRefData> /* devices */)

1737 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)	1738 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)

OLD	NEW