Index: chrome/app/chrome_main_delegate.cc |
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc |
index 2d2b8c7c48a79ccac6a05daaecb6cd7b4bb68d35..3d00c171410f30ebb7d2667c6926a24b4bfa7908 100644 |
--- a/chrome/app/chrome_main_delegate.cc |
+++ b/chrome/app/chrome_main_delegate.cc |
@@ -101,11 +101,8 @@ |
#include "chromeos/hugepage_text/hugepage_text.h" |
#endif |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
-#include "chrome/browser/android/java_exception_reporter.h" |
-#endif |
- |
#if defined(OS_ANDROID) |
+#include "chrome/browser/android/java_exception_reporter.h" |
#include "chrome/common/descriptors_android.h" |
#else |
// Diagnostics is only available on non-android platforms. |
@@ -889,9 +886,7 @@ void ChromeMainDelegate::PreSandboxStartup() { |
#if defined(OS_ANDROID) |
if (process_type.empty()) { |
breakpad::InitCrashReporter(process_type); |
-// TODO(crbug.com/551176): Exception reporting should work without |
-// ANDROID_JAVA_UI |
-#if BUILDFLAG(ANDROID_JAVA_UI) |
+#if defined(OS_ANDROID) |
Ted C
2017/01/09 21:49:45
just realized this is within a OS_ANDROID block, s
F
2017/01/09 23:50:43
Done.
|
chrome::android::InitJavaExceptionReporter(); |
#endif |
} else { |