diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-16 02:47:37 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-16 02:47:37 +0000 |
| commit | 4229b5d1b5c2db391d09558993720ae0c9c96c37 (patch) | |
| tree | 8d3ccb409fed8737c708fb7729d83b2bfc809a27 /chrome/app/chrome_main.cc | |
| parent | 605435e37f36c8bf80f0b42f3d6aa8e1f0c68aa9 (diff) | |
| download | chromium_src-4229b5d1b5c2db391d09558993720ae0c9c96c37.zip chromium_src-4229b5d1b5c2db391d09558993720ae0c9c96c37.tar.gz chromium_src-4229b5d1b5c2db391d09558993720ae0c9c96c37.tar.bz2 | |
Revert 92787 - Modify the Chrome Linux zygote to support a ZygoteForkHelper for flexible
fork implementations.
BUG=nativeclient:480
TEST=existing zygote tests
Review URL: http://codereview.chromium.org/7397003
TBR=bradchen@google.com
Review URL: http://codereview.chromium.org/7400014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92789 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, 2 insertions, 9 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 2493fc1..79fcc62 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -75,10 +75,6 @@ #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" @@ -117,10 +113,7 @@ extern int WorkerMain(const MainFunctionParams&); extern int NaClMain(const MainFunctionParams&); extern int UtilityMain(const MainFunctionParams&); extern int ProfileImportMain(const MainFunctionParams&); -#if defined(OS_POSIX) && !defined(OS_MACOSX) -extern int ZygoteMain(const MainFunctionParams&, - ZygoteForkDelegate* forkdelegate); -#endif +extern int ZygoteMain(const MainFunctionParams&); #if defined(_WIN64) extern int NaClBrokerMain(const MainFunctionParams&); #endif @@ -458,7 +451,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, NULL)) + if (!ZygoteMain(main_function_params)) return 1; // Zygote::HandleForkRequest may have reallocated the command |