| 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/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 639 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 650 | 650 |
| 651 #if !defined(OS_NACL) && !defined(NACL_WIN64) | 651 #if !defined(OS_NACL) && !defined(NACL_WIN64) |
| 652 // PPB_Broker. | 652 // PPB_Broker. |
| 653 IPC_MESSAGE_ROUTED3( | 653 IPC_MESSAGE_ROUTED3( |
| 654 PpapiMsg_PPBBroker_ConnectComplete, | 654 PpapiMsg_PPBBroker_ConnectComplete, |
| 655 ppapi::HostResource /* broker */, | 655 ppapi::HostResource /* broker */, |
| 656 IPC::PlatformFileForTransit /* handle */, | 656 IPC::PlatformFileForTransit /* handle */, |
| 657 int32_t /* result */) | 657 int32_t /* result */) |
| 658 | 658 |
| 659 // PPP_ContentDecryptor_Dev | 659 // PPP_ContentDecryptor_Dev |
| 660 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_GenerateKeyRequest, | 660 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Initialize, |
| 661 PP_Instance /* instance */, | 661 PP_Instance /* instance */, |
| 662 ppapi::proxy::SerializedVar /* key_system, String */, | 662 ppapi::proxy::SerializedVar /* key_system, String */, |
| 663 bool /* can_challenge_platform */) |
| 664 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_GenerateKeyRequest, |
| 665 PP_Instance /* instance */, |
| 663 ppapi::proxy::SerializedVar /* type, String */, | 666 ppapi::proxy::SerializedVar /* type, String */, |
| 664 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) | 667 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) |
| 665 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_AddKey, | 668 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_AddKey, |
| 666 PP_Instance /* instance */, | 669 PP_Instance /* instance */, |
| 667 ppapi::proxy::SerializedVar /* session_id, String */, | 670 ppapi::proxy::SerializedVar /* session_id, String */, |
| 668 ppapi::proxy::SerializedVar /* key, ArrayBuffer */, | 671 ppapi::proxy::SerializedVar /* key, ArrayBuffer */, |
| 669 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) | 672 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) |
| 670 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest, | 673 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest, |
| 671 PP_Instance /* instance */, | 674 PP_Instance /* instance */, |
| 672 ppapi::proxy::SerializedVar /* session_id, String */) | 675 ppapi::proxy::SerializedVar /* session_id, String */) |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1022 | 1025 |
| 1023 // PPB_Buffer. | 1026 // PPB_Buffer. |
| 1024 IPC_SYNC_MESSAGE_ROUTED2_2( | 1027 IPC_SYNC_MESSAGE_ROUTED2_2( |
| 1025 PpapiHostMsg_PPBBuffer_Create, | 1028 PpapiHostMsg_PPBBuffer_Create, |
| 1026 PP_Instance /* instance */, | 1029 PP_Instance /* instance */, |
| 1027 uint32_t /* size */, | 1030 uint32_t /* size */, |
| 1028 ppapi::HostResource /* result_resource */, | 1031 ppapi::HostResource /* result_resource */, |
| 1029 ppapi::proxy::SerializedHandle /* result_shm_handle */) | 1032 ppapi::proxy::SerializedHandle /* result_shm_handle */) |
| 1030 | 1033 |
| 1031 // PPB_ContentDecryptor_Dev messages handled in PPB_Instance_Proxy. | 1034 // PPB_ContentDecryptor_Dev messages handled in PPB_Instance_Proxy. |
| 1032 IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_NeedKey, | |
| 1033 PP_Instance /* instance */, | |
| 1034 ppapi::proxy::SerializedVar /* key_system, String */, | |
| 1035 ppapi::proxy::SerializedVar /* session_id, String */, | |
| 1036 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) | |
| 1037 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_KeyAdded, | 1035 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_KeyAdded, |
| 1038 PP_Instance /* instance */, | 1036 PP_Instance /* instance */, |
| 1039 ppapi::proxy::SerializedVar /* key_system, String */, | 1037 ppapi::proxy::SerializedVar /* key_system, String */, |
| 1040 ppapi::proxy::SerializedVar /* session_id, String */) | 1038 ppapi::proxy::SerializedVar /* session_id, String */) |
| 1041 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyMessage, | 1039 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyMessage, |
| 1042 PP_Instance /* instance */, | 1040 PP_Instance /* instance */, |
| 1043 ppapi::proxy::SerializedVar /* key_system, String */, | 1041 ppapi::proxy::SerializedVar /* key_system, String */, |
| 1044 ppapi::proxy::SerializedVar /* session_id, String */, | 1042 ppapi::proxy::SerializedVar /* session_id, String */, |
| 1045 ppapi::proxy::SerializedVar /* message, ArrayBuffer */, | 1043 ppapi::proxy::SerializedVar /* message, ArrayBuffer */, |
| 1046 ppapi::proxy::SerializedVar /* default_url, String */) | 1044 ppapi::proxy::SerializedVar /* default_url, String */) |
| (...skipping 988 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2035 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2033 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 2036 PP_TalkPermission /* permission */) | 2034 PP_TalkPermission /* permission */) |
| 2037 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2035 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 2038 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2036 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 2039 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2037 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 2040 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2038 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 2041 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2039 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 2042 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2040 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 2043 | 2041 |
| 2044 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2042 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |