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

Unified Diff: content/common/sandbox_mac.mm

Issue 10807052: mac: Remove code that was only needed on 10.5 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: kill workspaceIDCache_ Created 8 years, 5 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
« no previous file with comments | « content/common/common.sb ('k') | content/ppapi_plugin/ppapi.sb » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/sandbox_mac.mm
diff --git a/content/common/sandbox_mac.mm b/content/common/sandbox_mac.mm
index 26cad6e63ebad56bbac41b584035fe3e9a261413..105340ed25caaf1954f78b55b84cd40de3c07391 100644
--- a/content/common/sandbox_mac.mm
+++ b/content/common/sandbox_mac.mm
@@ -410,7 +410,7 @@ bool Sandbox::PostProcessSandboxProfile(
std::string *final_sandbox_profile_str) {
NSString* sandbox_data = [[sandbox_template copy] autorelease];
- // Remove comments, e.g. ;10.6_ONLY .
+ // Remove comments, e.g. ;10.7_OR_ABOVE .
for (NSString* to_remove in comments_to_remove) {
sandbox_data = [sandbox_data stringByReplacingOccurrencesOfString:to_remove
withString:@""];
@@ -515,13 +515,11 @@ bool Sandbox::EnableSandbox(int sandbox_type,
[tokens_to_remove addObject:@";ENABLE_LOGGING"];
}
- bool snow_leopard_or_later = base::mac::IsOSSnowLeopardOrLater();
bool lion_or_later = base::mac::IsOSLionOrLater();
// Without this, the sandbox will print a message to the system log every
- // time it denies a request. This floods the console with useless spew. The
- // (with no-log) syntax is only supported on 10.6+
- if (snow_leopard_or_later && !enable_logging) {
+ // time it denies a request. This floods the console with useless spew.
+ if (!enable_logging) {
substitutions["DISABLE_SANDBOX_DENIAL_LOGGING"] =
SandboxSubstring("(with no-log)");
} else {
@@ -543,14 +541,6 @@ bool Sandbox::EnableSandbox(int sandbox_type,
[tokens_to_remove addObject:@";10.7_OR_ABOVE"];
}
- if (snow_leopard_or_later) {
- // >=10.6 Sandbox rules.
- [tokens_to_remove addObject:@";10.6_OR_ABOVE"];
- } else {
- // Sandbox rules only for versions before 10.6.
- [tokens_to_remove addObject:@";BEFORE_10.6"];
- }
-
substitutions["COMPONENT_BUILD_WORKAROUND"] = SandboxSubstring("");
#if defined(COMPONENT_BUILD)
// dlopen() fails without file-read-metadata access if the executable image
« no previous file with comments | « content/common/common.sb ('k') | content/ppapi_plugin/ppapi.sb » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698