Index: chrome/browser/chrome_browser_application_mac.mm |
diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm |
index 2ce5ea8230e98f5d3881f7474a3ea64efcfc010d..2b1cc70424671f0b27c1ebe655a0edfb3fb586a4 100644 |
--- a/chrome/browser/chrome_browser_application_mac.mm |
+++ b/chrome/browser/chrome_browser_application_mac.mm |
@@ -435,7 +435,10 @@ void SwizzleInit() { |
// Current hypothesis is that it's a keyboard accelerator. |
// http://crbug.com/154483 |
static NSString* const kSendEventKey = @"sendevent"; |
- base::mac::ScopedCrashKey key(kSendEventKey, [event description]); |
+ // For NSEventType 28, recursive -description causes a crash. |
+ // Not much to be done, that type is undocumented. |
+ NSString* value = [event type] == 28 ? @"type=28" : [event description]; |
+ base::mac::ScopedCrashKey key(kSendEventKey, value); |
Scott Hess - ex-Googler
2012/10/16 21:56:32
Why not haz magic constant? Because I couldn't th
Nico
2012/10/16 22:23:30
kTwentyEight, duh.
|
base::mac::ScopedSendingEvent sendingEventScoper; |
for (id<CrApplicationEventHookProtocol> handler in eventHooks_.get()) { |