Prevent multiple bookmarks from having focus when trying to confuse

things with the context menu.

BUG=http://crbug.com/54324

Review URL: http://codereview.chromium.org/3345017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59038 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 0 deletions

diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
index 0e9e751..d672f7d 100644
--- a/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/cocoa/bookmark_bar_folder_controller.mm
@@ -1372,6 +1372,20 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
     buttonThatMouseIsIn_ = nil;
   }
 
+  // Deleting a button causes rearrangement that enables us to lose a
+  // mouse-exited event.  This problem doesn't appear to exist with
+  // other keep-menu-open options (e.g. add folder).  Since the
+  // showsBorderOnlyWhileMouseInside uses a tracking area, simple
+  // tricks (e.g. sending an extra mouseExited: to the button) don't
+  // fix the problem.
+  // http://crbug.com/54324
+  for (NSButton* button in buttons_.get()) {
+    if ([button showsBorderOnlyWhileMouseInside]) {
+      [button setShowsBorderOnlyWhileMouseInside:NO];
+      [button setShowsBorderOnlyWhileMouseInside:YES];
+    }
+  }
+
   [oldButton setDelegate:nil];
   [oldButton removeFromSuperview];
   if (animate && !ignoreAnimations_)