| Index: chrome/browser/zygote_host_linux.h
|
| ===================================================================
|
| --- chrome/browser/zygote_host_linux.h (revision 30939)
|
| +++ chrome/browser/zygote_host_linux.h (working copy)
|
| @@ -5,24 +5,26 @@
|
| #ifndef CHROME_BROWSER_ZYGOTE_HOST_LINUX_H_
|
| #define CHROME_BROWSER_ZYGOTE_HOST_LINUX_H_
|
|
|
| +#include <unistd.h>
|
| +
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include <unistd.h>
|
| -
|
| #include "base/global_descriptors_posix.h"
|
| #include "base/process.h"
|
|
|
| template<typename Type>
|
| struct DefaultSingletonTraits;
|
|
|
| +static const char kZygoteMagic[] = "ZYGOTE_OK";
|
| +
|
| // http://code.google.com/p/chromium/wiki/LinuxZygote
|
|
|
| // The zygote host is the interface, in the browser process, to the zygote
|
| // process.
|
| class ZygoteHost {
|
| public:
|
| - ~ZygoteHost();
|
| + void Init(const std::string& sandbox_cmd);
|
|
|
| pid_t ForkRenderer(const std::vector<std::string>& command_line,
|
| const base::GlobalDescriptors::Mapping& mapping);
|
| @@ -46,10 +48,11 @@
|
| private:
|
| friend struct DefaultSingletonTraits<ZygoteHost>;
|
| ZygoteHost();
|
| - void LaunchZygoteProcess();
|
| + ~ZygoteHost();
|
|
|
| int control_fd_; // the socket to the zygote
|
| pid_t pid_;
|
| + bool init_;
|
| };
|
|
|
| #endif // CHROME_BROWSER_ZYGOTE_HOST_LINUX_H_
|
|
|