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

trunk/src/chrome/browser/ui/cocoa/browser_window_controller_private.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/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #import "base/memory/scoped_nsobject.h"
@@ skipping 188 matching lines @@
     maxY = [self layoutTabStripAtMaxY:maxY
                                 width:width
                            fullscreen:[self isFullscreen]];
   }
 
   // Sanity-check |maxY|.
   DCHECK_GE(maxY, minY);
   DCHECK_LE(maxY, NSMaxY(contentBounds) + yOffset);
 
   // Place the toolbar at the top of the reserved area.
-  CGFloat toolbarTopY = maxY;
   maxY = [self layoutToolbarAtMinX:minX maxY:maxY width:width];
+  CGFloat toolbarBottomY = maxY;
 
   // If we're not displaying the bookmark bar below the infobar, then it goes
   // immediately below the toolbar.
   BOOL placeBookmarkBarBelowInfoBar = [self placeBookmarkBarBelowInfoBar];
   if (!placeBookmarkBarBelowInfoBar)
     maxY = [self layoutBookmarkBarAtMinX:minX maxY:maxY width:width];
 
   // The floating bar backing view doesn't actually add any height.
   NSRect floatingBarBackingRect =
       NSMakeRect(minX, maxY, width, floatingBarHeight);
@@ skipping 23 matching lines @@
     maxY = [self layoutBookmarkBarAtMinX:minX maxY:maxY width:width];
 
   // In presentation mode the content area takes up all the remaining space
   // (from the bottom of the infobar down). In normal mode the content area
   // takes up the space between the bottom of the toolbar down.
   CGFloat contentAreaTop = 0;
   if (inPresentationMode) {
     toolbarToWebContentsOffset_ = 0;
     contentAreaTop = maxY;
   } else {
-    CGFloat minToolbarHeight = 0;
-    if ([self hasToolbar]) {
-      minToolbarHeight = [toolbarController_
-          desiredHeightForCompression:bookmarks::kBookmarkBarOverlap];
-    }
-    contentAreaTop = toolbarTopY - minToolbarHeight;
-    toolbarToWebContentsOffset_ = contentAreaTop - maxY;
+    toolbarToWebContentsOffset_ = toolbarBottomY - maxY;
+    contentAreaTop = toolbarBottomY;
   }
   [self updateContentOffsets];
 
   NSRect contentAreaRect = NSMakeRect(minX, minY, width, contentAreaTop - minY);
   [self layoutTabContentArea:contentAreaRect];
 
   // Normally, we don't need to tell the toolbar whether or not to show the
   // divider, but things break down during animation.
   [toolbarController_ setDividerOpacity:[self toolbarDividerOpacity]];
 }
@@ skipping 569 matching lines @@
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
   [presentationModeController_ cancelAnimationAndTimers];
 }
 
 - (CGFloat)toolbarDividerOpacity {
+  if ([self currentInstantUIState] != browser_window_controller::kInstantUINone)
+    return 1;
   return [bookmarkBarController_ toolbarDividerOpacity];
 }
 
 - (browser_window_controller::InstantUIState)currentInstantUIState {
   if (!browser_->search_model()->mode().is_search_suggestions())
     return browser_window_controller::kInstantUINone;
 
   // If the search suggestions are already being displayed in the overlay
   // contents then return kInstantUIOverlay.
   if ([overlayableContentsController_ isShowingOverlay])
@@ skipping 91 matching lines @@
                          relativeTo:[bookmarkBarController_ view]];
     } else {
       [contentView cr_ensureSubview:floatingBarBackingView_
                        isPositioned:NSWindowBelow
                          relativeTo:[bookmarkBarController_ view]];
     }
   }
 }
 
 @end  // @implementation BrowserWindowController(Private)