Move bookmark's folder menu upwards only when its parent button is moved

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
index 2eb0880c5f79ed46df5d53ad068412a2a6691471..94873d3f74e3f3f99962b83bdc86b6226125d0b1 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.mm
@@ -1934,12 +1934,16 @@ static BOOL ValueInRangeInclusive(CGFloat low, CGFloat value, CGFloat high) {
   // Search for and adjust submenus, if necessary.
   NSInteger buttonCount = [buttons_ count];
   if (buttonCount) {
-    BookmarkButton* subButton = [folderController_ parentButton];
-    for (NSButton* aButton in buttons_.get()) {
-      // If this button is showing its menu then we need to move the menu, too.
-      if (aButton == subButton)
-        [folderController_
-            offsetFolderMenuWindow:NSMakeSize(0.0, chrome::kBookmarkBarHeight)];
+    // In case of Drag & Drop within a folder, if the target folder is showing

[Alexei Svitkine (slow), 2014/10/02 20:55:59]

I'm not sure this behavior (as described by the comment and what you
implemented) is sufficient.

This is the general remove method and may potentially be used in other
circumstances than drag and drop. So a different folder menu could be open.

For example, an entry could get removed while you have the menu open as a result
of sync from another machine.

So I think it's safer to have the previous logic that loops through the buttons,
but to do a check against the index as you do here.

[Gaja, 2014/10/05 05:41:27]

Done.

+    // its menu during drop and is below the dragged item, the folder moves
+    // upwards by kBookmarkFolderButtonHeight, then we need to move the menu,
+    // too.
+    if (folderController_) {
+      BookmarkButton* targetButton = [folderController_ parentButton];
+      NSInteger dropIndex = [buttons_ indexOfObject:targetButton];
+      if ((dropIndex + 1) > buttonIndex)

[Alexei Svitkine (slow), 2014/10/02 20:55:59]

Nit: {}'s

[Gaja, 2014/10/05 05:41:27]

Done.

+        [folderController_ offsetFolderMenuWindow:NSMakeSize(
+                               0.0, bookmarks::kBookmarkFolderButtonHeight)];
     }
   } else if (parentButton_ != [barController_ otherBookmarksButton]) {
     // If all nodes have been removed from this folder then add in the