summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-21 01:16:30 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-21 01:16:30 +0000
commit0a1f310d964e67756c8316330ffb090048c9ae82 (patch)
treee2105655d5a7667872e53dd751f745b37a6c3f14
parent2112999ec51a6a514cc66f5609a79eb735e14cb3 (diff)
downloadchromium_src-0a1f310d964e67756c8316330ffb090048c9ae82.zip
chromium_src-0a1f310d964e67756c8316330ffb090048c9ae82.tar.gz
chromium_src-0a1f310d964e67756c8316330ffb090048c9ae82.tar.bz2
Breakpads missing from browser process.
GoogleUpdateSettings::GetCollectStatsConsent uses the Chrome path provider, so if the Breakpad glue is going to decide whether to enable Breakpad based on that function, it can't call it until after the Chrome path provider has been added to the path service. TBR=jeremy BUG=19913 TEST=Does Breakpad work in the browser process? If stats reporting is enabled, in an official release Google Chrome build, you'd better not see this: [mmdd/hhmmss:WARNING:.../chrome/app/breakpad_mac.mm(57)] Breakpad disabled Review URL: http://codereview.chromium.org/173172 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23929 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/app/chrome_dll_main.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 4b23cc1..d2af7a9 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -334,22 +334,6 @@ int ChromeMain(int argc, const char** argv) {
CommandLine::Init(argc, argv);
#endif
-#if defined(OS_MACOSX)
- // TODO(mark): Right now, InitCrashReporter() needs to be called after
- // CommandLine::Init(). Ideally, Breakpad initialization could occur
- // sooner, preferably even before the framework dylib is even loaded, to
- // catch potential early early crashes.
- InitCrashReporter();
-
- // If Breakpad is not present, turn off OS crash dumps to avoid having
- // to wait eons for Apple's Crash Reporter to generate dumps for builds
- // where debugging symbols are present.
- if (IsCrashReporterDisabled())
- DebugUtil::DisableOSCrashDumps();
- else
- InitCrashProcessInfo();
-#endif // OS_MACOSX
-
const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess();
#if defined(OS_WIN)
@@ -424,6 +408,22 @@ int ChromeMain(int argc, const char** argv) {
app::RegisterPathProvider();
chrome::RegisterPathProvider();
+#if defined(OS_MACOSX)
+ // TODO(mark): Right now, InitCrashReporter() needs to be called after
+ // CommandLine::Init() and chrome::RegisterPathProvider(). Ideally, Breakpad
+ // initialization could occur sooner, preferably even before the framework
+ // dylib is even loaded, to catch potential early crashes.
+ InitCrashReporter();
+
+ // If Breakpad is not present, turn off OS crash dumps to avoid having
+ // to wait eons for Apple's Crash Reporter to generate dumps for builds
+ // where debugging symbols are present.
+ if (IsCrashReporterDisabled())
+ DebugUtil::DisableOSCrashDumps();
+ else
+ InitCrashProcessInfo();
+#endif // OS_MACOSX
+
// Initialize the Stats Counters table. With this initialized,
// the StatsViewer can be utilized to read counters outside of
// Chrome. These lines can be commented out to effectively turn