summaryrefslogtreecommitdiffstats
path: root/content/app
diff options
context:
space:
mode:
authormdempsky@google.com <mdempsky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-13 01:26:07 +0000
committermdempsky@google.com <mdempsky@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-13 01:26:07 +0000
commit16caf2c20ebe2b8d28fbdcd1afe009f30b9c81a1 (patch)
treec1fb66f284bc2ae703039396e9a351ea04ed69b0 /content/app
parentcb9dc209bd5889f845faee26dee7a56f73ab01b6 (diff)
downloadchromium_src-16caf2c20ebe2b8d28fbdcd1afe009f30b9c81a1.zip
chromium_src-16caf2c20ebe2b8d28fbdcd1afe009f30b9c81a1.tar.gz
chromium_src-16caf2c20ebe2b8d28fbdcd1afe009f30b9c81a1.tar.bz2
Fix ZygoteMain() prototype: it returns a bool, not an int
Review URL: https://chromiumcodereview.appspot.com/14076006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194064 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app')
-rw-r--r--content/app/content_main_runner.cc7
1 files changed, 3 insertions, 4 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc
index 46599ac..d9085de 100644
--- a/content/app/content_main_runner.cc
+++ b/content/app/content_main_runner.cc
@@ -81,6 +81,9 @@
#if !defined(OS_MACOSX)
#include "content/public/common/zygote_fork_delegate_linux.h"
#endif
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
+#include "content/zygote/zygote_main.h"
+#endif
#endif // OS_POSIX
@@ -100,10 +103,6 @@ extern int PpapiBrokerMain(const MainFunctionParams&);
extern int RendererMain(const content::MainFunctionParams&);
extern int UtilityMain(const MainFunctionParams&);
extern int WorkerMain(const MainFunctionParams&);
-#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-extern int ZygoteMain(const MainFunctionParams&,
- ZygoteForkDelegate* forkdelegate);
-#endif
} // namespace content
namespace {