Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(78)

Unified Diff: chrome/browser/ui/cocoa/base_bubble_controller.mm

Issue 300113009: Fix BaseBubbleController close issue. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: unit_test Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/base_bubble_controller.mm
diff --git a/chrome/browser/ui/cocoa/base_bubble_controller.mm b/chrome/browser/ui/cocoa/base_bubble_controller.mm
index 6dc573696ead2092213d8890b6db9d917a2d2f5f..b1f5c38763055be0f250c795ad3ac52a9306d277 100644
--- a/chrome/browser/ui/cocoa/base_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/base_bubble_controller.mm
@@ -241,15 +241,17 @@
// The eventTap_ catches clicks within the application that are outside the
// window.
eventTap_ = [NSEvent
- addLocalMonitorForEventsMatchingMask:NSLeftMouseDownMask
+ addLocalMonitorForEventsMatchingMask:NSLeftMouseDownMask |
+ NSRightMouseDownMask
handler:^NSEvent* (NSEvent* event) {
if (event.window != window) {
- // Call via the runloop because this block is called in the
- // middle of event dispatch.
- [self performSelector:@selector(windowDidResignKey:)
- withObject:note
- afterDelay:0];
- }
+ // Do it right now, because if this event is right mouse event,
+ // it may pop up a menu. windowDidResignKey: will not exec until
Robert Sesek 2014/06/05 14:22:50 nit: exec -> execute/run. We don't abbreviate in c
+ // the menu is closed.
+ if ([self respondsToSelector:@selector(windowDidResignKey:)]) {
+ [self windowDidResignKey:note];
+ }
+ }
Robert Sesek 2014/06/05 14:22:50 nit: indent 1 more space
return event;
}];

Powered by Google App Engine
This is Rietveld 408576698