[Mac] Fix for fullscreen toolbar layout issues

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 <math.h>
 #include <string.h>
 
 #include "base/logging.h"
@@ skipping 262 matching lines @@
   CGFloat maxY = maxY_;
 
   // Sanity-check |maxY|.
   DCHECK_GE(maxY, 0);
   DCHECK_LE(maxY, parameters_.contentViewSize.height + fullscreenYOffset_);
 
   CGFloat width = parameters_.contentViewSize.width;
 
   // Lay out the toolbar.
   if (parameters.hasToolbar) {
-    output_.toolbarFrame = NSMakeRect(
-        0, maxY - parameters_.toolbarHeight, width, parameters_.toolbarHeight);
+    CGFloat toolbarY = maxY;
+    if (parameters_.inAnyFullscreen &&
+        parameters_.toolbarStyle == FullscreenToolbarStyle::TOOLBAR_NONE) {
+      toolbarY = parameters_.windowSize.height + fullscreenYOffset_;
+    }
+
+    output_.toolbarFrame = NSMakeRect(0, toolbarY - parameters_.toolbarHeight,
+                                      width, parameters_.toolbarHeight);
     maxY = NSMinY(output_.toolbarFrame);
   } else if (parameters_.hasLocationBar) {
     CGFloat toolbarX = kLocBarLeftRightInset;
     CGFloat toolbarY = maxY - parameters_.toolbarHeight - kLocBarTopInset;
     CGFloat toolbarWidth = width - 2 * kLocBarLeftRightInset;
     output_.toolbarFrame =
         NSMakeRect(toolbarX, toolbarY, toolbarWidth, parameters_.toolbarHeight);
     maxY = NSMinY(output_.toolbarFrame) - kLocBarBottomInset;
   }
 
@@ skipping 107 matching lines @@
 
 @end
 
 @implementation BrowserWindowLayout (ExposedForTesting)
 
 - (void)setOSYosemiteOrLater:(BOOL)osYosemiteOrLater {
   parameters_.isOSYosemiteOrLater = osYosemiteOrLater;
 }
 
 @end