Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_COMMON_NACL_TYPES_H_ | 5 #ifndef CHROME_COMMON_NACL_TYPES_H_ |
| 6 #define CHROME_COMMON_NACL_TYPES_H_ | 6 #define CHROME_COMMON_NACL_TYPES_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "build/build_config.h" | 11 #include "build/build_config.h" |
| 12 | 12 |
| 13 #if defined(OS_POSIX) | 13 #if defined(OS_POSIX) |
| 14 #include "base/file_descriptor_posix.h" | 14 #include "base/file_descriptor_posix.h" |
| 15 #endif | 15 #endif |
| 16 | 16 |
| 17 #include "net/base/tcp_listen_socket.h" | |
|
Mark Seaborn
2012/09/10 15:39:45
Unconditional #includes should go in the same bloc
halyavin
2012/09/11 11:16:12
This is left from my experiments. I don't need thi
| |
| 18 | |
| 17 #if defined(OS_WIN) | 19 #if defined(OS_WIN) |
| 18 #include <windows.h> // for HANDLE | 20 #include <windows.h> // for HANDLE |
| 19 #endif | 21 #endif |
| 20 | 22 |
| 21 // TODO(gregoryd): add a Windows definition for base::FileDescriptor | 23 // TODO(gregoryd): add a Windows definition for base::FileDescriptor |
| 22 namespace nacl { | 24 namespace nacl { |
| 23 | 25 |
| 24 #if defined(OS_WIN) | 26 #if defined(OS_WIN) |
| 25 // We assume that HANDLE always uses less than 32 bits | 27 // We assume that HANDLE always uses less than 32 bits |
| 26 typedef int FileDescriptor; | 28 typedef int FileDescriptor; |
| (...skipping 21 matching lines...) Expand all Loading... | |
| 48 bool validation_cache_enabled; | 50 bool validation_cache_enabled; |
| 49 std::string validation_cache_key; | 51 std::string validation_cache_key; |
| 50 // Chrome version string. Sending the version string over IPC avoids linkage | 52 // Chrome version string. Sending the version string over IPC avoids linkage |
| 51 // issues in cases where NaCl is not compiled into the main Chromium | 53 // issues in cases where NaCl is not compiled into the main Chromium |
| 52 // executable or DLL. | 54 // executable or DLL. |
| 53 std::string version; | 55 std::string version; |
| 54 | 56 |
| 55 bool enable_exception_handling; | 57 bool enable_exception_handling; |
| 56 bool enable_debug_stub; | 58 bool enable_debug_stub; |
| 57 bool enable_ipc_proxy; | 59 bool enable_ipc_proxy; |
| 60 FileDescriptor debug_stub_server_socket; | |
|
Mark Seaborn
2012/09/10 15:39:45
Nit: can you put this after 'handles'?
halyavin
2012/09/11 11:16:12
Done.
| |
| 58 }; | 61 }; |
| 59 | 62 |
| 60 } // namespace nacl | 63 } // namespace nacl |
| 61 | 64 |
| 62 #endif // CHROME_COMMON_NACL_TYPES_H_ | 65 #endif // CHROME_COMMON_NACL_TYPES_H_ |
| OLD | NEW |