Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(464)

Unified Diff: chrome/common/sandbox_mac.mm

Issue 2769014: Mac/clang: Possibly contentious changes. (Closed)
Patch Set: comments2 Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/sandbox_mac.mm
diff --git a/chrome/common/sandbox_mac.mm b/chrome/common/sandbox_mac.mm
index dc160dd117f73d2144d3b8735fc118c945a66bee..80e01f3bbc72df04e67a786f52a91316340f117b 100644
--- a/chrome/common/sandbox_mac.mm
+++ b/chrome/common/sandbox_mac.mm
@@ -244,10 +244,6 @@ void SandboxWarmup() {
// Turns on the OS X sandbox for this process.
bool EnableSandbox(SandboxProcessType sandbox_type,
const FilePath& allowed_dir) {
- // Name of the file containing a common prefix included at the start of
- // all the other sandbox profiles.
- const NSString* kCommonSandboxPrefixFileName = @"common";
-
// Sanity - currently only SANDBOX_TYPE_UTILITY supports a directory being
// passed in.
if (sandbox_type != SANDBOX_TYPE_UTILITY) {
@@ -297,7 +293,7 @@ bool EnableSandbox(SandboxProcessType sandbox_type,
// Read in the sandbox profile and the common prefix file.
NSString* common_sandbox_prefix_path =
- [mac_util::MainAppBundle() pathForResource:kCommonSandboxPrefixFileName
+ [mac_util::MainAppBundle() pathForResource:@"common"
ofType:@"sb"];
NSString* common_sandbox_prefix_data =
[NSString stringWithContentsOfFile:common_sandbox_prefix_path

Powered by Google App Engine
This is Rietveld 408576698