diff options
| author | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 16:25:33 +0000 |
|---|---|---|
| committer | mseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 16:25:33 +0000 |
| commit | 7c9b70922da6bf1dbaafbef64a65fa73ed054578 (patch) | |
| tree | 42c905e9d9fec0dff8043d0242582fb19db28faf /chrome/nacl.gypi | |
| parent | 652b43335e61f2911d2aafacaaebad29f09d5030 (diff) | |
| download | chromium_src-7c9b70922da6bf1dbaafbef64a65fa73ed054578.zip chromium_src-7c9b70922da6bf1dbaafbef64a65fa73ed054578.tar.gz chromium_src-7c9b70922da6bf1dbaafbef64a65fa73ed054578.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@53952 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index d4be912..e61dbbf 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -30,7 +30,6 @@ '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': [ |