Mac: Minor fullscreen adjustments.

chrome/browser/ui/cocoa/browser_window_layout.mm

 // Copyright 2014 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_layout.h"
 
 #include "base/logging.h"
 
 namespace chrome {
 
@@ skipping 177 matching lines @@
   // Lay out the backing bar in fullscreen mode.
   if (parameters_.inAnyFullscreen) {
     output_.fullscreenBackingBarFrame =
         NSMakeRect(0, maxY, width, [self fullscreenBackingBarHeight]);
   }
 
   // Place the find bar immediately below the toolbar/attached bookmark bar.
   output_.findBarMaxY = maxY;
   output_.fullscreenExitButtonMaxY = maxY;
 
-  if (parameters_.inAnyFullscreen) {
-    switch (parameters_.slidingStyle) {
-      case fullscreen_mac::OMNIBOX_TABS_PRESENT:
-        // Do nothing in Canonical Fullscreen. All content slides.
-        break;
-      case fullscreen_mac::OMNIBOX_TABS_HIDDEN:
-        // 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.
-        maxY = parameters_.contentViewSize.height;
-        break;
-    }
+  if (parameters_.inAnyFullscreen &&
+      parameters_.slidingStyle == fullscreen_mac::OMNIBOX_TABS_HIDDEN) {
+    // 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.
+    maxY = parameters_.windowSize.height;
   }
 
   // Lay out the info bar. It is never hidden. The frame needs to be high
   // enough to accomodate the top arrow, which might stretch all the way to the
   // page info bubble icon.
   if (parameters_.infoBarHeight != 0) {
     CGFloat infoBarMaxY =
         NSMinY(output_.toolbarFrame) + parameters.pageInfoBubblePointY;
     CGFloat infoBarMinY = maxY - parameters_.infoBarHeight;
     output_.infoBarFrame =
@@ skipping 18 matching lines @@
   }
 
   // Layout the download shelf at the bottom of the content view.
   CGFloat minY = 0;
   if (parameters.hasDownloadShelf) {
     output_.downloadShelfFrame =
         NSMakeRect(0, 0, width, parameters.downloadShelfHeight);
     minY = NSMaxY(output_.downloadShelfFrame);
   }
 
+  if (parameters_.inAnyFullscreen &&
+      parameters_.slidingStyle == fullscreen_mac::OMNIBOX_TABS_PRESENT) {
+    // If in Canonical Fullscreen, content should be shifted down by an amount
+    // equal to all the widgets and views at the top of the window. It should
+    // not be further shifted by the appearance/disappearance of the AppKit
+    // menu bar.
+    maxY = parameters_.windowSize.height;
+    maxY -= NSHeight(output_.toolbarFrame) + NSHeight(output_.tabStripFrame) +
+            NSHeight(output_.bookmarkFrame) + parameters.infoBarHeight;
+  }
+
   // All the remaining space becomes the frame of the content area.
   output_.contentAreaFrame = NSMakeRect(0, minY, width, maxY - minY);
 }
 
 - (CGFloat)fullscreenBackingBarHeight {
   if (!parameters_.inAnyFullscreen)
     return 0;
 
   CGFloat totalHeight = 0;
   if (parameters_.hasTabStrip)
     totalHeight += chrome::kTabStripHeight;
 
   if (parameters_.hasToolbar) {
     totalHeight += parameters_.toolbarHeight;
   } else if (parameters_.hasLocationBar) {
     totalHeight +=
         parameters_.toolbarHeight + kLocBarTopInset + kLocBarBottomInset;
   }
 
   if (!parameters_.bookmarkBarHidden &&
       !parameters_.placeBookmarkBarBelowInfoBar)
     totalHeight += parameters_.bookmarkBarHeight;
 
   return totalHeight;
 }
 
 @end