| 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 615 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 626 | 626 |
| 627 #if !defined(OS_NACL) && !defined(NACL_WIN64) | 627 #if !defined(OS_NACL) && !defined(NACL_WIN64) |
| 628 // PPB_Broker. | 628 // PPB_Broker. |
| 629 IPC_MESSAGE_ROUTED3( | 629 IPC_MESSAGE_ROUTED3( |
| 630 PpapiMsg_PPBBroker_ConnectComplete, | 630 PpapiMsg_PPBBroker_ConnectComplete, |
| 631 ppapi::HostResource /* broker */, | 631 ppapi::HostResource /* broker */, |
| 632 IPC::PlatformFileForTransit /* handle */, | 632 IPC::PlatformFileForTransit /* handle */, |
| 633 int32_t /* result */) | 633 int32_t /* result */) |
| 634 | 634 |
| 635 // PPP_ContentDecryptor_Dev | 635 // PPP_ContentDecryptor_Dev |
| 636 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_GenerateKeyRequest, | 636 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Initialize, |
| 637 PP_Instance /* instance */, | 637 PP_Instance /* instance */, |
| 638 ppapi::proxy::SerializedVar /* key_system, String */, | 638 ppapi::proxy::SerializedVar /* key_system, String */, |
| 639 bool /* can_challenge_platform */) |
| 640 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_GenerateKeyRequest, |
| 641 PP_Instance /* instance */, |
| 639 ppapi::proxy::SerializedVar /* type, String */, | 642 ppapi::proxy::SerializedVar /* type, String */, |
| 640 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) | 643 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) |
| 641 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_AddKey, | 644 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_AddKey, |
| 642 PP_Instance /* instance */, | 645 PP_Instance /* instance */, |
| 643 ppapi::proxy::SerializedVar /* session_id, String */, | 646 ppapi::proxy::SerializedVar /* session_id, String */, |
| 644 ppapi::proxy::SerializedVar /* key, ArrayBuffer */, | 647 ppapi::proxy::SerializedVar /* key, ArrayBuffer */, |
| 645 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) | 648 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) |
| 646 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest, | 649 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_CancelKeyRequest, |
| 647 PP_Instance /* instance */, | 650 PP_Instance /* instance */, |
| 648 ppapi::proxy::SerializedVar /* session_id, String */) | 651 ppapi::proxy::SerializedVar /* session_id, String */) |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 961 | 964 |
| 962 // PPB_Buffer. | 965 // PPB_Buffer. |
| 963 IPC_SYNC_MESSAGE_ROUTED2_2( | 966 IPC_SYNC_MESSAGE_ROUTED2_2( |
| 964 PpapiHostMsg_PPBBuffer_Create, | 967 PpapiHostMsg_PPBBuffer_Create, |
| 965 PP_Instance /* instance */, | 968 PP_Instance /* instance */, |
| 966 uint32_t /* size */, | 969 uint32_t /* size */, |
| 967 ppapi::HostResource /* result_resource */, | 970 ppapi::HostResource /* result_resource */, |
| 968 ppapi::proxy::SerializedHandle /* result_shm_handle */) | 971 ppapi::proxy::SerializedHandle /* result_shm_handle */) |
| 969 | 972 |
| 970 // PPB_ContentDecryptor_Dev messages handled in PPB_Instance_Proxy. | 973 // PPB_ContentDecryptor_Dev messages handled in PPB_Instance_Proxy. |
| 971 IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBInstance_NeedKey, | |
| 972 PP_Instance /* instance */, | |
| 973 ppapi::proxy::SerializedVar /* key_system, String */, | |
| 974 ppapi::proxy::SerializedVar /* session_id, String */, | |
| 975 ppapi::proxy::SerializedVar /* init_data, ArrayBuffer */) | |
| 976 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_KeyAdded, | 974 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_KeyAdded, |
| 977 PP_Instance /* instance */, | 975 PP_Instance /* instance */, |
| 978 ppapi::proxy::SerializedVar /* key_system, String */, | 976 ppapi::proxy::SerializedVar /* key_system, String */, |
| 979 ppapi::proxy::SerializedVar /* session_id, String */) | 977 ppapi::proxy::SerializedVar /* session_id, String */) |
| 980 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyMessage, | 978 IPC_MESSAGE_ROUTED5(PpapiHostMsg_PPBInstance_KeyMessage, |
| 981 PP_Instance /* instance */, | 979 PP_Instance /* instance */, |
| 982 ppapi::proxy::SerializedVar /* key_system, String */, | 980 ppapi::proxy::SerializedVar /* key_system, String */, |
| 983 ppapi::proxy::SerializedVar /* session_id, String */, | 981 ppapi::proxy::SerializedVar /* session_id, String */, |
| 984 ppapi::proxy::SerializedVar /* message, ArrayBuffer */, | 982 ppapi::proxy::SerializedVar /* message, ArrayBuffer */, |
| 985 ppapi::proxy::SerializedVar /* default_url, String */) | 983 ppapi::proxy::SerializedVar /* default_url, String */) |
| (...skipping 963 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1949 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 1947 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 1950 PP_TalkPermission /* permission */) | 1948 PP_TalkPermission /* permission */) |
| 1951 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 1949 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 1952 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 1950 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 1953 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 1951 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 1954 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 1952 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 1955 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 1953 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 1956 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 1954 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 1957 | 1955 |
| 1958 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 1956 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |