diff options
| author | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-10-19 14:37:37 +0100 |
| commit | 3345a6884c488ff3a535c2c9acdd33d74b37e311 (patch) | |
| tree | 7784b988ef1698cb6967ea1bdf07616237716c6c /chrome/common/sandbox_mac.h | |
| parent | efc8475837ec58186051f23bb03542620424f6ce (diff) | |
| download | external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.zip external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.gz external_chromium-3345a6884c488ff3a535c2c9acdd33d74b37e311.tar.bz2 | |
Merge Chromium at 7.0.540.0 : Initial merge by git
Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used.
Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
Diffstat (limited to 'chrome/common/sandbox_mac.h')
| -rw-r--r-- | chrome/common/sandbox_mac.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/common/sandbox_mac.h b/chrome/common/sandbox_mac.h index 249eaa3..61a02fc 100644 --- a/chrome/common/sandbox_mac.h +++ b/chrome/common/sandbox_mac.h @@ -1,16 +1,16 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #ifndef CHROME_COMMON_SANDBOX_MAC_H_ #define CHROME_COMMON_SANDBOX_MAC_H_ +#pragma once -#include "base/file_path.h" +class FilePath; namespace sandbox { enum SandboxProcessType { - SANDBOX_TYPE_FIRST_TYPE, // Placeholder to ease iteration. SANDBOX_TYPE_RENDERER = SANDBOX_TYPE_FIRST_TYPE, @@ -25,9 +25,7 @@ enum SandboxProcessType { // is allowed to one configurable directory. SANDBOX_TYPE_UTILITY, - // Native Client sandboxes. The plugin contains trusted code and the - // loader contains the user's untrusted code. - SANDBOX_TYPE_NACL_PLUGIN, + // Native Client sandbox for the user's untrusted code. SANDBOX_TYPE_NACL_LOADER, SANDBOX_AFTER_TYPE_LAST_TYPE, // Placeholder to ease iteration. |