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

Unified Diff: content/browser/zygote_main_linux.cc

Issue 9463029: Add an API around zygoteHost so that chrome doesn't reach into the internal content implementation. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix clang Created 8 years, 10 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/browser/zygote_host_linux.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/zygote_main_linux.cc
===================================================================
--- content/browser/zygote_main_linux.cc (revision 123506)
+++ content/browser/zygote_main_linux.cc (working copy)
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "content/browser/zygote_host_linux.h"
+#include "content/browser/zygote_host_impl_linux.h"
#include <dlfcn.h>
#include <fcntl.h>
@@ -174,21 +174,21 @@
int kind;
if (pickle.ReadInt(&iter, &kind)) {
switch (kind) {
- case ZygoteHost::kCmdFork:
+ case ZygoteHostImpl::kCmdFork:
// This function call can return multiple times, once per fork().
return HandleForkRequest(fd, pickle, iter, fds);
- case ZygoteHost::kCmdReap:
+ case ZygoteHostImpl::kCmdReap:
if (!fds.empty())
break;
HandleReapRequest(fd, pickle, iter);
return false;
- case ZygoteHost::kCmdGetTerminationStatus:
+ case ZygoteHostImpl::kCmdGetTerminationStatus:
if (!fds.empty())
break;
HandleGetTerminationStatus(fd, pickle, iter);
return false;
- case ZygoteHost::kCmdGetSandboxStatus:
+ case ZygoteHostImpl::kCmdGetSandboxStatus:
HandleGetSandboxStatus(fd, pickle, iter);
return false;
default:
@@ -846,11 +846,11 @@
int sandbox_flags = 0;
if (getenv("SBX_D"))
- sandbox_flags |= ZygoteHost::kSandboxSUID;
+ sandbox_flags |= ZygoteHostImpl::kSandboxSUID;
if (getenv("SBX_PID_NS"))
- sandbox_flags |= ZygoteHost::kSandboxPIDNS;
+ sandbox_flags |= ZygoteHostImpl::kSandboxPIDNS;
if (getenv("SBX_NET_NS"))
- sandbox_flags |= ZygoteHost::kSandboxNetNS;
+ sandbox_flags |= ZygoteHostImpl::kSandboxNetNS;
#if defined(SECCOMP_SANDBOX)
// The seccomp sandbox will be turned on when the renderers start. But we can
@@ -867,7 +867,7 @@
"sandboxing disabled.";
} else {
VLOG(1) << "Enabling experimental Seccomp sandbox.";
- sandbox_flags |= ZygoteHost::kSandboxSeccomp;
+ sandbox_flags |= ZygoteHostImpl::kSandboxSeccomp;
}
}
#endif // SECCOMP_SANDBOX
« no previous file with comments | « content/browser/zygote_host_linux.cc ('k') | content/content_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698