diff options
| author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 13:15:24 +0000 |
|---|---|---|
| committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-05 13:15:24 +0000 |
| commit | 1c5fdc4aa3b54cbc3a103e26af918188afbe8b66 (patch) | |
| tree | 1523fd698a41ac8a4e357850f050338341d33cfe /chrome/app | |
| parent | 824083c52c5689198290e24938793ce4ccc6e683 (diff) | |
| download | chromium_src-1c5fdc4aa3b54cbc3a103e26af918188afbe8b66.zip chromium_src-1c5fdc4aa3b54cbc3a103e26af918188afbe8b66.tar.gz chromium_src-1c5fdc4aa3b54cbc3a103e26af918188afbe8b66.tar.bz2 | |
TBR:mark
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31090 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
| -rw-r--r-- | chrome/app/chrome_dll_main.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index bc9f4a3..26b493a 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -482,11 +482,7 @@ int ChromeMain(int argc, char** argv) { #if defined(OS_WIN) sandbox_wrapper.SetServices(sandbox_info); #endif - - // OS X enables sandboxing later in the startup process. -#if !defined (OS_MACOSX) sandbox_wrapper.InitializeSandbox(parsed_command_line, process_type); -#endif // !OS_MACOSX #if defined(OS_WIN) _Module.Init(NULL, instance); @@ -540,13 +536,6 @@ int ChromeMain(int argc, char** argv) { if (!process_type.empty()) CommonSubprocessInit(); -#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); -#endif // OS_MACOSX - startup_timer.Stop(); // End of Startup Time Measurement. MainFunctionParams main_params(parsed_command_line, sandbox_wrapper, |