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

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/strings/sys_string_conversions.h"
 #import "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 1916 matching lines @@
   [buttons_ removeObjectAtIndex:buttonIndex];
   for (NSInteger i = 0; i < buttonIndex; ++i) {
     BookmarkButton* button = [buttons_ objectAtIndex:i];
     NSRect buttonFrame = [button frame];
     buttonFrame.origin.y -= bookmarks::kBookmarkFolderButtonHeight;
     [button setFrame:buttonFrame];
   }
   // 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
     // 'empty' placeholder button except for "Other bookmarks" folder
     // as we are going to hide it.
     NSRect buttonFrame =
         GetFirstButtonFrameForHeight([self menuHeightForButtonCount:1]);
     BookmarkButton* button = [self makeButtonForNode:nil
                                                frame:buttonFrame];
     [buttons_ addObject:button];
@@ skipping 50 matching lines @@
 
 - (void)setIgnoreAnimations:(BOOL)ignore {
   ignoreAnimations_ = ignore;
 }
 
 - (BookmarkButton*)buttonThatMouseIsIn {
   return buttonThatMouseIsIn_;
 }
 
 @end  // BookmarkBarFolderController