Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6328)

Unified Diff: chrome/common/nacl_types.h

Issue 18045007: Show more different NaCl loading errors. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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_

Powered by Google App Engine
This is Rietveld 408576698