| Index: chrome/common/nacl_types.h
|
| diff --git a/chrome/common/nacl_types.h b/chrome/common/nacl_types.h
|
| deleted file mode 100644
|
| index a5f6e6bcb06f3d50399cce037cce1bc9c1d44c74..0000000000000000000000000000000000000000
|
| --- a/chrome/common/nacl_types.h
|
| +++ /dev/null
|
| @@ -1,86 +0,0 @@
|
| -// 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 "build/build_config.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
|
| -typedef int FileDescriptor;
|
| -inline HANDLE ToNativeHandle(const FileDescriptor& desc) {
|
| - return reinterpret_cast<HANDLE>(desc);
|
| -}
|
| -#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.
|
| -//
|
| -// If you change this, you will also need to update the IPC serialization in
|
| -// nacl_messages.h.
|
| -struct NaClStartParams {
|
| - NaClStartParams();
|
| - ~NaClStartParams();
|
| -
|
| - std::vector<FileDescriptor> handles;
|
| - FileDescriptor debug_stub_server_bound_socket;
|
| -
|
| - bool validation_cache_enabled;
|
| - std::string validation_cache_key;
|
| - // Chrome version string. Sending the version string over IPC avoids linkage
|
| - // issues in cases where NaCl is not compiled into the main Chromium
|
| - // executable or DLL.
|
| - std::string version;
|
| -
|
| - bool enable_exception_handling;
|
| - bool enable_debug_stub;
|
| - bool enable_ipc_proxy;
|
| - bool uses_irt;
|
| - bool enable_dyncode_syscalls;
|
| -};
|
| -
|
| -// 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
|
| -// renderer_messages.h.
|
| -struct NaClLaunchParams {
|
| - NaClLaunchParams();
|
| - NaClLaunchParams(const std::string& u, int r, uint32 p, bool uses_irt,
|
| - bool enable_dyncode_syscalls,
|
| - bool enable_exception_handling);
|
| - NaClLaunchParams(const NaClLaunchParams& l);
|
| - ~NaClLaunchParams();
|
| -
|
| - std::string manifest_url;
|
| - int render_view_id;
|
| - uint32 permission_bits;
|
| - bool uses_irt;
|
| - bool enable_dyncode_syscalls;
|
| - bool enable_exception_handling;
|
| -};
|
| -
|
| -} // namespace nacl
|
| -
|
| -#endif // CHROME_COMMON_NACL_TYPES_H_
|
|
|