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/renderer/render_process_impl.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/renderer/render_process_impl.cc')
| -rw-r--r-- | chrome/renderer/render_process_impl.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/renderer/render_process_impl.cc b/chrome/renderer/render_process_impl.cc index e610df9..0085ae7 100644 --- a/chrome/renderer/render_process_impl.cc +++ b/chrome/renderer/render_process_impl.cc @@ -154,8 +154,12 @@ RenderProcessImpl::RenderProcessImpl() } #ifndef DISABLE_NACL - if (command_line.HasSwitch(switches::kInternalNaCl)) - RegisterInternalNaClPlugin(LaunchNaClProcess); + if (command_line.HasSwitch(switches::kInternalNaCl)) { + std::map<std::string, uintptr_t> funcs; + funcs["launch_nacl_process"] = + reinterpret_cast<uintptr_t>(LaunchNaClProcess); + RegisterInternalNaClPlugin(funcs); + } #endif if (!command_line.HasSwitch(switches::kDisableByteRangeSupport)) { |