| 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 <map> | 6 #include <map> |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 | 775 |
| 776 #if !defined(OS_NACL) && !defined(NACL_WIN64) | 776 #if !defined(OS_NACL) && !defined(NACL_WIN64) |
| 777 // PPB_Broker. | 777 // PPB_Broker. |
| 778 IPC_MESSAGE_ROUTED3( | 778 IPC_MESSAGE_ROUTED3( |
| 779 PpapiMsg_PPBBroker_ConnectComplete, | 779 PpapiMsg_PPBBroker_ConnectComplete, |
| 780 ppapi::HostResource /* broker */, | 780 ppapi::HostResource /* broker */, |
| 781 IPC::PlatformFileForTransit /* handle */, | 781 IPC::PlatformFileForTransit /* handle */, |
| 782 int32_t /* result */) | 782 int32_t /* result */) |
| 783 | 783 |
| 784 // PPP_ContentDecryptor_Dev | 784 // PPP_ContentDecryptor_Dev |
| 785 IPC_MESSAGE_ROUTED2(PpapiMsg_PPPContentDecryptor_Initialize, | 785 IPC_MESSAGE_ROUTED4(PpapiMsg_PPPContentDecryptor_Initialize, |
| 786 PP_Instance /* instance */, | 786 PP_Instance /* instance */, |
| 787 ppapi::proxy::SerializedVar /* key_system, String */) | 787 ppapi::proxy::SerializedVar /* key_system, String */, |
| 788 PP_Bool /* allow_distinctive_identifier */, |
| 789 PP_Bool /* allow_persistent_state */) |
| 788 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_SetServerCertificate, | 790 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_SetServerCertificate, |
| 789 PP_Instance /* instance */, | 791 PP_Instance /* instance */, |
| 790 uint32_t /* promise_id */, | 792 uint32_t /* promise_id */, |
| 791 std::vector<uint8_t> /* certificate */) | 793 std::vector<uint8_t> /* certificate */) |
| 792 IPC_MESSAGE_ROUTED5( | 794 IPC_MESSAGE_ROUTED5( |
| 793 PpapiMsg_PPPContentDecryptor_CreateSessionAndGenerateRequest, | 795 PpapiMsg_PPPContentDecryptor_CreateSessionAndGenerateRequest, |
| 794 PP_Instance /* instance */, | 796 PP_Instance /* instance */, |
| 795 uint32_t /* promise_id */, | 797 uint32_t /* promise_id */, |
| 796 PP_SessionType /* session_type */, | 798 PP_SessionType /* session_type */, |
| 797 ppapi::proxy::SerializedVar /* init_data_type, String */, | 799 ppapi::proxy::SerializedVar /* init_data_type, String */, |
| (...skipping 1549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2347 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2349 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 2348 PP_TalkPermission /* permission */) | 2350 PP_TalkPermission /* permission */) |
| 2349 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2351 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 2350 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2352 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 2351 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2353 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 2352 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2354 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 2353 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2355 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 2354 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2356 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 2355 | 2357 |
| 2356 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2358 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |