| Index: chrome/app/chrome_dll_main.cc
|
| diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
|
| index 22e95d2ab1ea04edab7e672a3276338e0fe4b260..35d760dde6677e29c10557f7f6e7c1e3d2fd5ad9 100644
|
| --- a/chrome/app/chrome_dll_main.cc
|
| +++ b/chrome/app/chrome_dll_main.cc
|
| @@ -482,7 +482,14 @@ int ChromeMain(int argc, char** argv) {
|
| #if defined(OS_WIN)
|
| sandbox_wrapper.SetServices(sandbox_info);
|
| #endif
|
| +#if defined (OS_MACOSX)
|
| + // On OS X the renderer sandbox needs to be initialized later in the startup
|
| + // sequence in RendererMainPlatformDelegate::PlatformInitialize().
|
| + if (process_type != switches::kRendererProcess)
|
| + sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type);
|
| +#else
|
| sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type);
|
| +#endif // !OS_MACOSX
|
|
|
| #if defined(OS_WIN)
|
| _Module.Init(NULL, instance);
|
|
|