| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/app/content_main.h" | 5 #include "content/app/content_main.h" |
| 6 | 6 |
| 7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/debug/debugger.h" | 9 #include "base/debug/debugger.h" |
| 10 #include "base/debug/trace_event.h" | 10 #include "base/debug/trace_event.h" |
| (...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 | 426 |
| 427 #if defined(OS_WIN) | 427 #if defined(OS_WIN) |
| 428 CHECK(content::InitializeSandbox(sandbox_info)); | 428 CHECK(content::InitializeSandbox(sandbox_info)); |
| 429 #elif defined(OS_MACOSX) | 429 #elif defined(OS_MACOSX) |
| 430 if (process_type == switches::kRendererProcess || | 430 if (process_type == switches::kRendererProcess || |
| 431 process_type == switches::kPpapiPluginProcess || | 431 process_type == switches::kPpapiPluginProcess || |
| 432 (delegate && delegate->DelaySandboxInitialization(process_type))) { | 432 (delegate && delegate->DelaySandboxInitialization(process_type))) { |
| 433 // On OS X the renderer sandbox needs to be initialized later in the startup | 433 // On OS X the renderer sandbox needs to be initialized later in the startup |
| 434 // sequence in RendererMainPlatformDelegate::EnableSandbox(). | 434 // sequence in RendererMainPlatformDelegate::EnableSandbox(). |
| 435 } else { | 435 } else { |
| 436 CHECK(content::InitializeSandbox()); | 436 CHECK(content::InitializeSandboxFromProcessType()); |
| 437 } | 437 } |
| 438 #endif | 438 #endif |
| 439 | 439 |
| 440 if (delegate) delegate->SandboxInitialized(process_type); | 440 if (delegate) delegate->SandboxInitialized(process_type); |
| 441 | 441 |
| 442 #if defined(OS_POSIX) | 442 #if defined(OS_POSIX) |
| 443 SetProcessTitleFromCommandLine(argv); | 443 SetProcessTitleFromCommandLine(argv); |
| 444 #endif | 444 #endif |
| 445 | 445 |
| 446 content::MainFunctionParams main_params(command_line); | 446 content::MainFunctionParams main_params(command_line); |
| (...skipping 12 matching lines...) Expand all Loading... |
| 459 _CrtDumpMemoryLeaks(); | 459 _CrtDumpMemoryLeaks(); |
| 460 #endif // _CRTDBG_MAP_ALLOC | 460 #endif // _CRTDBG_MAP_ALLOC |
| 461 | 461 |
| 462 _Module.Term(); | 462 _Module.Term(); |
| 463 #endif // OS_WIN | 463 #endif // OS_WIN |
| 464 | 464 |
| 465 return exit_code; | 465 return exit_code; |
| 466 } | 466 } |
| 467 | 467 |
| 468 } // namespace content | 468 } // namespace content |
| OLD | NEW |