diff options
| author | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 14:36:15 +0000 |
|---|---|---|
| committer | danno@chromium.org <danno@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-22 14:36:15 +0000 |
| commit | 79060e77511cdbdc9cfb8802da9423ba6954f036 (patch) | |
| tree | ca952b0b32c43d8469c07cb1b8bc90e2e8ea4c8d /chrome/nacl.gypi | |
| parent | 492e3b085077b2804cf4e54b8d5313df0b8bf8c5 (diff) | |
| download | chromium_src-79060e77511cdbdc9cfb8802da9423ba6954f036.zip chromium_src-79060e77511cdbdc9cfb8802da9423ba6954f036.tar.gz chromium_src-79060e77511cdbdc9cfb8802da9423ba6954f036.tar.bz2 | |
Revert 53333 - 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
TBR=mseaborn@chromium.org
Review URL: http://codereview.chromium.org/2832071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index e61dbbf..d4be912 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -30,6 +30,7 @@ 'nacl/nacl_main_platform_delegate_win.cc', 'nacl/nacl_thread.cc', 'nacl/nacl_thread.h', + 'nacl/sel_main.cc', ], # TODO(gregoryd): consider switching NaCl to use Chrome OS defines 'conditions': [ |