Index: components/nacl/common/nacl_host_messages.h |
diff --git a/components/nacl/common/nacl_host_messages.h b/components/nacl/common/nacl_host_messages.h |
index 3a37e8f24e064ca0e81cdbd2a4ee72e614c6e3cc..046e2601c1c95f3f7c0a00a5035c6f97c2ae7ae6 100644 |
--- a/components/nacl/common/nacl_host_messages.h |
+++ b/components/nacl/common/nacl_host_messages.h |
@@ -25,6 +25,9 @@ IPC_STRUCT_TRAITS_BEGIN(nacl::NaClLaunchParams) |
IPC_STRUCT_TRAITS_MEMBER(nexe_file) |
IPC_STRUCT_TRAITS_MEMBER(nexe_token_lo) |
IPC_STRUCT_TRAITS_MEMBER(nexe_token_hi) |
+ IPC_STRUCT_TRAITS_MEMBER(resource_files) |
+ IPC_STRUCT_TRAITS_MEMBER(resource_file_tokens) |
+ IPC_STRUCT_TRAITS_MEMBER(resource_keys) |
IPC_STRUCT_TRAITS_MEMBER(render_view_id) |
IPC_STRUCT_TRAITS_MEMBER(permission_bits) |
IPC_STRUCT_TRAITS_MEMBER(uses_nonsfi_mode) |
@@ -52,6 +55,14 @@ IPC_STRUCT_TRAITS_BEGIN(nacl::PnaclCacheInfo) |
IPC_STRUCT_TRAITS_MEMBER(extra_flags) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(nacl::NaClOpenExecutableResult) |
+ IPC_STRUCT_TRAITS_MEMBER(file) |
+ IPC_STRUCT_TRAITS_MEMBER(file_token_lo) |
+ IPC_STRUCT_TRAITS_MEMBER(file_token_hi) |
+ IPC_STRUCT_TRAITS_MEMBER(resource_files) |
+ IPC_STRUCT_TRAITS_MEMBER(resource_file_tokens) |
+IPC_STRUCT_TRAITS_END() |
+ |
// A renderer sends this to the browser process when it wants to start |
// a new instance of the Native Client process. The browser will launch |
// the process and return an IPC channel handle. This handle will only |
@@ -103,12 +114,11 @@ IPC_MESSAGE_CONTROL1(NaClHostMsg_MissingArchError, |
// A renderer sends this to the browser process when it wants to |
// open a NaCl executable file from an installed application directory. |
-IPC_SYNC_MESSAGE_CONTROL2_3(NaClHostMsg_OpenNaClExecutable, |
+IPC_SYNC_MESSAGE_CONTROL3_1(NaClHostMsg_OpenNaClExecutable, |
int /* render_view_id */, |
GURL /* URL of NaCl executable file */, |
- IPC::PlatformFileForTransit /* output file */, |
- uint64 /* file_token_lo */, |
- uint64 /* file_token_hi */) |
+ std::vector<GURL> /* URLs of NaCl resource files */, |
+ nacl::NaClOpenExecutableResult /* open_result */) |
// A renderer sends this to the browser process to determine how many |
// processors are online. |