[Mac] Refactor Cocoa fullscreen code

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 16 matching lines @@
 #import "chrome/browser/ui/cocoa/custom_frame_view.h"
 #import "chrome/browser/ui/cocoa/dev_tools_controller.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.h"
 #import "chrome/browser/ui/cocoa/floating_bar_backing_view.h"
 #import "chrome/browser/ui/cocoa/framed_browser_window.h"
 #include "chrome/browser/ui/cocoa/fullscreen_low_power_coordinator.h"
 #import "chrome/browser/ui/cocoa/fullscreen_window.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #include "chrome/browser/ui/cocoa/last_active_browser_cocoa.h"
-#import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
+#import "chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_button_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_icon_controller.h"
 #import "chrome/browser/ui/cocoa/status_bubble_mac.h"
 #import "chrome/browser/ui/cocoa/tab_contents/overlayable_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
@@ skipping 295 matching lines @@
     return;
 
   toolbarFrame.size.height = newHeight;
   NSRect bookmarkFrame = [[bookmarkBarController_ view] frame];
   bookmarkFrame.size.height = bookmarkFrame.size.height - deltaH;
   [[toolbarController_ view] setFrame:toolbarFrame];
   [[bookmarkBarController_ view] setFrame:bookmarkFrame];
   [self layoutSubviews];
 }
 
-// Fullscreen and presentation mode methods
+// Fullscreen methods
 
 - (void)moveViewsForImmersiveFullscreen:(BOOL)fullscreen
                           regularWindow:(NSWindow*)regularWindow
                        fullscreenWindow:(NSWindow*)fullscreenWindow {
   NSWindow* sourceWindow = fullscreen ? regularWindow : fullscreenWindow;
   NSWindow* destWindow = fullscreen ? fullscreenWindow : regularWindow;
 
   // Close the bookmark bubble, if it's open.  Use |-ok:| instead of |-cancel:|
   // or |-close| because that matches the behavior when the bubble loses key
   // status.
@@ skipping 90 matching lines @@
 - (void)permissionBubbleWindowWillClose:(NSNotification*)notification {
   NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
   [center removeObserver:self
                     name:NSWindowWillCloseNotification
                   object:[notification object]];
   [self releaseBarVisibilityForOwner:[notification object]
                        withAnimation:YES
                                delay:YES];
 }
 
-- (void)configurePresentationModeController {
+- (void)configureFullscreenToolbarController {
   BOOL fullscreenForTab = [self isFullscreenForTabContentOrExtension];
   BOOL kioskMode =
       base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
   BOOL showDropdown =
       !fullscreenForTab && !kioskMode && ([self floatingBarHasFocus]);
 
   PermissionBubbleManager* manager = [self permissionBubbleManager];
   if (manager && manager->IsBubbleVisible()) {
     NSWindow* bubbleWindow = manager->GetBubbleWindow();
     DCHECK(bubbleWindow);
     // A visible permission bubble will force the dropdown to remain
     // visible.
     [self lockBarVisibilityForOwner:bubbleWindow withAnimation:NO delay:NO];
     showDropdown = YES;
     // Register to be notified when the permission bubble is closed, to
     // allow fullscreen to hide the dropdown.
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     [center addObserver:self
                selector:@selector(permissionBubbleWindowWillClose:)
                    name:NSWindowWillCloseNotification
                  object:bubbleWindow];
   }
 
   NSView* contentView = [[self window] contentView];
-  [presentationModeController_
-      enterPresentationModeForContentView:contentView
-                             showDropdown:showDropdown];
+  [fullscreenToolbarController_
+      setupFullscreenToolbarForContentView:contentView
+                              showDropdown:showDropdown];
 }
 
 - (void)adjustUIForExitingFullscreenAndStopOmniboxSliding {
-  [presentationModeController_ exitPresentationMode];
-  presentationModeController_.reset();
+  [fullscreenToolbarController_ exitFullscreenMode];
+  fullscreenToolbarController_.reset();
 
   // Force the bookmark bar z-order to update.
   [[bookmarkBarController_ view] removeFromSuperview];
   [self layoutSubviews];
 }
 
 - (void)adjustUIForSlidingFullscreenStyle:(fullscreen_mac::SlidingStyle)style {
-  if (!presentationModeController_) {
-    presentationModeController_.reset(
-        [self newPresentationModeControllerWithStyle:style]);
-    [self configurePresentationModeController];
+  if (!fullscreenToolbarController_) {
+    fullscreenToolbarController_.reset(
+        [self newFullscreenToolbarControllerWithStyle:style]);
+    [self configureFullscreenToolbarController];
   } else {
-    presentationModeController_.get().slidingStyle = style;
+    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];
 }
 
-- (PresentationModeController*)newPresentationModeControllerWithStyle:
+- (FullscreenToolbarController*)newFullscreenToolbarControllerWithStyle:
     (fullscreen_mac::SlidingStyle)style {
-  return [[PresentationModeController alloc] initWithBrowserController:self
-                                                                 style:style];
+  return [[FullscreenToolbarController alloc] initWithBrowserController:self
+                                                                  style:style];
 }
 
 - (void)enterImmersiveFullscreen {
   RecordFullscreenWindowLocation([self window]);
   RecordFullscreenStyle(IMMERSIVE_FULLSCREEN);
 
   // Set to NO by |-windowDidEnterFullScreen:|.
   enteringImmersiveFullscreen_ = YES;
 
   // Fade to black.
@@ skipping 334 matching lines @@
 }
 
 - (void)enableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = YES;
 
   if ([barVisibilityLocks_ count])
-    [presentationModeController_ ensureOverlayShownWithAnimation:NO delay:NO];
+    [fullscreenToolbarController_ ensureOverlayShownWithAnimation:NO delay:NO];
   else
-    [presentationModeController_ ensureOverlayHiddenWithAnimation:NO delay:NO];
+    [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:NO delay:NO];
 }
 
 - (void)disableBarVisibilityUpdates {
   // Early escape if there's nothing to do.
   if (!barVisibilityUpdatesEnabled_)
     return;
 
   barVisibilityUpdatesEnabled_ = NO;
-  [presentationModeController_ cancelAnimationAndTimers];
+  [fullscreenToolbarController_ cancelAnimationAndTimers];
 }
 
 - (void)hideOverlayIfPossibleWithAnimation:(BOOL)animation delay:(BOOL)delay {
   if (!barVisibilityUpdatesEnabled_ || [barVisibilityLocks_ count])
     return;
-  [presentationModeController_ ensureOverlayHiddenWithAnimation:animation
-                                                          delay:delay];
+  [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:animation
+                                                           delay:delay];
 }
 
 - (CGFloat)toolbarDividerOpacity {
   return [bookmarkBarController_ toolbarDividerOpacity];
 }
 
 - (void)updateInfoBarTipVisibility {
   // If there's no toolbar then hide the infobar tip.
   [infoBarContainerController_
       setShouldSuppressTopInfoBarTip:![self hasToolbar]];
 }
 
 - (NSInteger)pageInfoBubblePointY {
   LocationBarViewMac* locationBarView = [self locationBarBridge];
 
   // The point, in window coordinates.
   NSPoint iconBottom = locationBarView->GetPageInfoBubblePoint();
 
   // The toolbar, in window coordinates.
   NSView* toolbar = [toolbarController_ view];
   CGFloat toolbarY = NSMinY([toolbar convertRect:[toolbar bounds] toView:nil]);
 
   return iconBottom.y - toolbarY;
 }
 
 - (void)enterAppKitFullscreen {
-  if (FramedBrowserWindow* framedBrowserWindow =
-          base::mac::ObjCCast<FramedBrowserWindow>([self window])) {

[Robert Sesek, 2016/06/30 17:40:09]

Why are we shedding the casts?

[spqchan, 2016/06/30 19:46:30]

toggleSystemFullscreen: was implemented in FramedBrowserWindow
Basically it checks if we're in Lion or not.

If we're Lion, it will call handleLionToggleFullscreen
Otherwise it will call toggleFullscreen.

Since we no longer need handleLionToggleFullscreen, I got rid of
toggleSystemFullscreen: in FramedBrowserWindow. We just need toggleFullscreen so
we don't need the cast anymore.

-    [framedBrowserWindow toggleSystemFullScreen];
-  }
+  [[self window] toggleFullScreen:nil];
 }
 
 - (void)exitAppKitFullscreen {
-  if (FramedBrowserWindow* framedBrowserWindow =
-          base::mac::ObjCCast<FramedBrowserWindow>([self window])) {
+  // If we're in the process of entering fullscreen, toggleSystemFullscreen
+  // will get ignored. Set |shouldExitAfterEnteringFullscreen_| to true so
+  // the browser will exit fullscreen immediately after it enters it.
+  if (enteringAppKitFullscreen_) {
+    shouldExitAfterEnteringFullscreen_ = YES;
+    return;
+  }
 
-    // If we're in the process of entering fullscreen, toggleSystemFullscreen
-    // will get ignored. Set |shouldExitAfterEnteringFullscreen_| to true so
-    // the browser will exit fullscreen immediately after it enters it.
-    if (enteringAppKitFullscreen_) {
-      shouldExitAfterEnteringFullscreen_ = YES;
-      return;
-    }
-
-    [framedBrowserWindow toggleSystemFullScreen];
-  }
+  [[self window] toggleFullScreen:nil];
 }
 
 - (NSRect)fullscreenButtonFrame {
   NSButton* fullscreenButton =
       [[self window] standardWindowButton:NSWindowFullScreenButton];
   if (!fullscreenButton)
     return NSZeroRect;
 
   NSRect buttonFrame = [fullscreenButton frame];
 
@@ skipping 10 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:
-      presentationModeController_.get().slidingStyle];
-  [layout setFullscreenMenubarOffset:
-      [presentationModeController_ menubarOffset]];
-  [layout setFullscreenToolbarFraction:
-      [presentationModeController_ toolbarFraction]];
+  [layout setFullscreenSlidingStyle: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];
     [layout setShouldShowAvatar:YES];
     [layout setShouldUseNewAvatar:[self shouldUseNewAvatarButton]];
     [layout setAvatarSize:[avatar frame].size];
     [layout setAvatarLineWidth:[[avatar superview] cr_lineWidth]];
@@ skipping 44 matching lines @@
   [infoBarContainerController_
       setInfobarArrowX:[self locationBarBridge]->GetPageInfoBubblePoint().x];
 
   if (!NSIsEmptyRect(output.downloadShelfFrame))
     [[downloadShelfController_ view] setFrame:output.downloadShelfFrame];
 
   [self layoutTabContentArea:output.contentAreaFrame];
 
   if (!NSIsEmptyRect(output.fullscreenBackingBarFrame)) {
     [floatingBarBackingView_ setFrame:output.fullscreenBackingBarFrame];
-    [presentationModeController_
+    [fullscreenToolbarController_
         overlayFrameChanged:output.fullscreenBackingBarFrame];
   }
 
   [findBarCocoaController_
       positionFindBarViewAtMaxY:output.findBarMaxY
                        maxWidth:NSWidth(output.contentAreaFrame)];
 
   exclusiveAccessController_->Layout(output.fullscreenExitButtonMaxY);
 
   if (fullscreenLowPowerCoordinator_) {
@@ skipping 244 matching lines @@
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->SetHasActiveSheet(false);
 }
 
 - (void)childWindowsDidChange {
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->ChildWindowsChanged();
 }
 
 @end  // @implementation BrowserWindowController(Private)