diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 19:33:56 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-04 19:33:56 +0000 |
| commit | b3aabd34198e0e62cd1ca2134200c6a948560ca6 (patch) | |
| tree | 19744277f82538d11c45001b31ab3d20420f8f69 /content/zygote | |
| parent | 3167bd4f7389abfc5ff4010f09c4b6045b8e8311 (diff) | |
| download | chromium_src-b3aabd34198e0e62cd1ca2134200c6a948560ca6.zip chromium_src-b3aabd34198e0e62cd1ca2134200c6a948560ca6.tar.gz chromium_src-b3aabd34198e0e62cd1ca2134200c6a948560ca6.tar.bz2 | |
Tighten up DEPS some more. NaCl/service process code are including internal content files. Fix the instances other sandbox stuff, which I'll do in a followup.
BUG=98716
Review URL: https://chromiumcodereview.appspot.com/10512010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140346 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/zygote')
| -rw-r--r-- | content/zygote/zygote_linux.cc | 6 | ||||
| -rw-r--r-- | content/zygote/zygote_main_linux.cc | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/content/zygote/zygote_linux.cc b/content/zygote/zygote_linux.cc index ab3ead3..0258ace 100644 --- a/content/zygote/zygote_linux.cc +++ b/content/zygote/zygote_linux.cc @@ -23,13 +23,13 @@ #include "base/global_descriptors_posix.h" #include "base/logging.h" #include "base/pickle.h" -#include "content/common/chrome_descriptors.h" +#include "base/posix/unix_domain_socket.h" #include "content/common/seccomp_sandbox.h" #include "content/common/set_process_title.h" -#include "content/common/unix_domain_socket_posix.h" -#include "content/public/common/zygote_fork_delegate_linux.h" #include "content/common/sandbox_methods_linux.h" #include "content/common/zygote_commands_linux.h" +#include "content/public/common/content_descriptors.h" +#include "content/public/common/zygote_fork_delegate_linux.h" #if defined(CHROMIUM_SELINUX) #include <selinux/selinux.h> diff --git a/content/zygote/zygote_main_linux.cc b/content/zygote/zygote_main_linux.cc index 6653909..5936ee2 100644 --- a/content/zygote/zygote_main_linux.cc +++ b/content/zygote/zygote_main_linux.cc @@ -20,6 +20,7 @@ #include "base/linux_util.h" #include "base/memory/scoped_ptr.h" #include "base/pickle.h" +#include "base/posix/unix_domain_socket.h" #include "base/process_util.h" #include "base/rand_util.h" #include "base/sys_info.h" @@ -29,7 +30,6 @@ #include "content/common/pepper_plugin_registry.h" #include "content/common/sandbox_methods_linux.h" #include "content/common/seccomp_sandbox.h" -#include "content/common/unix_domain_socket_posix.h" #include "content/common/zygote_commands_linux.h" #include "content/public/common/content_switches.h" #include "content/public/common/main_function_params.h" |