| 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 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 357 IPC_STRUCT_TRAITS_MEMBER(display_name) | 357 IPC_STRUCT_TRAITS_MEMBER(display_name) |
| 358 IPC_STRUCT_TRAITS_MEMBER(mtu) | 358 IPC_STRUCT_TRAITS_MEMBER(mtu) |
| 359 IPC_STRUCT_TRAITS_END() | 359 IPC_STRUCT_TRAITS_END() |
| 360 | 360 |
| 361 // Only whitelisted switches passed through PpapiNaClPluginArgs. | 361 // Only whitelisted switches passed through PpapiNaClPluginArgs. |
| 362 // The list of switches can be found in: | 362 // The list of switches can be found in: |
| 363 // components/nacl/browser/nacl_process_host.cc | 363 // components/nacl/browser/nacl_process_host.cc |
| 364 IPC_STRUCT_TRAITS_BEGIN(ppapi::PpapiNaClPluginArgs) | 364 IPC_STRUCT_TRAITS_BEGIN(ppapi::PpapiNaClPluginArgs) |
| 365 IPC_STRUCT_TRAITS_MEMBER(off_the_record) | 365 IPC_STRUCT_TRAITS_MEMBER(off_the_record) |
| 366 IPC_STRUCT_TRAITS_MEMBER(permissions) | 366 IPC_STRUCT_TRAITS_MEMBER(permissions) |
| 367 IPC_STRUCT_TRAITS_MEMBER(keepalive_throttle_interval_milliseconds) |
| 367 IPC_STRUCT_TRAITS_MEMBER(switch_names) | 368 IPC_STRUCT_TRAITS_MEMBER(switch_names) |
| 368 IPC_STRUCT_TRAITS_MEMBER(switch_values) | 369 IPC_STRUCT_TRAITS_MEMBER(switch_values) |
| 369 IPC_STRUCT_TRAITS_END() | 370 IPC_STRUCT_TRAITS_END() |
| 370 | 371 |
| 371 #if !defined(OS_NACL) && !defined(NACL_WIN64) | 372 #if !defined(OS_NACL) && !defined(NACL_WIN64) |
| 372 | 373 |
| 373 IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer) | 374 IPC_STRUCT_TRAITS_BEGIN(ppapi::proxy::PPPDecryptor_Buffer) |
| 374 IPC_STRUCT_TRAITS_MEMBER(resource) | 375 IPC_STRUCT_TRAITS_MEMBER(resource) |
| 375 IPC_STRUCT_TRAITS_MEMBER(handle) | 376 IPC_STRUCT_TRAITS_MEMBER(handle) |
| 376 IPC_STRUCT_TRAITS_MEMBER(size) | 377 IPC_STRUCT_TRAITS_MEMBER(size) |
| (...skipping 1706 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2083 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, | 2084 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Talk_RequestPermission, |
| 2084 PP_TalkPermission /* permission */) | 2085 PP_TalkPermission /* permission */) |
| 2085 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) | 2086 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_RequestPermissionReply) |
| 2086 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) | 2087 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StartRemoting) |
| 2087 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) | 2088 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StartRemotingReply) |
| 2088 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) | 2089 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Talk_StopRemoting) |
| 2089 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) | 2090 IPC_MESSAGE_CONTROL0(PpapiPluginMsg_Talk_StopRemotingReply) |
| 2090 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) | 2091 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Talk_NotifyEvent, PP_TalkEvent /* event */) |
| 2091 | 2092 |
| 2092 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) | 2093 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) |
| OLD | NEW |