diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 16:08:52 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-25 16:08:52 +0000 |
| commit | f8ba13ddfaf769ade709cf4ce205a009521a7c09 (patch) | |
| tree | ec017792f84d8e59493e1a5f180b0c611f30619e /content/browser/zygote_main_linux.cc | |
| parent | 0981f86e200719979691ce48a93c8532d525c06b (diff) | |
| download | chromium_src-f8ba13ddfaf769ade709cf4ce205a009521a7c09.zip chromium_src-f8ba13ddfaf769ade709cf4ce205a009521a7c09.tar.gz chromium_src-f8ba13ddfaf769ade709cf4ce205a009521a7c09.tar.bz2 | |
Move ZygoteForkDelegateLinux to content/public/common.
BUG=98716
Review URL: http://codereview.chromium.org/8381029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107128 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/zygote_main_linux.cc')
| -rw-r--r-- | content/browser/zygote_main_linux.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/content/browser/zygote_main_linux.cc b/content/browser/zygote_main_linux.cc index 973eccb..4adb25b 100644 --- a/content/browser/zygote_main_linux.cc +++ b/content/browser/zygote_main_linux.cc @@ -37,9 +37,9 @@ #include "content/common/seccomp_sandbox.h" #include "content/common/set_process_title.h" #include "content/common/unix_domain_socket_posix.h" -#include "content/common/zygote_fork_delegate_linux.h" #include "content/public/common/content_switches.h" #include "content/public/common/result_codes.h" +#include "content/public/common/zygote_fork_delegate_linux.h" #include "skia/ext/SkFontHost_fontconfig_control.h" #include "unicode/timezone.h" #include "ipc/ipc_channel.h" @@ -94,7 +94,7 @@ static void SELinuxTransitionToTypeOrDie(const char* type) { // runs it. class Zygote { public: - Zygote(int sandbox_flags, ZygoteForkDelegate* helper) + Zygote(int sandbox_flags, content::ZygoteForkDelegate* helper) : sandbox_flags_(sandbox_flags), helper_(helper) { if (helper_) helper_->InitialUMA(&initial_uma_name_, @@ -535,7 +535,7 @@ class Zygote { ProcessMap real_pids_to_sandbox_pids; const int sandbox_flags_; - ZygoteForkDelegate* helper_; + content::ZygoteForkDelegate* helper_; // These might be set by helper_->InitialUMA. They supply a UMA // enumeration sample we should report on the first fork. @@ -806,7 +806,7 @@ static bool EnterSandbox() { #endif // CHROMIUM_SELINUX bool ZygoteMain(const MainFunctionParams& params, - ZygoteForkDelegate* forkdelegate) { + content::ZygoteForkDelegate* forkdelegate) { #if !defined(CHROMIUM_SELINUX) g_am_zygote_or_renderer = true; #endif |