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 225 matching lines @@
   // 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
-  // takes up the space between the bottom of the toolbar down.
-  CGFloat contentAreaTop = 0;
+  int 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 infobar).
     contentAreaTop = maxY;
+    CGFloat floatingBarHeight =
+        NSHeight(floatingBarBackingRect) * [self floatingBarShownFraction];
+    // When an instant overlay is shown this is the amount it needs to be pushed
+    // down by so that it doesn't get covered by the floating toolbar.

[dhollowa, 2013/03/25 16:28:18]

"pushed down so"

[sail, 2013/03/26 00:16:43]

Done.

+    toolbarToWebContentsOffset_ =
+        floatingBarHeight - (NSMaxY(contentBounds) - maxY);
   } else {
+    // The tabContentArea view starts below the omnibox.
     CGFloat minToolbarHeight = [toolbarController_
         desiredHeightForCompression:bookmarks::kBookmarkBarOverlap];
     contentAreaTop = toolbarTopY - minToolbarHeight;
+    // This is the space between the bottom of the omnibox and the bottom of the
+    // infobar (or bookmark bar if there's no infobar). This is used to push

[dhollowa, 2013/03/25 16:28:18]

What if there's both the bookmark bar and the infobar?

[sail, 2013/03/26 00:16:43]

contentAreaTop is the Y coordinate of the bottom most bar. Updated comment to
explain this.

+    // 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 589 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 infobar).
+    if ([self currentInstantUIState] !=
+        browser_window_controller::kInstantUIFullPageResults) {
+      // Normal mode, keep the tab web contents at the top (below the info bar).

[dhollowa, 2013/03/25 16:28:18]

nit: "infobar"

[sail, 2013/03/26 00:16:43]

Actually, we always make this two words. Updated my other comments so it's
consistent.

+      [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
@@ skipping 53 matching lines @@
                          relativeTo:[bookmarkBarController_ view]];
     } else {
       [contentView cr_ensureSubview:floatingBarBackingView_
                        isPositioned:NSWindowBelow
                          relativeTo:[bookmarkBarController_ view]];
     }
   }
 }
 
 @end  // @implementation BrowserWindowController(Private)