| 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 "chrome/app/chrome_main.h" | 5 #include "chrome/app/chrome_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/i18n/icu_util.h" | 10 #include "base/i18n/icu_util.h" |
| (...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 814 sandbox_wrapper.SetServices(sandbox_info); | 814 sandbox_wrapper.SetServices(sandbox_info); |
| 815 #elif defined(OS_MACOSX) | 815 #elif defined(OS_MACOSX) |
| 816 // On OS X the renderer sandbox needs to be initialized later in the startup | 816 // On OS X the renderer sandbox needs to be initialized later in the startup |
| 817 // sequence in RendererMainPlatformDelegate::EnableSandbox(). | 817 // sequence in RendererMainPlatformDelegate::EnableSandbox(). |
| 818 // Same goes for NaClLoader, in NaClMainPlatformDelegate::EnableSandbox(), | 818 // Same goes for NaClLoader, in NaClMainPlatformDelegate::EnableSandbox(), |
| 819 // and the GPU process, in GpuMain(). | 819 // and the GPU process, in GpuMain(). |
| 820 if (process_type == switches::kRendererProcess || | 820 if (process_type == switches::kRendererProcess || |
| 821 process_type == switches::kExtensionProcess || | 821 process_type == switches::kExtensionProcess || |
| 822 process_type == switches::kNaClLoaderProcess || | 822 process_type == switches::kNaClLoaderProcess || |
| 823 process_type == switches::kGpuProcess || | 823 process_type == switches::kGpuProcess || |
| 824 process_type == switches::kPpapiPluginProcess) { | 824 process_type == switches::kPpapiPluginProcess || |
| 825 process_type == switches::kRelauncherProcess) { |
| 825 initialize_sandbox = false; | 826 initialize_sandbox = false; |
| 826 } | 827 } |
| 827 #endif | 828 #endif |
| 828 | 829 |
| 829 if (initialize_sandbox) { | 830 if (initialize_sandbox) { |
| 830 bool sandbox_initialized_ok = | 831 bool sandbox_initialized_ok = |
| 831 sandbox_wrapper.InitializeSandbox(command_line, process_type); | 832 sandbox_wrapper.InitializeSandbox(command_line, process_type); |
| 832 // Die if the sandbox can't be enabled. | 833 // Die if the sandbox can't be enabled. |
| 833 CHECK(sandbox_initialized_ok) << "Error initializing sandbox for " | 834 CHECK(sandbox_initialized_ok) << "Error initializing sandbox for " |
| 834 << process_type; | 835 << process_type; |
| (...skipping 18 matching lines...) Expand all Loading... |
| 853 | 854 |
| 854 if (SubprocessNeedsResourceBundle(process_type)) | 855 if (SubprocessNeedsResourceBundle(process_type)) |
| 855 ResourceBundle::CleanupSharedInstance(); | 856 ResourceBundle::CleanupSharedInstance(); |
| 856 | 857 |
| 857 logging::CleanupChromeLogging(); | 858 logging::CleanupChromeLogging(); |
| 858 | 859 |
| 859 chrome_main::LowLevelShutdown(); | 860 chrome_main::LowLevelShutdown(); |
| 860 | 861 |
| 861 return exit_code; | 862 return exit_code; |
| 862 } | 863 } |
| OLD | NEW |