[Mac] Fullscreen Toolbar Bar Visibility Edge Cases

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>
 
 #import "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 450 matching lines @@
 
 - (void)adjustUIForExitingFullscreenAndStopOmniboxSliding {
   [fullscreenToolbarController_ exitFullscreenMode];
   fullscreenToolbarController_.reset();
 
   // Force the bookmark bar z-order to update.
   [[bookmarkBarController_ view] removeFromSuperview];
   [self layoutSubviews];
 }
 
-- (void)adjustUIForSlidingFullscreenStyle:(fullscreen_mac::SlidingStyle)style {
+- (void)adjustUIForSlidingFullscreenStyle:(FullscreenSlidingStyle)style {
   // The UI should only be adjusted in fullscreen mode.
   if (![self isInAnyFullscreenMode])
     return;
 
   if (!fullscreenToolbarController_) {
     fullscreenToolbarController_.reset(
         [self newFullscreenToolbarControllerWithStyle:style]);
     [self configureFullscreenToolbarController];
   } else {
     fullscreenToolbarController_.get().slidingStyle = style;
   }
 
   if (!floatingBarBackingView_.get() &&
       ([self hasTabStrip] || [self hasToolbar] || [self hasLocationBar])) {
     floatingBarBackingView_.reset(
         [[FloatingBarBackingView alloc] initWithFrame:NSZeroRect]);
     [floatingBarBackingView_
         setAutoresizingMask:(NSViewWidthSizable | NSViewMinYMargin)];
   }
 
   // Force the bookmark bar z-order to update.
   [[bookmarkBarController_ view] removeFromSuperview];
   [self layoutSubviews];
 }
 
 - (FullscreenToolbarController*)newFullscreenToolbarControllerWithStyle:
-    (fullscreen_mac::SlidingStyle)style {
+    (FullscreenSlidingStyle)style {
   return [[FullscreenToolbarController alloc] initWithBrowserController:self
                                                                   style:style];
 }
 
 - (void)enterImmersiveFullscreen {
   RecordFullscreenWindowLocation([self window]);
   RecordFullscreenStyle(IMMERSIVE_FULLSCREEN);
 
   // Set to NO by |-windowDidEnterFullScreen:|.
   enteringImmersiveFullscreen_ = YES;
@@ skipping 11 matching lines @@
 
   // Create the fullscreen window.
   fullscreenWindow_.reset([[self createFullscreenWindow] retain]);
   savedRegularWindow_ = [[self window] retain];
   savedRegularWindowFrame_ = [savedRegularWindow_ frame];
 
   [self moveViewsForImmersiveFullscreen:YES
                           regularWindow:[self window]
                        fullscreenWindow:fullscreenWindow_.get()];
 
-  fullscreen_mac::SlidingStyle style = fullscreen_mac::OMNIBOX_TABS_HIDDEN;
+  FullscreenSlidingStyle style = FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN;
   [self adjustUIForSlidingFullscreenStyle:style];
 
   [fullscreenWindow_ display];
 
   // AppKit is helpful and prevents NSWindows from having the same height as
   // the screen while the menu bar is showing. This only applies to windows on
   // a secondary screen, in a separate space. Calling [NSWindow
   // setFrame:display:] with the screen's height will always reduce the
   // height by the height of the MenuBar. Calling the method with any other
   // height works fine. The relevant method in the 10.10 AppKit SDK is called:
@@ skipping 284 matching lines @@
   else
     [sheetController unhideSheetForFullscreenTransition];
 }
 
 - (void)adjustUIForExitingFullscreen {
   exclusiveAccessController_->Destroy();
   [self adjustUIForExitingFullscreenAndStopOmniboxSliding];
 }
 
 - (void)adjustUIForEnteringFullscreen {
-  fullscreen_mac::SlidingStyle style;
-  if ([self isFullscreenForTabContentOrExtension]) {
-    style = fullscreen_mac::OMNIBOX_TABS_NONE;
-  } else if (!shouldShowFullscreenToolbar_) {
-    style = fullscreen_mac::OMNIBOX_TABS_HIDDEN;
-  } else {
-    style = fullscreen_mac::OMNIBOX_TABS_PRESENT;
-  }
+  FullscreenSlidingStyle style = FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT;
+  if ([self isFullscreenForTabContentOrExtension])
+    style = FullscreenSlidingStyle::OMNIBOX_TABS_NONE;
+  else if (!shouldShowFullscreenToolbar_)
+    style = FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN;
 
   [self adjustUIForSlidingFullscreenStyle:style];
 }
 
 - (void)enableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = YES;
@@ skipping 80 matching lines @@
 - (void)updateLayoutParameters:(BrowserWindowLayout*)layout {
   [layout setContentViewSize:[[[self window] contentView] bounds].size];
 
   NSSize windowSize = (fullscreenTransition_.get())
                           ? [fullscreenTransition_ desiredWindowLayoutSize]
                           : [[self window] frame].size;
 
   [layout setWindowSize:windowSize];
 
   [layout setInAnyFullscreen:[self isInAnyFullscreenMode]];
-  [layout setFullscreenSlidingStyle:fullscreenToolbarController_.get()
-                                        .slidingStyle];
+  [layout setSlidingStyle:fullscreenToolbarController_.get().slidingStyle];
   [layout
       setFullscreenMenubarOffset:[fullscreenToolbarController_ menubarOffset]];
   [layout setFullscreenToolbarFraction:[fullscreenToolbarController_
                                            toolbarFraction]];
 
   [layout setHasTabStrip:[self hasTabStrip]];
   [layout setFullscreenButtonFrame:[self fullscreenButtonFrame]];
 
   if ([self shouldShowAvatar]) {
     NSView* avatar = [avatarButtonController_ view];
@@ skipping 313 matching lines @@
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->SetHasActiveSheet(false);
 }
 
 - (void)childWindowsDidChange {
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->ChildWindowsChanged();
 }
 
 @end  // @implementation BrowserWindowController(Private)