Merge 24777 - Fix crashonlaunch on Snow Leopard...

chrome/renderer/renderer_main_platform_delegate_mac.mm

Index: chrome/renderer/renderer_main_platform_delegate_mac.mm
===================================================================
--- chrome/renderer/renderer_main_platform_delegate_mac.mm	(revision 24784)
+++ chrome/renderer/renderer_main_platform_delegate_mac.mm	(working copy)
@@ -131,6 +131,20 @@
       stringByReplacingOccurrencesOfString:@"USER_HOMEDIR"
                                 withString:NSHomeDirectory()];
 
+  // Enable 10.5 only sandbox syntax.
+  int32 major_version = 0;
+  int32 minor_version = 0;
+  int32 bugfix_version = 0;
+  base::SysInfo::OperatingSystemVersionNumbers(&major_version,
+                                               &minor_version,
+                                               &bugfix_version);
+
+  if (major_version == 10 && minor_version == 5) {
+    sandbox_data = [sandbox_data
+        stringByReplacingOccurrencesOfString:@";10.5_ONLY"
+                                  withString:@""];
+  }
+
   char* error_buff = NULL;
   int error = sandbox_init([sandbox_data UTF8String], 0, &error_buff);
   bool success = (error == 0 && error_buff == NULL);
Property changes on: chrome\renderer\renderer_main_platform_delegate_mac.mm
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/chrome/renderer/renderer_main_platform_delegate_mac.mm:r69-2775
   Merged /trunk/src/chrome/renderer/renderer_main_platform_delegate_mac.mm:r24777