| Index: components/nacl/common/nacl_types.h
|
| diff --git a/components/nacl/common/nacl_types.h b/components/nacl/common/nacl_types.h
|
| index 6c991626b462fe5e3179de6baf301eca29309159..2780ac9b74e8cde5b55891e31863dac9cc60bdda 100644
|
| --- a/components/nacl/common/nacl_types.h
|
| +++ b/components/nacl/common/nacl_types.h
|
| @@ -110,69 +110,6 @@ struct NaClStartParams {
|
| // in nacl_types.cc.
|
| };
|
|
|
| -// Parameters sent to the browser process to have it launch a NaCl process.
|
| -//
|
| -// If you change this, you will also need to update the IPC serialization in
|
| -// nacl_host_messages.h.
|
| -struct NaClLaunchParams {
|
| - NaClLaunchParams();
|
| - NaClLaunchParams(const std::string& manifest_url,
|
| - const IPC::PlatformFileForTransit& nexe_file,
|
| - uint64_t nexe_token_lo,
|
| - uint64_t nexe_token_hi,
|
| - const std::vector<NaClResourcePrefetchRequest>&
|
| - resource_prefetch_request_list,
|
| - int render_view_id,
|
| - uint32_t permission_bits,
|
| - bool uses_nonsfi_mode,
|
| - NaClAppProcessType process_type);
|
| - NaClLaunchParams(const NaClLaunchParams& other);
|
| - ~NaClLaunchParams();
|
| -
|
| - std::string manifest_url;
|
| - // On Windows, the HANDLE passed here is valid in the renderer's context.
|
| - // It's the responsibility of the browser to duplicate this handle properly
|
| - // for passing it to the plugin.
|
| - IPC::PlatformFileForTransit nexe_file;
|
| - uint64_t nexe_token_lo;
|
| - uint64_t nexe_token_hi;
|
| - std::vector<NaClResourcePrefetchRequest> resource_prefetch_request_list;
|
| -
|
| - int render_view_id;
|
| - uint32_t permission_bits;
|
| - bool uses_nonsfi_mode;
|
| -
|
| - NaClAppProcessType process_type;
|
| -};
|
| -
|
| -struct NaClLaunchResult {
|
| - NaClLaunchResult();
|
| - NaClLaunchResult(
|
| - const IPC::ChannelHandle& ppapi_ipc_channel_handle,
|
| - const IPC::ChannelHandle& trusted_ipc_channel_handle,
|
| - const IPC::ChannelHandle& manifest_service_ipc_channel_handle,
|
| - base::ProcessId plugin_pid,
|
| - int plugin_child_id,
|
| - base::SharedMemoryHandle crash_info_shmem_handle);
|
| - ~NaClLaunchResult();
|
| -
|
| - // For plugin <-> renderer PPAPI communication.
|
| - IPC::ChannelHandle ppapi_ipc_channel_handle;
|
| -
|
| - // For plugin loader <-> renderer control communication (loading and
|
| - // starting nexe).
|
| - IPC::ChannelHandle trusted_ipc_channel_handle;
|
| -
|
| - // For plugin <-> renderer ManifestService communication.
|
| - IPC::ChannelHandle manifest_service_ipc_channel_handle;
|
| -
|
| - base::ProcessId plugin_pid;
|
| - int plugin_child_id;
|
| -
|
| - // For NaCl <-> renderer crash information reporting.
|
| - base::SharedMemoryHandle crash_info_shmem_handle;
|
| -};
|
| -
|
| } // namespace nacl
|
|
|
| #endif // COMPONENTS_NACL_COMMON_NACL_TYPES_H_
|
|
|