[Mac] Refactor Cocoa fullscreen code

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 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.h"
 
 #include <cmath>
 #include <numeric>
 #include <utility>
 
@@ skipping 41 matching lines @@
 #include "chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h"
 #import "chrome/browser/ui/cocoa/fast_resize_view.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
 #import "chrome/browser/ui/cocoa/find_bar/find_bar_cocoa_controller.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/location_bar/autocomplete_text_field_editor.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_base_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_controller.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
@@ skipping 336 matching lines @@
 
     // We are done initializing now.
     initializing_ = NO;
   }
   return self;
 }
 
 - (void)dealloc {
   browser_->tab_strip_model()->CloseAllTabs();
 
-  // Explicitly release |presentationModeController_| here, as it may call back
-  // to this BWC in |-dealloc|.  We are required to call |-exitPresentationMode|
+  // Explicitly release |fullscreenToolbarController_| here, as it may call back
+  // to this BWC in |-dealloc|.  We are required to call |-exitFullscreenMode|
   // before releasing the controller.
-  [presentationModeController_ exitPresentationMode];
-  presentationModeController_.reset();
+  [fullscreenToolbarController_ exitFullscreenMode];
+  fullscreenToolbarController_.reset();
 
   // Explicitly release |fullscreenTransition_| here since it may call back to
   // this BWC in |-dealloc|. Reset the fullscreen variables.
   if (fullscreenTransition_) {
     [fullscreenTransition_ browserWillBeDestroyed];
     [self resetCustomAppKitFullscreenVariables];
   }
 
   // Under certain testing configurations we may not actually own the browser.
   if (ownsBrowser_ == NO)
@@ skipping 593 matching lines @@
     manager = PermissionBubbleManager::FromWebContents(newContents);
     if (manager)
       manager->DisplayPendingRequests();
   }
 
   // If the web contents want to focus on the location bar, do not call the
   // animation since the location bar will drop down when it's focused.
   bool willFocusLocationBar =
       newContents && newContents->FocusLocationBarByDefault();
   if ([self isInAnyFullscreenMode] && !willFocusLocationBar)
-    [[self presentationModeController] revealToolbarForTabStripChanges];
+    [[self fullscreenToolbarController] revealToolbarForTabStripChanges];
 }
 
 - (void)zoomChangedForActiveTab:(BOOL)canShowBubble {
   [toolbarController_ zoomChangedForActiveTab:canShowBubble];
 }
 
 // Return the rect, in WebKit coordinates (flipped), of the window's grow box
 // in the coordinate system of the content area of the currently selected tab.
 // |windowGrowBox| needs to be in the window's coordinate system.
 - (NSRect)selectedTabGrowBoxRect {
@@ skipping 431 matching lines @@
   }
 }
 
 - (void)onTabDetachedWithContents:(WebContents*)contents {
   [infoBarContainerController_ tabDetachedWithContents:contents];
 }
 
 - (void)onTabInsertedInForeground:(BOOL)inForeground {
   if ([self isInAnyFullscreenMode] && !inForeground &&
       ![toolbarController_ isLocationBarFocused]) {
-    [[self presentationModeController] revealToolbarForTabStripChanges];
+    [[self fullscreenToolbarController] revealToolbarForTabStripChanges];
   }
 }
 
 - (void)userChangedTheme {
   NSView* rootView = [[[self window] contentView] superview];
   [rootView cr_recursivelyInvokeBlock:^(id view) {
       if ([view conformsToProtocol:@protocol(ThemedWindowDrawing)])
         [view windowDidChangeTheme];
 
       // TODO(andresantoso): Remove this once all themed views respond to
@@ skipping 327 matching lines @@
   return
       [[tabStripController_ activeTabContentsController] blockFullscreenResize];
 }
 
 - (void)sheetDidEnd:(NSWindow*)sheet
          returnCode:(NSInteger)code
             context:(void*)context {
   [sheet orderOut:self];
 }
 
-- (PresentationModeController*)presentationModeController {
-  return presentationModeController_.get();
+- (FullscreenToolbarController*)fullscreenToolbarController {
+  return fullscreenToolbarController_.get();
 }
 
-- (void)setPresentationModeController:(PresentationModeController*)controller {
-  presentationModeController_.reset([controller retain]);
+- (void)setFullscreenToolbarController:
+    (FullscreenToolbarController*)controller {
+  fullscreenToolbarController_.reset([controller retain]);
 }
 
 - (void)executeExtensionCommand:(const std::string&)extension_id
                         command:(const extensions::Command&)command {
   // Global commands are handled by the ExtensionCommandsGlobalRegistry
   // instance.
   DCHECK(!command.global());
   extension_keybinding_registry_->ExecuteCommand(extension_id,
                                                  command.accelerator());
 }
 
 - (void)setAlertState:(TabAlertState)alertState {
   static_cast<BrowserWindowCocoa*>([self browserWindow])
       ->UpdateAlertState(alertState);
 }
 
 - (TabAlertState)alertState {
   return static_cast<BrowserWindowCocoa*>([self browserWindow])->alert_state();
 }
 
 @end  // @implementation BrowserWindowController
 
 @implementation BrowserWindowController(Fullscreen)
 
-- (void)handleLionToggleFullscreen {
-  chrome::ExecuteCommand(browser_.get(), IDC_FULLSCREEN);
-}
-
 - (void)enterBrowserFullscreen {
   [self enterAppKitFullscreen];
 }
 
 - (void)updateUIForTabFullscreen:
     (ExclusiveAccessContext::TabFullscreenState)state {
   DCHECK([self isInAnyFullscreenMode]);
   if (state == ExclusiveAccessContext::STATE_ENTER_TAB_FULLSCREEN) {
     [self adjustUIForSlidingFullscreenStyle:fullscreen_mac::OMNIBOX_TABS_NONE];
     return;
@@ skipping 16 matching lines @@
     browser_->extension_window_controller()->SetFullscreenMode(NO, GURL());
     return YES;
   }
   return NO;
 }
 
 - (void)setFullscreenToolbarVisible:(BOOL)visible {
   if (shouldShowFullscreenToolbar_ == visible)
     return;
 
-  [presentationModeController_ setToolbarFraction:0.0];
+  [fullscreenToolbarController_ setToolbarFraction:0.0];
   shouldShowFullscreenToolbar_ = visible;
   [self adjustUIForSlidingFullscreenStyle:
             shouldShowFullscreenToolbar_ ? fullscreen_mac::OMNIBOX_TABS_PRESENT
                                          : fullscreen_mac::OMNIBOX_TABS_HIDDEN];
 }
 
 - (BOOL)isInAnyFullscreenMode {
   return [self isInImmersiveFullscreen] || [self isInAppKitFullscreen];
 }
 
 - (BOOL)isInImmersiveFullscreen {
   return fullscreenWindow_.get() != nil || enteringImmersiveFullscreen_;
 }
 
 - (BOOL)isInAppKitFullscreen {
   return !exitingAppKitFullscreen_ &&
          (([[self window] styleMask] & NSFullScreenWindowMask) ==
               NSFullScreenWindowMask ||
           enteringAppKitFullscreen_);
 }
 
 - (CGFloat)menubarOffset {
-  return [presentationModeController_ menubarOffset];
+  return [fullscreenToolbarController_ menubarOffset];
 }
 
 - (NSView*)avatarView {
   return [avatarButtonController_ view];
 }
 
 - (void)enterWebContentFullscreen {
   // HTML5 Fullscreen should only use AppKit fullscreen in 10.10+.
   // However, if the user is using multiple monitors and turned off
   // "Separate Space in Each Display", use Immersive Fullscreen so
@@ skipping 42 matching lines @@
   DCHECK(barVisibilityLocks_);
   return [barVisibilityLocks_ containsObject:owner];
 }
 
 - (void)lockBarVisibilityForOwner:(id)owner
                     withAnimation:(BOOL)animate
                             delay:(BOOL)delay {
   if (![self isBarVisibilityLockedForOwner:owner]) {
     [barVisibilityLocks_ addObject:owner];
 
-    // If enabled, show the overlay if necessary (and if in presentation mode).
+    // If enabled, show the overlay if necessary (and if the fullscreen
+    // toolbar is hidden).
     if (barVisibilityUpdatesEnabled_) {
-      [presentationModeController_ ensureOverlayShownWithAnimation:animate
-                                                             delay:delay];
+      [fullscreenToolbarController_ ensureOverlayShownWithAnimation:animate
+                                                              delay:delay];
     }
   }
 }
 
 - (void)releaseBarVisibilityForOwner:(id)owner
                        withAnimation:(BOOL)animate
                                delay:(BOOL)delay {
   if ([self isBarVisibilityLockedForOwner:owner]) {
     [barVisibilityLocks_ removeObject:owner];
 
-    // If enabled, hide the overlay if necessary (and if in presentation mode).
+    // If enabled, hide the overlay if necessary (and if the fullscreen
+    // toolbar is hidden).
     if (barVisibilityUpdatesEnabled_ &&
         ![barVisibilityLocks_ count]) {
-      [presentationModeController_ ensureOverlayHiddenWithAnimation:animate
-                                                              delay:delay];
+      [fullscreenToolbarController_ ensureOverlayHiddenWithAnimation:animate
+                                                               delay:delay];
     }
   }
 }
 
 - (BOOL)floatingBarHasFocus {
   NSResponder* focused = [[self window] firstResponder];
   return [focused isKindOfClass:[AutocompleteTextFieldEditor class]];
 }
 
 - (ExclusiveAccessController*)exclusiveAccessController {
@@ skipping 32 matching lines @@
 
 - (NSRect)savedRegularWindowFrame {
   return savedRegularWindowFrame_;
 }
 
 - (BOOL)isFullscreenTransitionInProgress {
   return enteringAppKitFullscreen_ || exitingAppKitFullscreen_;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)