diff options
author | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 02:02:00 +0000 |
---|---|---|
committer | jeremy@chromium.org <jeremy@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-22 02:02:00 +0000 |
commit | 139ec96dc6f26a24d8812aad4470f00b36ecee52 (patch) | |
tree | a10a96e7eed1bd4dec6a835b670be2af5d7e4956 /chrome/app | |
parent | d09cd49e9312e576c3f24764d1e542bd7084094c (diff) | |
download | chromium_src-139ec96dc6f26a24d8812aad4470f00b36ecee52.zip chromium_src-139ec96dc6f26a24d8812aad4470f00b36ecee52.tar.gz chromium_src-139ec96dc6f26a24d8812aad4470f00b36ecee52.tar.bz2 |
1)When we enabled breakpad on first run we weren't correctly setting the process type.
2)Fixed another logic inversion in SetActiveRendererURL.
3)Change IsCrashReporterEnabled-> IsCrashReporterDisabled to prevent future confusion since that was the question all the callers where askign anyway.
Review URL: http://codereview.chromium.org/113737
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16707 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r-- | chrome/app/breakpad_mac.h | 4 | ||||
-rw-r--r-- | chrome/app/breakpad_mac.mm | 4 | ||||
-rw-r--r-- | chrome/app/breakpad_mac_stubs.mm | 4 | ||||
-rw-r--r-- | chrome/app/chrome_dll_main.cc | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/chrome/app/breakpad_mac.h b/chrome/app/breakpad_mac.h index 3d8ab32..9c48752 100644 --- a/chrome/app/breakpad_mac.h +++ b/chrome/app/breakpad_mac.h @@ -15,8 +15,8 @@ void InitCrashReporter(); // CommandLine::Init has been called. void InitCrashProcessInfo(); -// Is Breakpad enabled? -bool IsCrashReporterEnabled(); +// Is Breakpad disabled? +bool IsCrashReporterDisabled(); // Call on clean process shutdown. void DestructCrashReporter(); diff --git a/chrome/app/breakpad_mac.mm b/chrome/app/breakpad_mac.mm index 9155e29..bda33fe4 100644 --- a/chrome/app/breakpad_mac.mm +++ b/chrome/app/breakpad_mac.mm @@ -49,8 +49,8 @@ BreakpadRef gBreakpadRef = NULL; } // namespace -bool IsCrashReporterEnabled() { - return gBreakpadRef != NULL; +bool IsCrashReporterDisabled() { + return gBreakpadRef == NULL; } void DestructCrashReporter() { diff --git a/chrome/app/breakpad_mac_stubs.mm b/chrome/app/breakpad_mac_stubs.mm index d70fce6..ea5cfdc 100644 --- a/chrome/app/breakpad_mac_stubs.mm +++ b/chrome/app/breakpad_mac_stubs.mm @@ -7,8 +7,8 @@ // Stubbed out versions of breakpad integration functions so we can compile // unit tests without linking in Breakpad. -bool IsCrashReporterEnabled() { - return false; +bool IsCrashReporterDisabled() { + return true; } void InitCrashProcessInfo() { diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc index 223b303..87c0598 100644 --- a/chrome/app/chrome_dll_main.cc +++ b/chrome/app/chrome_dll_main.cc @@ -272,7 +272,7 @@ int ChromeMain(int argc, const char** argv) { #if defined(OS_MACOSX) // If Breakpad is not present then turn off os crash dumps so we don't have // to wait eons for Apple's Crash Reporter to generate a dump. - if (!IsCrashReporterEnabled()) { + if (IsCrashReporterDisabled()) { DebugUtil::DisableOSCrashDumps(); } #endif |