[Mac] Refactor Cocoa fullscreen code

chrome/browser/ui/cocoa/browser_window_controller_private.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_PRIVATE_H_
 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_PRIVATE_H_
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/browser_window_layout.h"
-#import "chrome/browser/ui/cocoa/presentation_mode_controller.h"
+#import "chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h"
 
 @class BrowserWindowLayout;
 class PermissionBubbleManager;
 
 namespace content {
 class WebContents;
 }  // content.
 
 // Private methods for the |BrowserWindowController|. This category should
 // contain the private methods used by different parts of the BWC; private
@@ skipping 45 matching lines @@
 - (void)adjustToolbarAndBookmarkBarForCompression:(CGFloat)compression;
 
 // Moves views between windows in preparation for fullscreen mode when not using
 // Cocoa's System Fullscreen API.  (System Fullscreen reuses the original window
 // for fullscreen mode, so there is no need to move views around.)  This method
 // does not position views; callers must also call |-layoutSubviews:|.
 - (void)moveViewsForImmersiveFullscreen:(BOOL)fullscreen
                           regularWindow:(NSWindow*)regularWindow
                        fullscreenWindow:(NSWindow*)fullscreenWindow;
 
-// Called when a permission bubble closes, and informs the presentation
+// Called when a permission bubble closes, and informs the fullscreen toolbar
 // controller that the dropdown can be hidden.  (The dropdown should never be
 // hidden while a permissions bubble is visible.)
 - (void)permissionBubbleWindowWillClose:(NSNotification*)notification;
 
 // Enter or exit fullscreen without using Cocoa's System Fullscreen API.  These
 // methods are internal implementations of |-setFullscreen:|.
 - (void)enterImmersiveFullscreen;
 - (void)exitImmersiveFullscreen;
 
 // Register or deregister for content view resize notifications.  These
@@ skipping 14 matching lines @@
 
 // The opacity for the toolbar divider; 0 means that it shouldn't be shown.
 - (CGFloat)toolbarDividerOpacity;
 
 // Update visibility of the infobar tip, depending on the state of the window.
 - (void)updateInfoBarTipVisibility;
 
 // The min Y of the bubble point in the coordinate space of the toolbar.
 - (NSInteger)pageInfoBubblePointY;
 
-// Configures the presentationModeController_ right after it is constructed.
-- (void)configurePresentationModeController;
+// Configures the fullscreenToolbarController_ right after it is constructed.
+- (void)configureFullscreenToolbarController;
 
 // Allows the omnibox to slide. Also prepares UI for several fullscreen modes.
 // This method gets called when entering AppKit fullscren, or when entering
 // Immersive fullscreen. Expects fullscreenStyle_ to be set.
 - (void)adjustUIForSlidingFullscreenStyle:(fullscreen_mac::SlidingStyle)style;
 
 // This method gets called when exiting AppKit fullscreen, or when exiting
 // Immersive fullscreen. It performs some common UI changes, and stops the
 // omnibox from sliding.
 - (void)adjustUIForExitingFullscreenAndStopOmniboxSliding;
 
 // Exposed for testing.
-// Creates a PresentationModeController with the given style.
-- (PresentationModeController*)newPresentationModeControllerWithStyle:
+// Creates a FullscreenToolbarController with the given style.
+- (FullscreenToolbarController*)newFullscreenToolbarControllerWithStyle:
     (fullscreen_mac::SlidingStyle)style;
 
 // Toggles the AppKit Fullscreen API. By default, doing so enters Canonical
 // Fullscreen.
 - (void)enterAppKitFullscreen;
 - (void)exitAppKitFullscreen;
 
 // Returns where the fullscreen button should be positioned in the window.
 // Returns NSZeroRect if there is no fullscreen button (if currently in
 // fullscreen, or if running 10.6 or 10.10+).
@@ skipping 34 matching lines @@
 // out of AppKit Fullscreen.
 - (BOOL)shouldUseCustomAppKitFullscreenTransition:(BOOL)enterFullScreen;
 
 // Resets the variables that were set from using custom AppKit fullscreen
 // animation.
 - (void)resetCustomAppKitFullscreenVariables;
 
 - (content::WebContents*)webContents;
 - (PermissionBubbleManager*)permissionBubbleManager;
 
-#if defined(MAC_OS_X_VERSION_10_7) && \
-    MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
-// Redeclare some methods from NSWindowDelegate to suppress
-// -Wpartial-availability warnings.
-- (void)windowDidEnterFullScreen:(NSNotification*)notification;
-- (void)windowDidExitFullScreen:(NSNotification*)notification;
-- (void)windowWillExitFullScreen:(NSNotification*)notification;
-
 // Hides or unhides any displayed modal sheet for fullscreen transition.
 // Modal sheets should be hidden at the beginning and then shown at the end.
 - (void)setSheetHiddenForFullscreenTransition:(BOOL)shoudHide;
 
 // Adjusts the UI and destroys the exit bubble when we are exiting fullscreen.
 - (void)adjustUIForExitingFullscreen;
 
 // Determines the appropriate sliding fullscreen style and adjusts the UI to
 // it when we are entering fullscreen.
 - (void)adjustUIForEnteringFullscreen;
 
 // Returns YES if the fullscreen is for tab content or an extension.
 - (BOOL)isFullscreenForTabContentOrExtension;
 
-#endif
-
 @end  // @interface BrowserWindowController(Private)
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_PRIVATE_H_