mac: Remove simplified fullscreen.

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>
 
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
@@ skipping 184 matching lines @@
   // Update z-order. The code below depends on this.
   [self updateSubviewZOrder:[self isInFullscreenWithOmniboxSliding]];
 
   CGFloat floatingBarHeight = [self floatingBarHeight];
   CGFloat yOffset = 0;
   if ([self isInFullscreenWithOmniboxSliding]) {
     yOffset += [presentationModeController_ menubarOffset];
     switch (presentationModeController_.get().slidingStyle) {
       case fullscreen_mac::OMNIBOX_TABS_PRESENT:
         break;
-      case fullscreen_mac::OMNIBOX_PRESENT: {
-        // At rest: omnibox showing. yOffset should be tabstrip height
-        // When cursor is at top: everything shows. yOffset should be -menubar
-        // height.
-        CGFloat tabStripHeight = 0;
-        if ([self hasTabStrip])
-          tabStripHeight = NSHeight([[self tabStripView] frame]);
-        yOffset +=
-            std::floor((1 - presentationModeController_.get().toolbarFraction) *
-                       tabStripHeight);
-        break;
-      }
       case fullscreen_mac::OMNIBOX_TABS_HIDDEN:
         // In presentation mode, |yOffset| accounts for the sliding position of
         // the floating bar and the extra offset needed to dodge the menu bar.
         yOffset +=
             std::floor((1 - presentationModeController_.get().toolbarFraction) *
                        floatingBarHeight);
         break;
     }
   }
 
@@ skipping 30 matching lines @@
 
   // Place the find bar immediately below the toolbar/attached bookmark bar. In
   // presentation mode, it hangs off the top of the screen when the bar is
   // hidden.
   [findBarCocoaController_ positionFindBarViewAtMaxY:maxY maxWidth:width];
   [fullscreenExitBubbleController_ positionInWindowAtTop:maxY width:width];
 
   if ([self isInFullscreenWithOmniboxSliding]) {
     switch (presentationModeController_.get().slidingStyle) {
       case fullscreen_mac::OMNIBOX_TABS_PRESENT:
-      case fullscreen_mac::OMNIBOX_PRESENT:
-        // Do nothing in Canonical Fullscreen and Simplified Fullscreen. All
-        // content slides.
+        // 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 = NSMaxY(contentBounds);
         break;
     }
   }
 
@@ skipping 475 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()];
 
-  // When simplified fullscreen is enabled, do not enter presentation mode.
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  fullscreen_mac::SlidingStyle style;
-  if (command_line->HasSwitch(switches::kEnableSimplifiedFullscreen)) {
-    style = fullscreen_mac::OMNIBOX_PRESENT;
-  } else {
-    style = fullscreen_mac::OMNIBOX_TABS_HIDDEN;
-  }
+  fullscreen_mac::SlidingStyle style = fullscreen_mac::OMNIBOX_TABS_HIDDEN;
   [self adjustUIForSlidingFullscreenStyle:style];
 
   // 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:
   // _canAdjustSizeForScreensHaveSeparateSpacesIfFillingSecondaryScreen
   //
@@ skipping 21 matching lines @@
   const CGDisplayReservationInterval kFadeDurationSeconds = 0.6;
   Boolean didFadeOut = NO;
   CGDisplayFadeReservationToken token;
   if (CGAcquireDisplayFadeReservation(kFadeDurationSeconds, &token)
       == kCGErrorSuccess) {
     didFadeOut = YES;
     CGDisplayFade(token, kFadeDurationSeconds / 2, kCGDisplayBlendNormal,
         kCGDisplayBlendSolidColor, 0.0, 0.0, 0.0, /*synchronous=*/true);
   }
 
-  // When simplified fullscreen is enabled, the menubar status is managed
-  // directly by BWC.
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kEnableSimplifiedFullscreen)) {
-    // TODO(rohitrao): Add code to manage the menubar here.
-  }
-
   [self windowWillExitFullScreen:nil];
 
   [self moveViewsForImmersiveFullscreen:NO
                           regularWindow:savedRegularWindow_
                        fullscreenWindow:fullscreenWindow_.get()];
 
   // When exiting fullscreen mode, we need to call layoutSubviews manually.
   [savedRegularWindow_ autorelease];
   savedRegularWindow_ = nil;
   fullscreenWindow_.reset();
@@ skipping 76 matching lines @@
 - (void)windowWillEnterFullScreen:(NSNotification*)notification {
   if (notification)  // For System Fullscreen when non-nil.
     [self registerForContentViewResizeNotifications];
 
   NSWindow* window = [self window];
   savedRegularWindowFrame_ = [window frame];
   BOOL mode = enteringPresentationMode_ ||
        browser_->fullscreen_controller()->IsWindowFullscreenForTabOrPending();
   enteringAppKitFullscreen_ = YES;
 
-  fullscreen_mac::SlidingStyle style;
-  const CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(switches::kEnableSimplifiedFullscreen))
-    style = fullscreen_mac::OMNIBOX_PRESENT;
-  else if (mode)
-    style = fullscreen_mac::OMNIBOX_TABS_HIDDEN;
-  else
-    style = fullscreen_mac::OMNIBOX_TABS_PRESENT;
+  fullscreen_mac::SlidingStyle style =
+      mode ? fullscreen_mac::OMNIBOX_TABS_HIDDEN
+           : fullscreen_mac::OMNIBOX_TABS_PRESENT;
 
   [self adjustUIForSlidingFullscreenStyle:style];
 }
 
 - (void)windowDidEnterFullScreen:(NSNotification*)notification {
   // In Yosemite, some combination of the titlebar and toolbar always show in
   // full-screen mode. We do not want either to show. Search for the window that
   // contains the views, and hide it. There is no need to ever unhide the view.
   // http://crbug.com/380235
   if (base::mac::IsOSYosemiteOrLater()) {
@@ skipping 232 matching lines @@
 
 - (void)exitAppKitFullscreen {
   DCHECK(base::mac::IsOSLionOrLater());
   if (FramedBrowserWindow* framedBrowserWindow =
           base::mac::ObjCCast<FramedBrowserWindow>([self window])) {
     [framedBrowserWindow toggleSystemFullScreen];
   }
 }
 
 @end  // @implementation BrowserWindowController(Private)