Revert 190584 "Alternate NTP Mac: Show overlay at fixed position"

trunk/src/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Index: trunk/src/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
===================================================================
--- trunk/src/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm	(revision 190730)
+++ trunk/src/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm	(working copy)
@@ -128,6 +128,10 @@
 
 namespace {
 
+// Overlap (in pixels) between the toolbar and the bookmark bar (when showing in
+// normal mode).
+const CGFloat kBookmarkBarOverlap = 3.0;
+
 // Duration of the bookmark bar animations.
 const NSTimeInterval kBookmarkBarAnimationDuration = 0.12;
 
@@ -524,8 +528,7 @@
     // If we ever need any other animation cases, code would go here.
   }
 
-  return [self isInState:BookmarkBar::SHOW] ? bookmarks::kBookmarkBarOverlap
-                                            : 0;
+  return [self isInState:BookmarkBar::SHOW] ? kBookmarkBarOverlap : 0;
 }
 
 - (CGFloat)toolbarDividerOpacity {
@@ -892,7 +895,7 @@
     // Height takes into account the extra height we have since the toolbar
     // only compresses when we're done.
     [view animateToNewHeight:(bookmarks::kBookmarkBarHeight -
-                              bookmarks::kBookmarkBarOverlap)
+                              kBookmarkBarOverlap)
                     duration:kBookmarkBarAnimationDuration];
   } else if ([self isAnimatingFromState:BookmarkBar::SHOW
                                 toState:BookmarkBar::HIDDEN]) {
@@ -919,7 +922,7 @@
     // Height takes into account the extra height we have since the toolbar
     // only compresses when we're done.
     [view animateToNewHeight:(bookmarks::kBookmarkBarHeight -
-                              bookmarks::kBookmarkBarOverlap)
+                              kBookmarkBarOverlap)
                     duration:kBookmarkBarAnimationDuration];
   } else {
     // Oops! An animation we don't know how to handle.