diff options
Diffstat (limited to 'chrome/nacl/nacl_thread.cc')
| -rw-r--r-- | chrome/nacl/nacl_thread.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/nacl/nacl_thread.cc b/chrome/nacl/nacl_thread.cc index 33c0195..0f05f06 100644 --- a/chrome/nacl/nacl_thread.cc +++ b/chrome/nacl/nacl_thread.cc @@ -16,9 +16,7 @@ typedef HANDLE NaClHandle; typedef int NaClHandle; #endif // NaClHandle -// This is currently necessary because we have a conflict between -// NaCl's "struct NaClThread" and Chromium's "class NaClThread". -extern "C" int NaClMainForChromium(int handle_count, const NaClHandle* handles); +int SelMain(const int desc, const NaClHandle handle); NaClThread::NaClThread() { } @@ -38,6 +36,5 @@ void NaClThread::OnControlMessageReceived(const IPC::Message& msg) { void NaClThread::OnStartSelLdr(int channel_descriptor, nacl::FileDescriptor handle) { - NaClHandle nacl_handle = nacl::ToNativeHandle(handle); - NaClMainForChromium(/* handle_count= */ 1, &nacl_handle); + SelMain(channel_descriptor, nacl::ToNativeHandle(handle)); } |