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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 | 96 |
97 #if defined(OS_CHROMEOS) | 97 #if defined(OS_CHROMEOS) |
98 #include "base/sys_info.h" | 98 #include "base/sys_info.h" |
99 #include "chrome/browser/chromeos/boot_times_recorder.h" | 99 #include "chrome/browser/chromeos/boot_times_recorder.h" |
100 #include "chromeos/chromeos_paths.h" | 100 #include "chromeos/chromeos_paths.h" |
101 #include "chromeos/chromeos_switches.h" | 101 #include "chromeos/chromeos_switches.h" |
102 #include "chromeos/hugepage_text/hugepage_text.h" | 102 #include "chromeos/hugepage_text/hugepage_text.h" |
103 #endif | 103 #endif |
104 | 104 |
105 #if defined(OS_ANDROID) | 105 #if defined(OS_ANDROID) |
106 #include "chrome/browser/android/java_exception_reporter.h" | 106 #include "base/android/java_exception_reporter.h" |
107 #include "chrome/common/descriptors_android.h" | 107 #include "chrome/common/descriptors_android.h" |
108 #else | 108 #else |
109 // Diagnostics is only available on non-android platforms. | 109 // Diagnostics is only available on non-android platforms. |
110 #include "chrome/browser/diagnostics/diagnostics_controller.h" | 110 #include "chrome/browser/diagnostics/diagnostics_controller.h" |
111 #include "chrome/browser/diagnostics/diagnostics_writer.h" | 111 #include "chrome/browser/diagnostics/diagnostics_writer.h" |
112 #endif | 112 #endif |
113 | 113 |
114 #if defined(USE_X11) | 114 #if defined(USE_X11) |
115 #include <stdlib.h> | 115 #include <stdlib.h> |
116 #include <string.h> | 116 #include <string.h> |
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
883 | 883 |
884 chrome::InitializePDF(); | 884 chrome::InitializePDF(); |
885 #endif | 885 #endif |
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 chrome::android::InitJavaExceptionReporter(); | 893 base::android::InitJavaExceptionReporter(); |
894 } else { | 894 } else { |
895 breakpad::InitNonBrowserCrashReporterForAndroid(process_type); | 895 breakpad::InitNonBrowserCrashReporterForAndroid(process_type); |
896 } | 896 } |
897 #else // !defined(OS_ANDROID) | 897 #else // !defined(OS_ANDROID) |
898 breakpad::InitCrashReporter(process_type); | 898 breakpad::InitCrashReporter(process_type); |
899 #endif // defined(OS_ANDROID) | 899 #endif // defined(OS_ANDROID) |
900 } | 900 } |
901 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) | 901 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
902 | 902 |
903 // After all the platform Breakpads have been initialized, store the command | 903 // After all the platform Breakpads have been initialized, store the command |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1079 case version_info::Channel::CANARY: | 1079 case version_info::Channel::CANARY: |
1080 return true; | 1080 return true; |
1081 case version_info::Channel::DEV: | 1081 case version_info::Channel::DEV: |
1082 case version_info::Channel::BETA: | 1082 case version_info::Channel::BETA: |
1083 case version_info::Channel::STABLE: | 1083 case version_info::Channel::STABLE: |
1084 default: | 1084 default: |
1085 // Don't enable instrumentation. | 1085 // Don't enable instrumentation. |
1086 return false; | 1086 return false; |
1087 } | 1087 } |
1088 } | 1088 } |
OLD | NEW |