Chromium Code Reviews| 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..9ec1a3d3d09bb9d2221b9cd365bd4b4e96f4f86f 100644 |
| --- a/chrome/app/chrome_main_delegate.cc |
| +++ b/chrome/app/chrome_main_delegate.cc |
| @@ -101,7 +101,7 @@ |
| #include "chromeos/hugepage_text/hugepage_text.h" |
| #endif |
| -#if BUILDFLAG(ANDROID_JAVA_UI) |
| +#if defined(OS_ANDROID) |
|
Ted C
2017/01/06 22:00:21
combine with below
F
2017/01/09 21:36:32
Done.
|
| #include "chrome/browser/android/java_exception_reporter.h" |
| #endif |
| @@ -889,9 +889,8 @@ 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) |
| +// TODO(crbug.com/551176): Exception reporting should work without OS_ANDROID. |
|
Ted C
2017/01/06 22:00:21
Remove as this is no longer valid
F
2017/01/09 21:36:32
Done.
|
| +#if defined(OS_ANDROID) |
| chrome::android::InitJavaExceptionReporter(); |
| #endif |
| } else { |