Chromium Code Reviews| Index: chrome/common/nacl_types.h |
| =================================================================== |
| --- chrome/common/nacl_types.h (revision 211556) |
| +++ chrome/common/nacl_types.h (working copy) |
| @@ -9,7 +9,9 @@ |
| #include <vector> |
| #include "base/basictypes.h" |
| +#include "base/process.h" |
| #include "build/build_config.h" |
| +#include "ipc/ipc_channel.h" |
| #if defined(OS_POSIX) |
| #include "base/file_descriptor_posix.h" |
| @@ -24,7 +26,7 @@ |
| #if defined(OS_WIN) |
| // We assume that HANDLE always uses less than 32 bits |
|
Mark Seaborn
2013/07/18 22:15:49
This comment no longer matches the following line.
halyavin
2013/07/19 09:06:20
Done.
|
| -typedef int FileDescriptor; |
| +typedef HANDLE FileDescriptor; |
|
Mark Seaborn
2013/07/18 22:15:49
This change requires an explanation in the commit
halyavin
2013/07/19 09:06:20
Done.
|
| inline HANDLE ToNativeHandle(const FileDescriptor& desc) { |
| return reinterpret_cast<HANDLE>(desc); |
|
Mark Seaborn
2013/07/18 22:15:49
This can be just "return desc" now.
halyavin
2013/07/19 09:06:20
Done.
|
| } |
| @@ -81,6 +83,20 @@ |
| bool enable_exception_handling; |
| }; |
| +struct NaClLaunchResult { |
| + NaClLaunchResult(); |
| + NaClLaunchResult(FileDescriptor imc_channel_handle, |
| + const IPC::ChannelHandle& ipc_channel_handle, |
| + base::ProcessId plugin_pid, |
| + int plugin_child_id); |
| + ~NaClLaunchResult(); |
| + |
| + FileDescriptor imc_channel_handle; |
| + IPC::ChannelHandle ipc_channel_handle; |
| + base::ProcessId plugin_pid; |
| + int plugin_child_id; |
| +}; |
| + |
| } // namespace nacl |
| #endif // CHROME_COMMON_NACL_TYPES_H_ |