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

trunk/src/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_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_controller.h"
 
 #include "base/mac/bundle_locations.h"
 #include "base/mac/mac_util.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 110 matching lines @@
 //  - |-doBookmarkBarAnimation| has most of the actual logic.
 //  - |-getDesiredToolbarHeightCompression| and |-toolbarDividerOpacity| contain
 //    related logic.
 //  - The BWC's |-layoutSubviews| needs to know how to position things.
 //  - The BWC should implement |-bookmarkBar:didChangeFromState:toState:| and
 //    |-bookmarkBar:willAnimateFromState:toState:| in order to inform the
 //    toolbar of required changes.
 
 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;
 
 void RecordAppLaunch(Profile* profile, GURL url) {
   DCHECK(profile->GetExtensionService());
   const extensions::Extension* extension =
       profile->GetExtensionService()->GetInstalledApp(url);
   if (!extension)
     return;
 
@@ skipping 376 matching lines @@
     // between showing and detached.
     if ([self isAnimatingBetweenState:BookmarkBar::HIDDEN
                              andState:BookmarkBar::SHOW] ||
         [self isAnimatingBetweenState:BookmarkBar::SHOW
                              andState:BookmarkBar::DETACHED])
       return 0;
 
     // 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 {
   // Some special cases....
   if ([self isAnimationRunning]) {
     // In general, the toolbar shouldn't show a divider while we're animating
     // between showing and hidden. The exception is when our height is < 1, in
     // which case we can't draw it. It's all-or-nothing (no partial opacity).
     if ([self isAnimatingBetweenState:BookmarkBar::HIDDEN
                              andState:BookmarkBar::SHOW])
@@ skipping 346 matching lines @@
 // (Private)
 - (BOOL)doBookmarkBarAnimation {
   if ([self isAnimatingFromState:BookmarkBar::HIDDEN
                          toState:BookmarkBar::SHOW]) {
     [[self backgroundGradientView] setShowsDivider:YES];
     [[self view] setHidden:NO];
     AnimatableView* view = [self animatableView];
     // 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]) {
     [[self backgroundGradientView] setShowsDivider:YES];
     [[self view] setHidden:NO];
     AnimatableView* view = [self animatableView];
     [view animateToNewHeight:0
                     duration:kBookmarkBarAnimationDuration];
   } else if ([self isAnimatingFromState:BookmarkBar::SHOW
                                 toState:BookmarkBar::DETACHED]) {
     [[self backgroundGradientView] setShowsDivider:YES];
     [[self view] setHidden:NO];
     AnimatableView* view = [self animatableView];
     CGFloat newHeight = chrome::search::IsInstantExtendedAPIEnabled()
                         ? bookmarks::kSearchNewTabBookmarkBarHeight
                         : chrome::kNTPBookmarkBarHeight;
     [view animateToNewHeight:newHeight
                     duration:kBookmarkBarAnimationDuration];
   } else if ([self isAnimatingFromState:BookmarkBar::DETACHED
                                 toState:BookmarkBar::SHOW]) {
     [[self backgroundGradientView] setShowsDivider:YES];
     [[self view] setHidden:NO];
     AnimatableView* view = [self animatableView];
     // 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.
     return NO;
   }
 
   return YES;
 }
 
 // Actually open the URL.  This is the last chance for a unit test to
@@ skipping 1697 matching lines @@
 - (id<BookmarkButtonControllerProtocol>)controllerForNode:
     (const BookmarkNode*)node {
   // See if it's in the bar, then if it is in the hierarchy of visible
   // folder menus.
   if (bookmarkModel_->bookmark_bar_node() == node)
     return self;
   return [folderController_ controllerForNode:node];
 }
 
 @end