diff options
author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 01:48:37 +0000 |
---|---|---|
committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-02 01:48:37 +0000 |
commit | 802a13a0b2fd257938dcd0c7b7ff4f79565331c9 (patch) | |
tree | 26ee9878b7003dc7039ed5e3deb8bf888b596283 /chrome/app/chrome_main.cc | |
parent | 22de011a33feedc8ac0faea4f0b5aa11683c36ff (diff) | |
download | chromium_src-802a13a0b2fd257938dcd0c7b7ff4f79565331c9.zip chromium_src-802a13a0b2fd257938dcd0c7b7ff4f79565331c9.tar.gz chromium_src-802a13a0b2fd257938dcd0c7b7ff4f79565331c9.tar.bz2 |
Mac: Scaffolding for sandboxing GPU process.
The sandbox config allows everything for now; I will put in restrictions in a follow-up CL (which should be small).
This CL should have no visible effect (other than changing a few LOG(WARNING) to LOG(ERROR)).
BUG=48607
TEST=GPU process still works
Review URL: http://codereview.chromium.org/5491001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67939 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/chrome_main.cc')
-rw-r--r-- | chrome/app/chrome_main.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 55c009d..b27e144 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -874,10 +874,12 @@ int ChromeMain(int argc, char** argv) { #if defined(OS_MACOSX) // On OS X the renderer sandbox needs to be initialized later in the startup // sequence in RendererMainPlatformDelegate::EnableSandbox(). - // Same goes for NaClLoader, in NaClMainPlatformDelegate::EnableSandbox(). + // Same goes for NaClLoader, in NaClMainPlatformDelegate::EnableSandbox(), + // and the GPU process, in GpuMain(). if (process_type != switches::kRendererProcess && process_type != switches::kExtensionProcess && - process_type != switches::kNaClLoaderProcess) { + process_type != switches::kNaClLoaderProcess && + process_type != switches::kGpuProcess) { bool sandbox_initialized_ok = sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type); // Die if the sandbox can't be enabled. |