diff options
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/chrome_application_mac.mm | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/chrome/browser/chrome_application_mac.mm b/chrome/browser/chrome_application_mac.mm index 8c7d860..a94d3aa 100644 --- a/chrome/browser/chrome_application_mac.mm +++ b/chrome/browser/chrome_application_mac.mm @@ -58,4 +58,29 @@ // own. } +- (BOOL)sendAction:(SEL)anAction to:(id)aTarget from:(id)sender { + // The Dock menu contains an automagic section where you can select + // amongst open windows. If a window is closed via JavaScript while + // the menu is up, the menu item for that window continues to exist. + // When a window is selected this method is called with the + // now-freed window as |aTarget|. Short-circuit the call if + // |aTarget| is not a valid window. + if (anAction == @selector(_selectWindow:)) { + // Not using -[NSArray containsObject:] because |aTarget| may be a + // freed object. + BOOL found = NO; + for (NSWindow* window in [self windows]) { + if (window == aTarget) { + found = YES; + break; + } + } + if (!found) { + return NO; + } + } + + return [super sendAction:anAction to:aTarget from:sender]; +} + @end |