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

chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h

-// 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_
 #pragma once
 
 #import <Cocoa/Cocoa.h>
 #include <map>
 
@@ skipping 35 matching lines @@
 // Horizontal frame inset for buttons in the bookmark bar.
 const CGFloat kBookmarkHorizontalPadding = 1.0;
 
 // Vertical frame inset for buttons in the bookmark bar.
 const CGFloat kBookmarkVerticalPadding = 2.0;
 
 // Used as a min/max width for buttons on menus (not on the bar).
 const CGFloat kBookmarkMenuButtonMinimumWidth = 100.0;
 const CGFloat kBookmarkMenuButtonMaximumWidth = 485.0;
 
-// TODO(mrossetti): Add constant (kBookmarkVerticalSeparation) for the gap
-// between buttons in a folder menu. Right now we're using
-// kBookmarkVerticalPadding, which is dual purpose and wrong.
-// http://crbug.com/59057
-
-// Convenience constant giving the vertical distance from the top extent of one
-// folder button to the next button.
-const CGFloat kBookmarkButtonVerticalSpan =
-    kBookmarkButtonHeight + kBookmarkVerticalPadding;
-
 // The minimum separation between a folder menu and the edge of the screen.
 // If the menu gets closer to the edge of the screen (either right or left)
 // then it is pops up in the opposite direction.
 // (See -[BookmarkBarFolderController childFolderWindowLeftForWidth:]).
 const CGFloat kBookmarkHorizontalScreenPadding = 8.0;
 
 // Our NSScrollView is supposed to be just barely big enough to fit its
 // contentView.  It is actually a hair too small.
 // This turns on horizontal scrolling which, although slight, is awkward.
 // Make sure our window (and NSScrollView) are wider than its documentView
 // by at least this much.
 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 = 2.0;
 
 // When constraining a scrolling bookmark bar folder window to the
 // screen, shrink the "constrain" by this much vertically.  Currently
 // this is 0.0 to avoid a problem with tracking areas leaving the
 // window, but should probably be 8.0 or something.
 const CGFloat kScrollWindowVerticalMargin = 6.0;
 
 // How far to offset a folder menu from the top of the bookmark bar. This
 // is set just above the bar so that it become distinctive when drawn.
 const CGFloat kBookmarkBarMenuOffset = 2.0;
 
+// How far to offset a folder menu's left edge horizontally in relation to
+// the left edge of the button from which it springs. Because of drawing
+// differences, simply aligning the |frame| of each does not render the
+// pproper result, so we have to offset.
+const CGFloat kBookmarkBarButtonOffset = 2.0;
+
 // Delay before opening a subfolder (and closing the previous one)
 // when hovering over a folder button.
 const NSTimeInterval kHoverOpenDelay = 0.3;
 
 // Delay on hover before a submenu opens when dragging.
 // Experimentally a drag hover open delay needs to be bigger than a
 // normal (non-drag) menu hover open such as used in the bookmark folder.
 //  TODO(jrg): confirm feel of this constant with ui-team.
 //  http://crbug.com/36276
 const NSTimeInterval kDragHoverOpenDelay = 0.7;
@@ skipping 293 matching lines @@
 
 // The following are for testing purposes only and are not used internally.
 - (NSMenu *)menuForFolderNode:(const BookmarkNode*)node;
 - (NSMenu*)buttonContextMenu;
 - (void)setButtonContextMenu:(id)menu;
 // Set to YES in order to prevent animations.
 - (void)setIgnoreAnimations:(BOOL)ignore;
 @end
 
 #endif  // CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BAR_CONTROLLER_H_