[Mac] Refactor the Fullscreen Toolbar

chrome/browser/ui/cocoa/browser_window_layout.mm

Index: chrome/browser/ui/cocoa/browser_window_layout.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_layout.mm b/chrome/browser/ui/cocoa/browser_window_layout.mm
index 5afd82c0ce3297fa07cc9407a03b4620eedb37cb..7c2d6da325011324410f31bb88786f965582c4e2 100644
--- a/chrome/browser/ui/cocoa/browser_window_layout.mm
+++ b/chrome/browser/ui/cocoa/browser_window_layout.mm
@@ -89,8 +89,8 @@ const CGFloat kLocationBarRightOffset = 35;
   parameters_.inAnyFullscreen = inAnyFullscreen;
 }
 
-- (void)setSlidingStyle:(FullscreenSlidingStyle)slidingStyle {
-  parameters_.slidingStyle = slidingStyle;
+- (void)setFullscreenToolbarStyle:(FullscreenToolbarStyle)toolbarStyle {
+  parameters_.toolbarStyle = toolbarStyle;
 }
 
 - (void)setFullscreenMenubarOffset:(CGFloat)menubarOffset {
@@ -302,9 +302,8 @@ const CGFloat kLocationBarRightOffset = 35;
   output_.findBarMaxY = maxY;
 
   if (parameters_.inAnyFullscreen &&
-      (parameters_.slidingStyle ==
-           FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN ||
-       parameters_.slidingStyle == FullscreenSlidingStyle::OMNIBOX_TABS_NONE)) {
+      (parameters_.toolbarStyle == FullscreenToolbarStyle::TOOLBAR_HIDDEN ||
+       parameters_.toolbarStyle == FullscreenToolbarStyle::TOOLBAR_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.
@@ -354,8 +353,7 @@ const CGFloat kLocationBarRightOffset = 35;
   }
 
   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