[Mac] Move the fullscreen toolbar style to FullscreenToolbarController

chrome/browser/ui/cocoa/browser_window_controller.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_H_
 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 
 // A class acting as the Objective-C controller for the Browser
 // object. Handles interactions between Cocoa and the cross-platform
 // code. Each window has a single toolbar and, by virtue of being a
@@ skipping 144 matching lines @@
   // When the window is in the process of entering AppKit Fullscreen, this
   // property indicates whether the window is being fullscreened on the
   // primary screen.
   BOOL enteringAppKitFullscreenOnPrimaryScreen_;
 
   // This flag is set to true when |customWindowsToEnterFullScreenForWindow:|
   // and |customWindowsToExitFullScreenForWindow:| are called and did not
   // return nil.
   BOOL isUsingCustomAnimation_;
 
-  // True if the toolbar needs to be shown in fullscreen.
-  BOOL shouldShowFullscreenToolbar_;
-
   // True if a call to exit AppKit fullscreen was made during the transition to
   // fullscreen.
   BOOL shouldExitAfterEnteringFullscreen_;
 
   // True if AppKit has finished exiting fullscreen before the exit animation
   // is completed. This flag is used to ensure that |windowDidExitFullscreen|
   // is called after the exit fullscreen animation is complete.
   BOOL appKitDidExitFullscreen_;
 
   // The size of the original (non-fullscreen) window.  This is saved just
@@ skipping 262 matching lines @@
 // window to take up the entire size of the screen.
 //
 // + Immersive fullscreen: An alternative to AppKitFullscreen API. Uses on 10.9
 //  on certain HTML/Flash content. This is a method defined by Chrome.
 //
 // The Immersive fullscreen API can be called after the AppKitFullscreen API.
 // Calling the AppKitFullscreen API while immersive fullscreen API has been
 // invoked causes all fullscreen modes to exit.
 //
 // ----------------------------------------------------------------------------
-// There are 3 "styles" of omnibox sliding.
-// + OMNIBOX_TABS_PRESENT: Both the omnibox and the tabstrip are present.
-// Moving the cursor to the top causes the menubar to appear, and everything
-// else to slide down.
-// + OMNIBOX_TABS_HIDDEN: Both tabstrip and omnibox are hidden. Moving cursor
-// to top shows tabstrip, omnibox, and menu bar.
-// + OMNIBOX_TABS_NONE: Both tabstrip and omnibox are hidden. Moving cursor
-// to top causes the menubar to appear, but not the tabstrip and omnibox.
 //
-// The omnibox sliding styles are used in conjunction with the fullscreen APIs.
-// There is exactly 1 sliding style active at a time. The sliding is mangaged
-// by the fullscreenToolbarController_.
-//
-// ----------------------------------------------------------------------------
 // There are several "fullscreen modes" bantered around. Technically, any
 // fullscreen API can be combined with any sliding style.
 //
 // + System fullscreen***deprecated***: This term is confusing. Don't use it.
 // It either refers to the AppKitFullscreen API, or the behavior that users
 // expect to see when they click the fullscreen button, or some Chrome specific
 // implementation that uses the AppKitFullscreen API.
 //
 // + Canonical Fullscreen: When a user clicks on the fullscreen button, they
 // expect a fullscreen behavior similar to other AppKit apps.
-//  - AppKitFullscreen API + OMNIBOX_TABS_PRESENT/OMNIBOX_TABS_HIDDEN.
+//  - AppKitFullscreen API + TOOLBAR_PRESENT/TOOLBAR_HIDDEN.
 //  - The button click directly invokes the AppKitFullscreen API. This class
 //  get a callback, and calls adjustUIForOmniboxFullscreen.
 //  - There is a menu item that is intended to invoke the same behavior. When
 //  the user clicks the menu item, or use its hotkey, this class invokes the
 //  AppKitFullscreen API.
 //
 // + HTML5 fullscreen. Uses AppKitFullscreen in 10.10+, otherwise Immersive.
 //
 // There are more fullscreen styles on OSX than other OSes. However, all OSes
 // share the same cross-platform code for entering fullscreen
@@ skipping 28 matching lines @@
     (ExclusiveAccessContext::TabFullscreenState)state;
 
 // Exits extension fullscreen if we're currently in the mode. Returns YES
 // if we exited fullscreen.
 - (BOOL)exitExtensionFullscreenIfPossible;
 
 // Updates the contents of the fullscreen exit bubble with |url| and
 // |bubbleType|.
 - (void)updateFullscreenExitBubble;
 
-// Set the toolbar's visibility in fullscreen mode.
-- (void)setFullscreenToolbarVisible:(BOOL)visible;
-
 // Returns YES if the browser window is in or entering any fullscreen mode.
 - (BOOL)isInAnyFullscreenMode;
 
 // Returns YES if the browser window is currently in or entering fullscreen via
 // the built-in immersive mechanism.
 - (BOOL)isInImmersiveFullscreen;
 
 // Returns YES if the browser window is currently in or entering fullscreen via
 // the AppKit Fullscreen API.
 - (BOOL)isInAppKitFullscreen;
@@ skipping 23 matching lines @@
 // the rule that |animate:NO| has precedence over |animate:YES|. If |owner| is
 // nil in isToolbarVisibilityLockedForOwner, the method returns YES if there are
 // any locks.
 - (BOOL)isToolbarVisibilityLockedForOwner:(id)owner;
 - (void)lockToolbarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate;
 - (void)releaseToolbarVisibilityForOwner:(id)owner withAnimation:(BOOL)animate;
 
 // Returns YES if any of the views in the floating bar currently has focus.
 - (BOOL)floatingBarHasFocus;
 
+// Returns YES if the fullscreen is for tab content or an extension.
+- (BOOL)isFullscreenForTabContentOrExtension;
+
 // Accessor for the controller managing fullscreen ExclusiveAccessContext.
 - (ExclusiveAccessController*)exclusiveAccessController;
 
 @end  // @interface BrowserWindowController(Fullscreen)
 
 
 // Methods which are either only for testing, or only public for testing.
 @interface BrowserWindowController (TestingAPI)
 
 // Put the incognito badge or multi-profile avatar on the browser and adjust the
@@ skipping 39 matching lines @@
 // Returns the fullscreen toolbar controller.
 - (FullscreenToolbarController*)fullscreenToolbarController;
 
 // Sets the fullscreen toolbar controller.
 - (void)setFullscreenToolbarController:(FullscreenToolbarController*)controller;
 
 @end  // @interface BrowserWindowController (TestingAPI)
 
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_