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

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

Issue 2677563006: android: Report java exception in child (Closed)
Patch Set: remove braces Created 3 years, 10 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 | « no previous file | components/crash/content/app/breakpad_linux.cc » ('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 870 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 ChromeContentUtilityClient::PreSandboxStartup(); 881 ChromeContentUtilityClient::PreSandboxStartup();
882 } 882 }
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 base::android::InitJavaExceptionReporter(); 893 else
894 } else {
895 breakpad::InitNonBrowserCrashReporterForAndroid(process_type); 894 breakpad::InitNonBrowserCrashReporterForAndroid(process_type);
896 } 895 base::android::InitJavaExceptionReporter();
897 #else // !defined(OS_ANDROID) 896 #else // !defined(OS_ANDROID)
898 breakpad::InitCrashReporter(process_type); 897 breakpad::InitCrashReporter(process_type);
899 #endif // defined(OS_ANDROID) 898 #endif // defined(OS_ANDROID)
900 } 899 }
901 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) 900 #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
902 901
903 // After all the platform Breakpads have been initialized, store the command 902 // After all the platform Breakpads have been initialized, store the command
904 // line for crash reporting. 903 // line for crash reporting.
905 crash_keys::SetCrashKeysFromCommandLine(command_line); 904 crash_keys::SetCrashKeysFromCommandLine(command_line);
906 } 905 }
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 case version_info::Channel::CANARY: 1078 case version_info::Channel::CANARY:
1080 return true; 1079 return true;
1081 case version_info::Channel::DEV: 1080 case version_info::Channel::DEV:
1082 case version_info::Channel::BETA: 1081 case version_info::Channel::BETA:
1083 case version_info::Channel::STABLE: 1082 case version_info::Channel::STABLE:
1084 default: 1083 default:
1085 // Don't enable instrumentation. 1084 // Don't enable instrumentation.
1086 return false; 1085 return false;
1087 } 1086 }
1088 } 1087 }
OLDNEW
« no previous file with comments | « no previous file | components/crash/content/app/breakpad_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698