Alternate NTP Mac: Push down overlay in presentation mode

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 191 matching lines @@
   }
 
   // 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];
 
-  // If we're not displaying the bookmark bar below the infobar, then it goes
+  // If we're not displaying the bookmark bar below the info bar, 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);
   [self layoutFloatingBarBackingView:floatingBarBackingRect
                     presentationMode:inPresentationMode];
 
   // Place the find bar immediately below the toolbar/attached bookmark bar. In
   // presentation mode, it hangs off the top of the screen when the bar is
   // hidden.  The find bar is unaffected by the side tab positioning.
   [findBarCocoaController_ positionFindBarViewAtMaxY:maxY maxWidth:width];
   [fullscreenExitBubbleController_ positionInWindowAtTop:maxY width:width];
 
   // If in presentation mode, reset |maxY| to top of screen, so that the
   // floating bar slides over the things which appear to be in the content area.
   if (inPresentationMode)
     maxY = NSMaxY(contentBounds);
 
-  // Also place the infobar container immediate below the toolbar, except in
+  // Also place the info bar container immediate below the toolbar, except in
   // presentation mode in which case it's at the top of the visual content area.
   maxY = [self layoutInfoBarAtMinX:minX maxY:maxY width:width];
 
   // Place the download shelf, if any, at the bottom of the view.
   minY = [self layoutDownloadShelfAtMinX:minX minY:minY width:width];
 
   // Place the bookmark bar.
   if (placeBookmarkBarBelowInfoBar)
     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
+  // (from the bottom of the info bar 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;
+    // The tabContentaArea starts at the bottom of the info bar (or top of the
+    // screen if there's no info bar).
     contentAreaTop = maxY;
+    CGFloat floatingBarHeight =
+        NSHeight(floatingBarBackingRect) * [self floatingBarShownFraction];
+    // When an instant overlay is shown this is the amount it needs to be pushed
+    // down so that it doesn't get covered by the floating toolbar.
+    toolbarToWebContentsOffset_ =
+        floatingBarHeight - (NSMaxY(contentBounds) - maxY);
   } else {
+    // The tabContentArea view starts below the omnibox.
     CGFloat minToolbarHeight = 0;
     if ([self hasToolbar]) {
       minToolbarHeight = [toolbarController_
           desiredHeightForCompression:bookmarks::kBookmarkBarOverlap];
     }
     contentAreaTop = toolbarTopY - minToolbarHeight;
+    // This is the space between the bottom of the omnibox and the bottom of the
+    // last bar (info bar or bookmark bar or toolbar). This is used to push the
+    // tab web content down when no instant overlay is shown.
     toolbarToWebContentsOffset_ = contentAreaTop - maxY;
   }
   [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 105 matching lines @@
       DCHECK([toolbarView isHidden]);
     }
   }
   [toolbarView setFrame:toolbarFrame];
   return maxY;
 }
 
 - (BOOL)placeBookmarkBarBelowInfoBar {
   // If we are currently displaying the NTP detached bookmark bar or animating
   // to/from it (from/to anything else), we display the bookmark bar below the
-  // infobar.
+  // info bar.
   return [bookmarkBarController_ isInState:BookmarkBar::DETACHED] ||
          [bookmarkBarController_ isAnimatingToState:BookmarkBar::DETACHED] ||
          [bookmarkBarController_ isAnimatingFromState:BookmarkBar::DETACHED];
 }
 
 - (CGFloat)layoutBookmarkBarAtMinX:(CGFloat)minX
                               maxY:(CGFloat)maxY
                              width:(CGFloat)width {
   [bookmarkBarController_ updateHiddenState];
 
@@ skipping 463 matching lines @@
   if ([overlayableContentsController_ isShowingOverlay])
     return browser_window_controller::kInstantUIOverlay;
 
   if (browser_->search_model()->top_bars_visible())
     return browser_window_controller::kInstantUINone;
 
   return browser_window_controller::kInstantUIFullPageResults;
 }
 
 - (void)updateContentOffsets {
-  // Normally the tab contents sits below the bookmark bar. This is achieved by
-  // setting the offset to the height of the bookmark bar. The only exception
-  // is on the search results page where the Instant results are shown inside
-  // the page and not in the overlay contents as usual.
-  CGFloat tabContentsOffset = toolbarToWebContentsOffset_;
-  if ([self currentInstantUIState] ==
-      browser_window_controller::kInstantUIFullPageResults) {
-    tabContentsOffset = 0;
+  if ([self inPresentationMode]) {
+    // In presentation mode the tabContentArea starts at the bottom of the info
+    // bar (or top of the screen if there's no info bar).
+    if ([self currentInstantUIState] !=
+        browser_window_controller::kInstantUIFullPageResults) {
+      // Normal mode, keep the tab web contents at the top (below the info bar).
+      [overlayableContentsController_ setActiveContainerOffset:0];
+    } else {
+      // Instant suggestions are displayed in the main tab contents so push that
+      // down so that the floating toolbar doesn't obscure it.
+      [overlayableContentsController_
+          setActiveContainerOffset:toolbarToWebContentsOffset_];
+    }
+    // Floating overlay (if any) should also be below the floating toolbar.
+    [overlayableContentsController_
+        setOverlayContentsOffset:toolbarToWebContentsOffset_];
+
+    [[self tabContentArea] setContentOffset:0];
+    [devToolsController_ setTopContentOffset:0];
+  } else {
+    // In normal mode the tabContentArea starts just below the omnibox and the
+    // bookmark bar and info bar overlap it.
+    if ([self currentInstantUIState] !=
+        browser_window_controller::kInstantUIFullPageResults) {
+      // Normal mode, push the tab web contents down so that it doesn't obscure
+      // the bookmark bar and info bar.
+      [overlayableContentsController_
+          setActiveContainerOffset:toolbarToWebContentsOffset_];
+    } else {
+      // Instant suggestions are displayed in the main tab contents so don't
+      // push it down (keep it next to the omnibox).
+      [overlayableContentsController_ setActiveContainerOffset:0];
+    }
+    // Floating overlay (if any) should also be at the top (next to the
+    // omnibox).
+    [overlayableContentsController_ setOverlayContentsOffset:0];
+
+    // Prevent the fast resize view from drawing white over the bookmark bar.
+    [[self tabContentArea] setContentOffset:toolbarToWebContentsOffset_];
+    // Prevent the dev tools splitter from overlapping the bookmark bar.
+    if ([self currentInstantUIState] !=
+        browser_window_controller::kInstantUINone) {
+      [devToolsController_ setTopContentOffset:0];
+    } else {
+      [devToolsController_ setTopContentOffset:toolbarToWebContentsOffset_];
+    }
   }
-  [overlayableContentsController_ setActiveContainerOffset:tabContentsOffset];
-
-  // Prevent the fast resize view from drawing white over the bookmark bar.
-  [[self tabContentArea] setContentOffset:toolbarToWebContentsOffset_];
-
-  // Prevent the dev tools splitter from overlapping the bookmark bar.
-  if ([self currentInstantUIState] != browser_window_controller::kInstantUINone)
-    [devToolsController_ setTopContentOffset:0];
-  else
-    [devToolsController_ setTopContentOffset:toolbarToWebContentsOffset_];
 }
 
 - (void)updateSubviewZOrder:(BOOL)inPresentationMode {
   NSView* contentView = [[self window] contentView];
   NSView* toolbarView = [toolbarController_ view];
 
   if (inPresentationMode) {
     // Toolbar is above tab contents so that it can slide down from top of
     // screen.
     [contentView cr_ensureSubview:toolbarView
                      isPositioned:NSWindowAbove
                        relativeTo:[self tabContentArea]];
   } else {
-    // Toolbar is below tab contents so that the infobar arrow can appear above
+    // Toolbar is below tab contents so that the infob ar arrow can appear above
     // it.  Unlike other views the toolbar never overlaps the actual web
     // content.
     [contentView cr_ensureSubview:toolbarView
                      isPositioned:NSWindowBelow
                        relativeTo:[self tabContentArea]];
   }
 
   // The bookmark bar is always below the toolbar. In normal mode this means
   // that it is below tab contents. This allows Instant results to be above
   // the bookmark bar.
   [contentView cr_ensureSubview:[bookmarkBarController_ view]
                    isPositioned:NSWindowBelow
                      relativeTo:toolbarView];
 
   if (inPresentationMode) {
-    // In presentation mode the infobar is below all other views.
+    // In presentation mode the info bar is below all other views.
     [contentView cr_ensureSubview:[infoBarContainerController_ view]
                      isPositioned:NSWindowBelow
                        relativeTo:[self tabContentArea]];
   } else {
     // Above the toolbar but still below tab contents. Similar to the bookmark
     // bar, this allows Instant results to be above the info bar.
     [contentView cr_ensureSubview:[infoBarContainerController_ view]
                      isPositioned:NSWindowAbove
                        relativeTo:toolbarView];
   }
@@ skipping 23 matching lines @@
                          relativeTo:[bookmarkBarController_ view]];
     } else {
       [contentView cr_ensureSubview:floatingBarBackingView_
                        isPositioned:NSWindowBelow
                          relativeTo:[bookmarkBarController_ view]];
     }
   }
 }
 
 @end  // @implementation BrowserWindowController(Private)