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 <stddef.h> | 7 #include <stddef.h> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/base_paths.h" | 10 #include "base/base_paths.h" |
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
886 | 886 |
887 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 887 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
888 // Zygote needs to call InitCrashReporter() in RunZygote(). | 888 // Zygote needs to call InitCrashReporter() in RunZygote(). |
889 if (process_type != switches::kZygoteProcess) { | 889 if (process_type != switches::kZygoteProcess) { |
890 #if defined(OS_ANDROID) | 890 #if defined(OS_ANDROID) |
891 if (process_type.empty()) { | 891 if (process_type.empty()) { |
892 breakpad::InitCrashReporter(process_type); | 892 breakpad::InitCrashReporter(process_type); |
893 base::android::InitJavaExceptionReporter(); | 893 base::android::InitJavaExceptionReporter(); |
894 } else { | 894 } else { |
895 breakpad::InitNonBrowserCrashReporterForAndroid(process_type); | 895 breakpad::InitNonBrowserCrashReporterForAndroid(process_type); |
| 896 base::android::InitJavaExceptionReporterForChildProcess(); |
896 } | 897 } |
897 #else // !defined(OS_ANDROID) | 898 #else // !defined(OS_ANDROID) |
898 breakpad::InitCrashReporter(process_type); | 899 breakpad::InitCrashReporter(process_type); |
899 #endif // defined(OS_ANDROID) | 900 #endif // defined(OS_ANDROID) |
900 } | 901 } |
901 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) | 902 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
902 | 903 |
903 // After all the platform Breakpads have been initialized, store the command | 904 // After all the platform Breakpads have been initialized, store the command |
904 // line for crash reporting. | 905 // line for crash reporting. |
905 crash_keys::SetCrashKeysFromCommandLine(command_line); | 906 crash_keys::SetCrashKeysFromCommandLine(command_line); |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1079 case version_info::Channel::CANARY: | 1080 case version_info::Channel::CANARY: |
1080 return true; | 1081 return true; |
1081 case version_info::Channel::DEV: | 1082 case version_info::Channel::DEV: |
1082 case version_info::Channel::BETA: | 1083 case version_info::Channel::BETA: |
1083 case version_info::Channel::STABLE: | 1084 case version_info::Channel::STABLE: |
1084 default: | 1085 default: |
1085 // Don't enable instrumentation. | 1086 // Don't enable instrumentation. |
1086 return false; | 1087 return false; |
1087 } | 1088 } |
1088 } | 1089 } |
OLD | NEW |