diff options
author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 13:47:28 +0000 |
---|---|---|
committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 13:47:28 +0000 |
commit | 492e3b085077b2804cf4e54b8d5313df0b8bf8c5 (patch) | |
tree | 0aeb2f5acb933e951655c562d9c9f96cb0d02c85 /chrome/nacl/nacl_thread.cc | |
parent | 1f4016d53c60a5c742e36de4879eb76e4e16d599 (diff) | |
download | chromium_src-492e3b085077b2804cf4e54b8d5313df0b8bf8c5.zip chromium_src-492e3b085077b2804cf4e54b8d5313df0b8bf8c5.tar.gz chromium_src-492e3b085077b2804cf4e54b8d5313df0b8bf8c5.tar.bz2 |
Make NaCl/Chromium startup interface easier to maintain
Use the new NaClMainForChromium() from the NaCl tree, instead of
sel_main.cc in the Chromium tree.
Use the new variant of RegisterInternalNaClPlugin() that can receive
multiple functions instead of just one.
This depends on r2744 from NaCl.
BUG=http://code.google.com/p/nativeclient/issues/detail?id=642
BUG=http://code.google.com/p/nativeclient/issues/detail?id=469
TEST=Chromium's nacl_ui_tests
Review URL: http://codereview.chromium.org/3039016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl/nacl_thread.cc')
-rw-r--r-- | chrome/nacl/nacl_thread.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/nacl/nacl_thread.cc b/chrome/nacl/nacl_thread.cc index 0f05f06..33c0195 100644 --- a/chrome/nacl/nacl_thread.cc +++ b/chrome/nacl/nacl_thread.cc @@ -16,7 +16,9 @@ typedef HANDLE NaClHandle; typedef int NaClHandle; #endif // NaClHandle -int SelMain(const int desc, const NaClHandle handle); +// 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); NaClThread::NaClThread() { } @@ -36,5 +38,6 @@ void NaClThread::OnControlMessageReceived(const IPC::Message& msg) { void NaClThread::OnStartSelLdr(int channel_descriptor, nacl::FileDescriptor handle) { - SelMain(channel_descriptor, nacl::ToNativeHandle(handle)); + NaClHandle nacl_handle = nacl::ToNativeHandle(handle); + NaClMainForChromium(/* handle_count= */ 1, &nacl_handle); } |