| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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_delegate.h" | 5 #include "chrome/app/chrome_main_delegate.h" |
| 6 | 6 |
| 7 #include "base/base_paths.h" | 7 #include "base/base_paths.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/cpu.h" | 9 #include "base/cpu.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 #include "chrome/browser/mac/relauncher.h" | 60 #include "chrome/browser/mac/relauncher.h" |
| 61 #include "chrome/common/mac/cfbundle_blocker.h" | 61 #include "chrome/common/mac/cfbundle_blocker.h" |
| 62 #include "chrome/common/mac/objc_zombie.h" | 62 #include "chrome/common/mac/objc_zombie.h" |
| 63 #include "components/crash/app/breakpad_mac.h" | 63 #include "components/crash/app/breakpad_mac.h" |
| 64 #include "ui/base/l10n/l10n_util_mac.h" | 64 #include "ui/base/l10n/l10n_util_mac.h" |
| 65 #endif | 65 #endif |
| 66 | 66 |
| 67 #if defined(OS_POSIX) | 67 #if defined(OS_POSIX) |
| 68 #include <locale.h> | 68 #include <locale.h> |
| 69 #include <signal.h> | 69 #include <signal.h> |
| 70 #include "chrome/app/chrome_breakpad_client.h" | 70 #include "chrome/app/chrome_crash_reporter_client.h" |
| 71 #include "components/crash/app/breakpad_client.h" | 71 #include "components/crash/app/crash_reporter_client.h" |
| 72 #endif | 72 #endif |
| 73 | 73 |
| 74 #if !defined(DISABLE_NACL) && defined(OS_LINUX) | 74 #if !defined(DISABLE_NACL) && defined(OS_LINUX) |
| 75 #include "components/nacl/common/nacl_paths.h" | 75 #include "components/nacl/common/nacl_paths.h" |
| 76 #include "components/nacl/zygote/nacl_fork_delegate_linux.h" | 76 #include "components/nacl/zygote/nacl_fork_delegate_linux.h" |
| 77 #endif | 77 #endif |
| 78 | 78 |
| 79 #if defined(OS_CHROMEOS) | 79 #if defined(OS_CHROMEOS) |
| 80 #include "base/sys_info.h" | 80 #include "base/sys_info.h" |
| 81 #include "chrome/browser/chromeos/boot_times_loader.h" | 81 #include "chrome/browser/chromeos/boot_times_loader.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) | 121 #if !defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 122 base::LazyInstance<ChromeContentRendererClient> | 122 base::LazyInstance<ChromeContentRendererClient> |
| 123 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; | 123 g_chrome_content_renderer_client = LAZY_INSTANCE_INITIALIZER; |
| 124 base::LazyInstance<ChromeContentUtilityClient> | 124 base::LazyInstance<ChromeContentUtilityClient> |
| 125 g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER; | 125 g_chrome_content_utility_client = LAZY_INSTANCE_INITIALIZER; |
| 126 base::LazyInstance<chrome::ChromeContentPluginClient> | 126 base::LazyInstance<chrome::ChromeContentPluginClient> |
| 127 g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; | 127 g_chrome_content_plugin_client = LAZY_INSTANCE_INITIALIZER; |
| 128 #endif | 128 #endif |
| 129 | 129 |
| 130 #if defined(OS_POSIX) | 130 #if defined(OS_POSIX) |
| 131 base::LazyInstance<chrome::ChromeBreakpadClient>::Leaky | 131 base::LazyInstance<chrome::ChromeCrashReporterClient>::Leaky |
| 132 g_chrome_breakpad_client = LAZY_INSTANCE_INITIALIZER; | 132 g_chrome_crash_client = LAZY_INSTANCE_INITIALIZER; |
| 133 #endif | 133 #endif |
| 134 | 134 |
| 135 extern int NaClMain(const content::MainFunctionParams&); | 135 extern int NaClMain(const content::MainFunctionParams&); |
| 136 extern int ServiceProcessMain(const content::MainFunctionParams&); | 136 extern int ServiceProcessMain(const content::MainFunctionParams&); |
| 137 | 137 |
| 138 namespace { | 138 namespace { |
| 139 | 139 |
| 140 #if defined(OS_WIN) | 140 #if defined(OS_WIN) |
| 141 // Early versions of Chrome incorrectly registered a chromehtml: URL handler, | 141 // Early versions of Chrome incorrectly registered a chromehtml: URL handler, |
| 142 // which gives us nothing but trouble. Avoid launching chrome this way since | 142 // which gives us nothing but trouble. Avoid launching chrome this way since |
| (...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 632 breakpad::InitCrashProcessInfo(process_type); | 632 breakpad::InitCrashProcessInfo(process_type); |
| 633 } | 633 } |
| 634 #endif // defined(OS_MACOSX) | 634 #endif // defined(OS_MACOSX) |
| 635 | 635 |
| 636 void ChromeMainDelegate::PreSandboxStartup() { | 636 void ChromeMainDelegate::PreSandboxStartup() { |
| 637 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); | 637 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); |
| 638 std::string process_type = | 638 std::string process_type = |
| 639 command_line.GetSwitchValueASCII(switches::kProcessType); | 639 command_line.GetSwitchValueASCII(switches::kProcessType); |
| 640 | 640 |
| 641 #if defined(OS_POSIX) | 641 #if defined(OS_POSIX) |
| 642 breakpad::SetBreakpadClient(g_chrome_breakpad_client.Pointer()); | 642 crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); |
| 643 #endif | 643 #endif |
| 644 | 644 |
| 645 #if defined(OS_MACOSX) | 645 #if defined(OS_MACOSX) |
| 646 // On the Mac, the child executable lives at a predefined location within | 646 // On the Mac, the child executable lives at a predefined location within |
| 647 // the app bundle's versioned directory. | 647 // the app bundle's versioned directory. |
| 648 PathService::Override(content::CHILD_PROCESS_EXE, | 648 PathService::Override(content::CHILD_PROCESS_EXE, |
| 649 chrome::GetVersionedDirectory(). | 649 chrome::GetVersionedDirectory(). |
| 650 Append(chrome::kHelperProcessExecutablePath)); | 650 Append(chrome::kHelperProcessExecutablePath)); |
| 651 | 651 |
| 652 InitMacCrashReporter(command_line, process_type); | 652 InitMacCrashReporter(command_line, process_type); |
| (...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 934 } | 934 } |
| 935 | 935 |
| 936 content::ContentUtilityClient* | 936 content::ContentUtilityClient* |
| 937 ChromeMainDelegate::CreateContentUtilityClient() { | 937 ChromeMainDelegate::CreateContentUtilityClient() { |
| 938 #if defined(CHROME_MULTIPLE_DLL_BROWSER) | 938 #if defined(CHROME_MULTIPLE_DLL_BROWSER) |
| 939 return NULL; | 939 return NULL; |
| 940 #else | 940 #else |
| 941 return g_chrome_content_utility_client.Pointer(); | 941 return g_chrome_content_utility_client.Pointer(); |
| 942 #endif | 942 #endif |
| 943 } | 943 } |
| OLD | NEW |