diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-16 03:30:09 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-16 03:30:09 +0000 |
| commit | 937365f442a193e0b212fc670ef306ea08c4bef7 (patch) | |
| tree | 138db84548c632efab9135b5e89db7ea45e2214e /chrome/browser/chrome_browser_application_mac.mm | |
| parent | c31130204459b6c4392ebca7f80cdb49fb04114b (diff) | |
| download | chromium_src-937365f442a193e0b212fc670ef306ea08c4bef7.zip chromium_src-937365f442a193e0b212fc670ef306ea08c4bef7.tar.gz chromium_src-937365f442a193e0b212fc670ef306ea08c4bef7.tar.bz2 | |
Revert "[Mac] Breakpad key to help track web-drag crash."
Unfortunately, clang complained.
Original CL http://codereview.chromium.org/6861004/
http://src.chromium.org/viewvc/chrome?view=rev&revision=81855
BUG=78782
TBR=rsesek@chromium.org
TEST=waterfall
Review URL: http://codereview.chromium.org/6870024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81858 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_browser_application_mac.mm')
| -rw-r--r-- | chrome/browser/chrome_browser_application_mac.mm | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm index 0c2ac3c..8e605ee 100644 --- a/chrome/browser/chrome_browser_application_mac.mm +++ b/chrome/browser/chrome_browser_application_mac.mm @@ -8,7 +8,7 @@ #import "base/metrics/histogram.h" #import "base/memory/scoped_nsobject.h" #import "base/sys_string_conversions.h" -#import "chrome/app/scoped_crash_key_mac.h" +#import "chrome/app/breakpad_mac.h" #import "chrome/browser/app_controller_mac.h" #import "chrome/browser/ui/cocoa/objc_method_swizzle.h" #import "chrome/browser/ui/cocoa/objc_zombie.h" @@ -178,6 +178,23 @@ void CancelTerminate() { namespace { +// Helper to make it easy to get crash keys right. +// TODO(shess): Find a better home for this. app/breakpad_mac.h +// doesn't work. +class ScopedCrashKey { + public: + ScopedCrashKey(NSString* key, NSString* value) + : crash_key_([key retain]) { + SetCrashKeyValue(crash_key_.get(), value); + } + ~ScopedCrashKey() { + ClearCrashKeyValue(crash_key_.get()); + } + + private: + scoped_nsobject<NSString> crash_key_; +}; + // Do-nothing wrapper so that we can arrange to only swizzle // -[NSException raise] when DCHECK() is turned on (as opposed to // replicating the preprocess logic which turns DCHECK() on). |