Reland of http://src.chromium.org/viewvc/chrome?view=rev&revision=59278

http://codereview.chromium.org/3377001

(But this time without breaking the tree)

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

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

2 files changed, 6 insertions, 4 deletions

diff --git a/chrome/browser/cocoa/bookmark_bar_controller.h b/chrome/browser/cocoa/bookmark_bar_controller.h
index 9c57ee0..8cd5a0b 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller.h
+++ b/chrome/browser/cocoa/bookmark_bar_controller.h
@@ -49,7 +49,7 @@ const CGFloat kBookmarkMenuButtonMinimumWidth = 100.0;
 const CGFloat kBookmarkMenuButtonMaximumWidth = 485.0;
 
 const CGFloat kBookmarkVerticalPadding = 2.0;
-const CGFloat kBookmarkHorizontalPadding = 1.0;
+const CGFloat kBookmarkHorizontalPadding = 5.0;
 const CGFloat kBookmarkHorizontalScreenPadding = 8.0;
 
 // Our NSScrollView is supposed to be just barely big enough to fit its
@@ -61,7 +61,7 @@ const CGFloat kScrollViewContentWidthMargin = 2;
 
 // Make subfolder menus overlap their parent menu a bit to give a better
 // perception of a menuing system.
-const CGFloat kBookmarkMenuOverlap = 1.0;
+const CGFloat kBookmarkMenuOverlap = 5.0;
 
 // Delay before opening a subfolder (and closing the previous one)
 // when hovering over a folder button.
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
index cc53d25..46d343d 100644
--- a/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_bar_folder_controller_unittest.mm
@@ -262,8 +262,10 @@ TEST_F(BookmarkBarFolderControllerTest, BasicPosition) {
         convertBaseToScreen:[parentButton
                               convertRectToBase:[parentButton frame]].origin];
   // Within margin
-  EXPECT_LE(abs(pt.x - buttonOriginInScreen.x), 2);
-  EXPECT_LE(abs(pt.y - buttonOriginInScreen.y), 2);
+  EXPECT_LE(abs(pt.x - buttonOriginInScreen.x),
+            bookmarks::kBookmarkMenuOverlap+1);
+  EXPECT_LE(abs(pt.y - buttonOriginInScreen.y),
+            bookmarks::kBookmarkMenuOverlap+1);
 
   // Make sure we see the window shift left if it spills off the screen
   pt = [bbfc windowTopLeftForWidth:0];