diff options
| -rw-r--r-- | content/app/content_main_runner.cc | 7 | ||||
| -rw-r--r-- | content/zygote/zygote_main.h | 18 | ||||
| -rw-r--r-- | content/zygote/zygote_main_linux.cc | 2 |
3 files changed, 23 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 { diff --git a/content/zygote/zygote_main.h b/content/zygote/zygote_main.h new file mode 100644 index 0000000..6470232 --- /dev/null +++ b/content/zygote/zygote_main.h @@ -0,0 +1,18 @@ +// Copyright (c) 2013 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#ifndef CONTENT_ZYGOTE_ZYGOTE_MAIN_H_ +#define CONTENT_ZYGOTE_ZYGOTE_MAIN_H_ + +namespace content { + +struct MainFunctionParams; +class ZygoteForkDelegate; + +bool ZygoteMain(const MainFunctionParams& params, + ZygoteForkDelegate* forkdelegate); + +} // namespace content + +#endif // CONTENT_ZYGOTE_ZYGOTE_MAIN_H_ diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index fd4a709..ed7fd06 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "content/zygote/zygote_main.h" + #include <dlfcn.h> #include <fcntl.h> #include <pthread.h> |