diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-05-11 20:53:37 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-05-16 13:54:48 +0100 |
| commit | 21d179b334e59e9a3bfcaed4c4430bef1bc5759d (patch) | |
| tree | 64e2bb6da27af6a5c93ca34f6051584aafbfcb9e /chrome/common/sandbox_mac.h | |
| parent | 0c63f00edd6ed0482fd5cbcea937ca088baf7858 (diff) | |
| download | external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.zip external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.gz external_chromium-21d179b334e59e9a3bfcaed4c4430bef1bc5759d.tar.bz2 | |
Merge Chromium at 10.0.621.0: Initial merge by git.
Change-Id: I070cc91c608dfa4a968a5a54c173260765ac8097
Diffstat (limited to 'chrome/common/sandbox_mac.h')
| -rw-r--r-- | chrome/common/sandbox_mac.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/common/sandbox_mac.h b/chrome/common/sandbox_mac.h index f16fdb5..e81f72e 100644 --- a/chrome/common/sandbox_mac.h +++ b/chrome/common/sandbox_mac.h @@ -75,12 +75,15 @@ class Sandbox { // Native Client sandbox for the user's untrusted code. SANDBOX_TYPE_NACL_LOADER, + // GPU process. + SANDBOX_TYPE_GPU, + SANDBOX_AFTER_TYPE_LAST_TYPE, // Placeholder to ease iteration. }; // Warm up System APIs that empirically need to be accessed before the Sandbox - // is turned on. - static void SandboxWarmup(); + // is turned on. |sandbox_type| is the type of sandbox to warm up. + static void SandboxWarmup(SandboxProcessType sandbox_type); // Turns on the OS X sandbox for this process. // |sandbox_type| - type of Sandbox to use. |