diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 23:19:57 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 23:19:57 +0000 |
| commit | bcd90b701089e050a74b82f0670cf36ff72bd7d7 (patch) | |
| tree | 5cdab65729fe20ef41c05aa3b92f0a1748d134d6 /chrome/nacl | |
| parent | 6289ffbc2945eda8893b5fcf899e87539214ddc9 (diff) | |
| download | chromium_src-bcd90b701089e050a74b82f0670cf36ff72bd7d7.zip chromium_src-bcd90b701089e050a74b82f0670cf36ff72bd7d7.tar.gz chromium_src-bcd90b701089e050a74b82f0670cf36ff72bd7d7.tar.bz2 | |
Create a public header with the child_process_sandbox_support_linux functions that are used in chrome. Also move everything to the content namespace, now that we have one. This gets rid of the last content/common includes from chrome/renderer and so I've tightened up the DEPS.
Also get rid of the webkit_glue versions of the font functions since they weren't used anymore.
BUG=98716
Review URL: http://codereview.chromium.org/8319017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105956 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
| -rw-r--r-- | chrome/nacl/nacl_listener.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/nacl/nacl_listener.cc b/chrome/nacl/nacl_listener.cc index c1d4447..678a87f 100644 --- a/chrome/nacl/nacl_listener.cc +++ b/chrome/nacl/nacl_listener.cc @@ -16,7 +16,7 @@ #include "native_client/src/shared/imc/nacl_imc.h" #if defined(OS_LINUX) -#include "content/common/child_process_sandbox_support_linux.h" +#include "content/public/common/child_process_sandbox_support_linux.h" #endif #if defined(OS_WIN) @@ -100,8 +100,7 @@ void NaClListener::OnStartSelLdr( std::vector<nacl::FileDescriptor> handles, bool have_irt_file) { #if defined(OS_LINUX) - nacl::SetCreateMemoryObjectFunc( - child_process_sandbox_support::MakeSharedMemorySegmentViaIPC); + nacl::SetCreateMemoryObjectFunc(content::MakeSharedMemorySegmentViaIPC); #elif defined(OS_MACOSX) nacl::SetCreateMemoryObjectFunc(CreateMemoryObject); CHECK(handles.size() >= 1); |