Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1774)

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 2619603002: Remove android_java_ui as it is not used (Closed)
Patch Set: Rebase to master Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 #endif 94 #endif
95 95
96 #if defined(OS_CHROMEOS) 96 #if defined(OS_CHROMEOS)
97 #include "base/sys_info.h" 97 #include "base/sys_info.h"
98 #include "chrome/browser/chromeos/boot_times_recorder.h" 98 #include "chrome/browser/chromeos/boot_times_recorder.h"
99 #include "chromeos/chromeos_paths.h" 99 #include "chromeos/chromeos_paths.h"
100 #include "chromeos/chromeos_switches.h" 100 #include "chromeos/chromeos_switches.h"
101 #include "chromeos/hugepage_text/hugepage_text.h" 101 #include "chromeos/hugepage_text/hugepage_text.h"
102 #endif 102 #endif
103 103
104 #if BUILDFLAG(ANDROID_JAVA_UI) 104 #if defined(OS_ANDROID)
105 #include "chrome/browser/android/java_exception_reporter.h" 105 #include "chrome/browser/android/java_exception_reporter.h"
106 #endif
107
108 #if defined(OS_ANDROID)
109 #include "chrome/common/descriptors_android.h" 106 #include "chrome/common/descriptors_android.h"
110 #else 107 #else
111 // Diagnostics is only available on non-android platforms. 108 // Diagnostics is only available on non-android platforms.
112 #include "chrome/browser/diagnostics/diagnostics_controller.h" 109 #include "chrome/browser/diagnostics/diagnostics_controller.h"
113 #include "chrome/browser/diagnostics/diagnostics_writer.h" 110 #include "chrome/browser/diagnostics/diagnostics_writer.h"
114 #endif 111 #endif
115 112
116 #if defined(USE_X11) 113 #if defined(USE_X11)
117 #include <stdlib.h> 114 #include <stdlib.h>
118 #include <string.h> 115 #include <string.h>
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 879
883 chrome::InitializePDF(); 880 chrome::InitializePDF();
884 #endif 881 #endif
885 882
886 #if defined(OS_POSIX) && !defined(OS_MACOSX) 883 #if defined(OS_POSIX) && !defined(OS_MACOSX)
887 // Zygote needs to call InitCrashReporter() in RunZygote(). 884 // Zygote needs to call InitCrashReporter() in RunZygote().
888 if (process_type != switches::kZygoteProcess) { 885 if (process_type != switches::kZygoteProcess) {
889 #if defined(OS_ANDROID) 886 #if defined(OS_ANDROID)
890 if (process_type.empty()) { 887 if (process_type.empty()) {
891 breakpad::InitCrashReporter(process_type); 888 breakpad::InitCrashReporter(process_type);
892 // TODO(crbug.com/551176): Exception reporting should work without
893 // ANDROID_JAVA_UI
894 #if BUILDFLAG(ANDROID_JAVA_UI)
895 chrome::android::InitJavaExceptionReporter(); 889 chrome::android::InitJavaExceptionReporter();
896 #endif
897 } else { 890 } else {
898 breakpad::InitNonBrowserCrashReporterForAndroid(process_type); 891 breakpad::InitNonBrowserCrashReporterForAndroid(process_type);
899 } 892 }
900 #else // !defined(OS_ANDROID) 893 #else // !defined(OS_ANDROID)
901 breakpad::InitCrashReporter(process_type); 894 breakpad::InitCrashReporter(process_type);
902 #endif // defined(OS_ANDROID) 895 #endif // defined(OS_ANDROID)
903 } 896 }
904 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) 897 #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
905 898
906 // After all the platform Breakpads have been initialized, store the command 899 // After all the platform Breakpads have been initialized, store the command
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
1085 case version_info::Channel::CANARY: 1078 case version_info::Channel::CANARY:
1086 return true; 1079 return true;
1087 case version_info::Channel::DEV: 1080 case version_info::Channel::DEV:
1088 case version_info::Channel::BETA: 1081 case version_info::Channel::BETA:
1089 case version_info::Channel::STABLE: 1082 case version_info::Channel::STABLE:
1090 default: 1083 default:
1091 // Don't enable instrumentation. 1084 // Don't enable instrumentation.
1092 return false; 1085 return false;
1093 } 1086 }
1094 } 1087 }
OLDNEW
« no previous file with comments | « chrome/android/BUILD.gn ('k') | chrome/browser/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698