OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 file, no traditional include guard. | 5 // Multiply-included file, no traditional include guard. |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/process/process.h" | 10 #include "base/process/process.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 IPC_STRUCT_TRAITS_MEMBER(plugin_pid) | 35 IPC_STRUCT_TRAITS_MEMBER(plugin_pid) |
36 IPC_STRUCT_TRAITS_MEMBER(plugin_child_id) | 36 IPC_STRUCT_TRAITS_MEMBER(plugin_child_id) |
37 IPC_STRUCT_TRAITS_END() | 37 IPC_STRUCT_TRAITS_END() |
38 | 38 |
39 IPC_STRUCT_TRAITS_BEGIN(nacl::PnaclCacheInfo) | 39 IPC_STRUCT_TRAITS_BEGIN(nacl::PnaclCacheInfo) |
40 IPC_STRUCT_TRAITS_MEMBER(pexe_url) | 40 IPC_STRUCT_TRAITS_MEMBER(pexe_url) |
41 IPC_STRUCT_TRAITS_MEMBER(abi_version) | 41 IPC_STRUCT_TRAITS_MEMBER(abi_version) |
42 IPC_STRUCT_TRAITS_MEMBER(opt_level) | 42 IPC_STRUCT_TRAITS_MEMBER(opt_level) |
43 IPC_STRUCT_TRAITS_MEMBER(last_modified) | 43 IPC_STRUCT_TRAITS_MEMBER(last_modified) |
44 IPC_STRUCT_TRAITS_MEMBER(etag) | 44 IPC_STRUCT_TRAITS_MEMBER(etag) |
| 45 IPC_STRUCT_TRAITS_MEMBER(has_no_store_header) |
45 IPC_STRUCT_TRAITS_END() | 46 IPC_STRUCT_TRAITS_END() |
46 | 47 |
47 // A renderer sends this to the browser process when it wants to start | 48 // A renderer sends this to the browser process when it wants to start |
48 // a new instance of the Native Client process. The browser will launch | 49 // a new instance of the Native Client process. The browser will launch |
49 // the process and return an IPC channel handle. This handle will only | 50 // the process and return an IPC channel handle. This handle will only |
50 // be valid if the NaCl IPC proxy is enabled. | 51 // be valid if the NaCl IPC proxy is enabled. |
51 IPC_SYNC_MESSAGE_CONTROL1_2(NaClHostMsg_LaunchNaCl, | 52 IPC_SYNC_MESSAGE_CONTROL1_2(NaClHostMsg_LaunchNaCl, |
52 nacl::NaClLaunchParams /* launch_params */, | 53 nacl::NaClLaunchParams /* launch_params */, |
53 nacl::NaClLaunchResult /* launch_result */, | 54 nacl::NaClLaunchResult /* launch_result */, |
54 std::string /* error_message */) | 55 std::string /* error_message */) |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 int /* Error ID */) | 103 int /* Error ID */) |
103 | 104 |
104 // A renderer sends this to the browser process when it wants to | 105 // A renderer sends this to the browser process when it wants to |
105 // open a NaCl executable file from an installed application directory. | 106 // open a NaCl executable file from an installed application directory. |
106 IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, | 107 IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, |
107 int /* render_view_id */, | 108 int /* render_view_id */, |
108 GURL /* URL of NaCl executable file */, | 109 GURL /* URL of NaCl executable file */, |
109 IPC::PlatformFileForTransit /* output file */, | 110 IPC::PlatformFileForTransit /* output file */, |
110 uint64 /* file_token_lo */, | 111 uint64 /* file_token_lo */, |
111 uint64 /* file_token_hi */) | 112 uint64 /* file_token_hi */) |
OLD | NEW |