Adjustments to bookmark bar folder menu placement issues....

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

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 <Cocoa/Cocoa.h>
 
 #include "base/basictypes.h"
 #include "base/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_constants.h"
@@ skipping 25 matching lines @@
 - (void)validateMenuSpacing {
   BOOL firstButton = YES;
   CGFloat lastVerticalOffset = 0.0;
   for (BookmarkButton* button in [self buttons]) {
     if (firstButton) {
       firstButton = NO;
       lastVerticalOffset = [button frame].origin.y;
     } else {
       CGFloat nextVerticalOffset = [button frame].origin.y;
       EXPECT_CGFLOAT_EQ(lastVerticalOffset -
-                            bookmarks::kBookmarkButtonVerticalSpan,
+                            bookmarks::kBookmarkFolderButtonHeight,
                         nextVerticalOffset);
       lastVerticalOffset = nextVerticalOffset;
     }
   }
 }
 @end
 
 // Don't use a high window level when running unit tests -- it'll
 // interfere with anything else you are working on.
 // For testing.
@@ skipping 418 matching lines @@
   // us its center for hit testing.
   BookmarkButton* targetButton = nil;
   NSPoint scrollPoint = [scrollView documentVisibleRect].origin;
   for (BookmarkButton* button in [bbfc buttons]) {
     NSRect buttonFrame = [button frame];
     buttonFrame.origin.y -= scrollPoint.y;
     if (buttonFrame.origin.y < 0.0)
       break;
     targetButton = button;
   }
+  EXPECT_TRUE(targetButton != nil);
   NSPoint hitPoint = [targetButton frame].origin;
   hitPoint.x += 50.0;
-  hitPoint.y += (bookmarks::kBookmarkButtonHeight / 2.0) - scrollPoint.y;
+  hitPoint.y += (bookmarks::kBookmarkFolderButtonHeight / 2.0) - scrollPoint.y;
+  hitPoint = [targetButton convertPoint:hitPoint toView:scrollView];
 
   for (int i = 0; i < 3; i++) {
     CGFloat height = NSHeight([window frame]);
     [bbfc performOneScroll:60];
     EXPECT_GT(NSHeight([window frame]), height);
     NSView* hit = [scrollView hitTest:hitPoint];
     // We should hit a bookmark button.
     EXPECT_TRUE([[hit className] isEqualToString:@"BookmarkButton"]);
     EXPECT_NE(hit, savedHit);
     savedHit = hit;
@@ skipping 51 matching lines @@
   CGFloat oldTop = [menuWindow frame].origin.y + NSHeight([menuWindow frame]);
   BookmarkButton* button = [buttons objectAtIndex:3];
   [folder deleteBookmark:button];
   CGFloat newTop = [menuWindow frame].origin.y + NSHeight([menuWindow frame]);
   EXPECT_CGFLOAT_EQ(oldTop, newTop);
 
   // Scroll so that both the top and bottom scroll arrows show, make sure
   // the top of the window has moved up, then delete a visible button and
   // make sure the top has not moved.
   oldTop = newTop;
-  const CGFloat scrollOneBookmark = bookmarks::kBookmarkButtonHeight +
+  const CGFloat scrollOneBookmark = bookmarks::kBookmarkFolderButtonHeight +
       bookmarks::kBookmarkVerticalPadding;
   NSUInteger buttonCounter = 0;
   NSUInteger extraButtonLimit = 3;
   while (![bbfc canScrollDown] || extraButtonLimit > 0) {
     [bbfc performOneScroll:scrollOneBookmark];
     ++buttonCounter;
     if ([bbfc canScrollDown])
       --extraButtonLimit;
   }
   newTop = [menuWindow frame].origin.y + NSHeight([menuWindow frame]);
@@ skipping 151 matching lines @@
   NSRect newToFolderFrame = [toFolder frame];
   NSRect newToWindowFrame = [toWindow frame];
   // The toFolder should have shifted left horizontally but not vertically.
   NSRect expectedToFolderFrame =
       NSOffsetRect(oldToFolderFrame, -horizontalShift, 0);
   EXPECT_NSRECT_EQ(expectedToFolderFrame, newToFolderFrame);
   // The toWindow should have shifted left horizontally, down vertically,
   // and grown vertically.
   NSRect expectedToWindowFrame = oldToWindowFrame;
   expectedToWindowFrame.origin.x -= horizontalShift;
-  CGFloat diff = (bookmarks::kBookmarkBarHeight +
-                  2*bookmarks::kBookmarkVerticalPadding);
-  expectedToWindowFrame.origin.y -= diff;
-  expectedToWindowFrame.size.height += diff;
+  expectedToWindowFrame.origin.y -= bookmarks::kBookmarkFolderButtonHeight;
+  expectedToWindowFrame.size.height += bookmarks::kBookmarkFolderButtonHeight;
   EXPECT_NSRECT_EQ(expectedToWindowFrame, newToWindowFrame);
 
   // Check button spacing.
   [folderController validateMenuSpacing];
 
   // Move the button back to the bar at the beginning.
   draggedButton = [folderController buttonWithTitleEqualTo:@"1b"];
   ASSERT_TRUE(draggedButton);
   targetButton = [bar_ buttonWithTitleEqualTo:@"2f"];
   ASSERT_TRUE(targetButton);
@@ skipping 43 matching lines @@
     "4f2f1b 4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
   EXPECT_EQ(expected_1, model_test_utils::ModelStringFromNode(root));
 
   // Gather the new frames.
   NSRect newToFolderFrame = [toFolder frame];
   NSRect newToWindowFrame = [toWindow frame];
   // The toFolder should have shifted.
   EXPECT_NSRECT_EQ(oldToFolderFrame, newToFolderFrame);
   // The toWindow should have shifted down vertically and grown vertically.
   NSRect expectedToWindowFrame = oldToWindowFrame;
-  CGFloat diff = (bookmarks::kBookmarkBarHeight +
-                  2*bookmarks::kBookmarkVerticalPadding);
-  expectedToWindowFrame.origin.y -= diff;
-  expectedToWindowFrame.size.height += diff;
+  expectedToWindowFrame.origin.y -= bookmarks::kBookmarkFolderButtonHeight;
+  expectedToWindowFrame.size.height += bookmarks::kBookmarkFolderButtonHeight;
   EXPECT_NSRECT_EQ(expectedToWindowFrame, newToWindowFrame);
 
   // Copy the button back to the bar after "3b".
   draggedButton = [folderController buttonWithTitleEqualTo:@"1b"];
   ASSERT_TRUE(draggedButton);
   targetButton = [bar_ buttonWithTitleEqualTo:@"4f"];
   ASSERT_TRUE(targetButton);
   [bar_ dragButton:draggedButton
                 to:[targetButton left]
               copy:YES];
@@ skipping 55 matching lines @@
   // Check button spacing.
   [folderController validateMenuSpacing];
   [subfolderController validateMenuSpacing];
 
   // Check the window layouts. The folder window should not have changed,
   // but the subfolder window should have shifted vertically and grown.
   NSRect newToWindowFrame = [toWindow frame];
   EXPECT_NSRECT_EQ(oldToWindowFrame, newToWindowFrame);
   NSRect newToSubwindowFrame = [toSubwindow frame];
   NSRect expectedToSubwindowFrame = oldToSubwindowFrame;
-  expectedToSubwindowFrame.origin.y -=
-      (bookmarks::kBookmarkButtonHeight + bookmarks::kVisualHeightOffset);
+  expectedToSubwindowFrame.origin.y -= bookmarks::kBookmarkFolderButtonHeight;
   expectedToSubwindowFrame.size.height +=
-      (bookmarks::kBookmarkButtonHeight + bookmarks::kVisualHeightOffset);
+      bookmarks::kBookmarkFolderButtonHeight;
   EXPECT_NSRECT_EQ(expectedToSubwindowFrame, newToSubwindowFrame);
 }
 
 TEST_F(BookmarkBarFolderControllerMenuTest, DragMoveWithinFolder) {
   BookmarkModel& model(*helper_.profile()->GetBookmarkModel());
   const BookmarkNode* root = model.GetBookmarkBarNode();
   const std::string model_string("1b 2f:[ 2f1b 2f2f:[ 2f2f1b 2f2f2b "
       "2f2f3b ] 2f3b ] 3b 4f:[ 4f1f:[ 4f1f1b 4f1f2b 4f1f3b ] 4f2f:[ 4f2f1b "
       "4f2f2b 4f2f3b ] 4f3f:[ 4f3f1b 4f3f2b 4f3f3b ] ] 5b ");
   model_test_utils::AddNodesFromModelString(model, root, model_string);
@@ skipping 282 matching lines @@
                                               ASCIIToUTF16("BIG"));
 
   // Pop open the new folder window and verify it has one (empty) item.
   BookmarkButton* button = [bar_ buttonWithTitleEqualTo:@"BIG"];
   [[button target] performSelector:@selector(openBookmarkFolderFromButton:)
                         withObject:button];
   BookmarkBarFolderController* folderController = [bar_ folderController];
   EXPECT_TRUE(folderController);
   NSWindow* folderWindow = [folderController window];
   EXPECT_TRUE(folderWindow);
-  CGFloat expectedHeight = (CGFloat)bookmarks::kBookmarkButtonHeight +
+  CGFloat expectedHeight = (CGFloat)bookmarks::kBookmarkFolderButtonHeight +
       (2*bookmarks::kBookmarkVerticalPadding);
   NSRect windowFrame = [folderWindow frame];
   CGFloat windowHeight = NSHeight(windowFrame);
   EXPECT_CGFLOAT_EQ(expectedHeight, windowHeight);
   EXPECT_FALSE([folderController canScrollUp]);
   EXPECT_FALSE([folderController canScrollDown]);
 
   // Now add a real bookmark and reopen.
   model.AddURL(folder, folder->GetChildCount(), ASCIIToUTF16("a"),
                GURL("http://a.com/"));
@@ skipping 358 matching lines @@
   [folder deleteBookmark:folder];
   EXPECT_FALSE([folder folderController]);
 }
 
 // TODO(jrg): draggingEntered: and draggingExited: trigger timers so
 // they are hard to test.  Factor out "fire timers" into routines
 // which can be overridden to fire immediately to make behavior
 // confirmable.
 // There is a similar problem with mouseEnteredButton: and
 // mouseExitedButton:.