[Mac] Move the fullscreen toolbar style to FullscreenToolbarController

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 81 matching lines @@
 }
 
 - (void)setWindowSize:(NSSize)size {
   parameters_.windowSize = size;
 }
 
 - (void)setInAnyFullscreen:(BOOL)inAnyFullscreen {
   parameters_.inAnyFullscreen = inAnyFullscreen;
 }
 
-- (void)setSlidingStyle:(FullscreenSlidingStyle)slidingStyle {
-  parameters_.slidingStyle = slidingStyle;
+- (void)setFullscreenToolbarStyle:(FullscreenToolbarStyle)style {
+  parameters_.toolbarStyle = style;
 }
 
 - (void)setFullscreenMenubarOffset:(CGFloat)menubarOffset {
   parameters_.menubarOffset = menubarOffset;
 }
 
 - (void)setFullscreenToolbarFraction:(CGFloat)toolbarFraction {
   parameters_.toolbarFraction = toolbarFraction;
 }
 
@@ skipping 191 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;
 
   if (parameters_.inAnyFullscreen &&
-      (parameters_.slidingStyle ==
-           FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN ||
-       parameters_.slidingStyle == FullscreenSlidingStyle::OMNIBOX_TABS_NONE)) {
-    // 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.
+      (parameters_.toolbarStyle == FullscreenToolbarStyle::TOOLBAR_HIDDEN ||
+       parameters_.toolbarStyle == FullscreenToolbarStyle::TOOLBAR_NONE)) {
+    // If the toolbar is hidden or missing, reset |maxY| to top of screen, so
+    // that the toolbar 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.
   if (parameters_.infoBarHeight != 0) {
     CGFloat infoBarMaxY = maxY;
     CGFloat infoBarMinY = maxY - parameters_.infoBarHeight;
 
     // If there's a toolbar, then the frame needs to be high enough to
     // accomodate the top arrow, which might stretch all the way to the page
@@ skipping 26 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 ==
-          FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT) {
+      parameters_.toolbarStyle == FullscreenToolbarStyle::TOOLBAR_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_.tabStripLayout.frame) +
             NSHeight(output_.bookmarkFrame) + parameters.infoBarHeight;
   }
 
@@ skipping 25 matching lines @@
 
 @end
 
 @implementation BrowserWindowLayout (ExposedForTesting)
 
 - (void)setOSYosemiteOrLater:(BOOL)osYosemiteOrLater {
   parameters_.isOSYosemiteOrLater = osYosemiteOrLater;
 }
 
 @end