Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: content/zygote/zygote_linux.h

Issue 10837081: Revert 149692 - Create a LinuxSandbox class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/public/common/sandbox_linux.h ('k') | content/zygote/zygote_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/zygote/zygote_linux.h
===================================================================
--- content/zygote/zygote_linux.h (revision 149703)
+++ content/zygote/zygote_linux.h (working copy)
@@ -10,6 +10,7 @@
#include "base/hash_tables.h"
#include "base/process.h"
+#include "content/common/seccomp_sandbox.h"
class Pickle;
class PickleIterator;
@@ -23,8 +24,12 @@
// runs it.
class Zygote {
public:
+ // The proc_fd_for_seccomp should be a file descriptor to /proc under the
+ // seccomp sandbox. This is not needed when not using seccomp, and should be
+ // -1 in those cases.
Zygote(int sandbox_flags,
- ZygoteForkDelegate* helper);
+ ZygoteForkDelegate* helper,
+ int proc_fd_for_seccomp);
~Zygote();
bool ProcessRequests();
@@ -93,6 +98,11 @@
const int sandbox_flags_;
ZygoteForkDelegate* helper_;
+#if defined(SECCOMP_SANDBOX)
+ // File descriptor to proc under seccomp, -1 when not using seccomp.
+ int proc_fd_for_seccomp_;
+#endif
+
// These might be set by helper_->InitialUMA. They supply a UMA enumeration
// sample we should report on the first fork.
std::string initial_uma_name_;
« no previous file with comments | « content/public/common/sandbox_linux.h ('k') | content/zygote/zygote_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698