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

Unified Diff: chrome/app/chrome_dll_main.cc

Issue 341033: Sandbox Worker process on the Mac. (Closed)
Patch Set: Fix latest round of comments Created 11 years, 1 month 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 | « no previous file | chrome/browser/utility.sb » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
« no previous file with comments | « no previous file | chrome/browser/utility.sb » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698