Show more different NaCl loading errors.

chrome/common/nacl_types.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_COMMON_NACL_TYPES_H_
 #define CHROME_COMMON_NACL_TYPES_H_
 
 #include <string>
 #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"
 #endif
 
 #if defined(OS_WIN)
 #include <windows.h>   // for HANDLE
 #endif
 
 // TODO(gregoryd): add a Windows definition for base::FileDescriptor
 namespace nacl {
 
 #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 message.

[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.

 }
 #elif defined(OS_POSIX)
 typedef base::FileDescriptor FileDescriptor;
 inline int ToNativeHandle(const FileDescriptor& desc) {
   return desc.fd;
 }
 #endif
 
 
 // Parameters sent to the NaCl process when we start it.
@@ skipping 34 matching lines @@
   ~NaClLaunchParams();
 
   std::string manifest_url;
   int render_view_id;
   uint32 permission_bits;
   bool uses_irt;
   bool enable_dyncode_syscalls;
   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_