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

Unified Diff: chrome/browser/cocoa/bookmark_bar_folder_controller.mm

Issue 2799015: When deleting bookmark buttons, make sure all delayed messages... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 6 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/cocoa/bookmark_bar_folder_controller.mm
===================================================================
--- chrome/browser/cocoa/bookmark_bar_folder_controller.mm (revision 49835)
+++ chrome/browser/cocoa/bookmark_bar_folder_controller.mm (working copy)
@@ -1267,6 +1267,11 @@
NSPoint poofPoint = NSMakePoint(NSMidX(poofFrame), NSMidY(poofFrame));
poofPoint = [oldButton convertPoint:poofPoint toView:nil];
poofPoint = [[oldButton window] convertBaseToScreen:poofPoint];
+
+ // If a hover-open is pending, cancel it.
+ if (oldButton == buttonThatMouseIsIn_)
+ [NSObject cancelPreviousPerformRequestsWithTarget:self];
+
[oldButton removeFromSuperview];
if (animate && !ignoreAnimations_)
NSShowAnimationEffect(NSAnimationEffectDisappearingItemDefault, poofPoint,

Powered by Google App Engine
This is Rietveld 408576698