Chromium Code Reviews| Index: chrome/app/chrome_main.cc |
| diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc |
| index 3b45594d7a2c71e873f40842133e5661d4ed767b..37725c8404a3e7bb92ef5cc03196b21c3ee54c2b 100644 |
| --- a/chrome/app/chrome_main.cc |
| +++ b/chrome/app/chrome_main.cc |
| @@ -77,6 +77,7 @@ |
| #endif |
| #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| +#include "chrome/common/nacl_fork_delegate_linux.h" |
| #include "content/common/zygote_fork_delegate_linux.h" |
| #endif |
| @@ -459,7 +460,11 @@ int RunZygote(const MainFunctionParams& main_function_params) { |
| media::InitializeMediaLibrary(media_path); |
| // This function call can return multiple times, once per fork(). |
| - if (!ZygoteMain(main_function_params, NULL)) |
| + NaClForkDelegate* nacldelegate = new NaClForkDelegate(); |
|
agl
2011/07/18 21:19:35
s/nacldelegate/nacl_delegate/
Brad Chen
2011/07/18 22:40:29
Done.
|
| + int rval = ZygoteMain(main_function_params, nacldelegate); |
| + if (nacldelegate) |
| + free(nacldelegate); |
|
agl
2011/07/18 21:19:35
|delete nacldelegate| and no need for the if(), de
Brad Chen
2011/07/18 22:40:29
Done.
|
| + if (!rval) |
| return 1; |
| // Zygote::HandleForkRequest may have reallocated the command |