diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-18 16:13:41 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-18 16:13:41 +0000 |
| commit | ce2ae4423013d90edad4cee8639dc021158e3ea4 (patch) | |
| tree | 57a41421fdf277a65091ac9b4f837a1bfb76e8e2 /chrome/app/chrome_main.cc | |
| parent | 60ac66e3cbe2118d2c9e56a4dc7fb4e1f13a1b4d (diff) | |
| download | chromium_src-ce2ae4423013d90edad4cee8639dc021158e3ea4.zip chromium_src-ce2ae4423013d90edad4cee8639dc021158e3ea4.tar.gz chromium_src-ce2ae4423013d90edad4cee8639dc021158e3ea4.tar.bz2 | |
Modify the Chrome Linux zygote to support a ZygoteForkHelper for flexible
fork implementations.
BUG=nativeclient:480
TEST=existing zygote tests
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=92787
Review URL: http://codereview.chromium.org/7397003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main.cc')
| -rw-r--r-- | chrome/app/chrome_main.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index c45916c8..3b45594 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -76,6 +76,10 @@ #include <signal.h> #endif +#if defined(OS_POSIX) && !defined(OS_MACOSX) +#include "content/common/zygote_fork_delegate_linux.h" +#endif + #if defined(OS_CHROMEOS) #include "base/sys_info.h" #include "chrome/browser/chromeos/boot_times_loader.h" @@ -114,7 +118,10 @@ extern int WorkerMain(const MainFunctionParams&); extern int NaClMain(const MainFunctionParams&); extern int UtilityMain(const MainFunctionParams&); extern int ProfileImportMain(const MainFunctionParams&); -extern int ZygoteMain(const MainFunctionParams&); +#if defined(OS_POSIX) && !defined(OS_MACOSX) +extern int ZygoteMain(const MainFunctionParams&, + ZygoteForkDelegate* forkdelegate); +#endif #if defined(_WIN64) extern int NaClBrokerMain(const MainFunctionParams&); #endif @@ -452,7 +459,7 @@ 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)) + if (!ZygoteMain(main_function_params, NULL)) return 1; // Zygote::HandleForkRequest may have reallocated the command |