Mac: Fix accidental changes to fullscreen logic from refactor.

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 445 matching lines @@
 //  AppKitFullscreen API.
 //
 // + Presentation Mode:
 //  - OMNIBOX_TABS_HIDDEN, typically with AppKitFullscreen API, but can
 //  also be with Immersive fullscreen API.
 //  - This class sets a flag, indicating that it wants Presentation Mode
 //  instead of Canonical Fullscreen. Then it invokes the AppKitFullscreen API.
 //
 // + HTML5 fullscreen. <-- Currently uses AppKitFullscreen API. This should
 // eventually migrate to the Immersive Fullscreen API.
+//
+// There are more fullscreen styles on OSX than other OSes. However, all OSes
+// share the same cross-platform code for entering fullscreen
+// (FullscreenController). It is important for OSX fullscreen logic to track
+// how the user triggered fullscreen mode.
+// There are currently 5 possible mechanisms:
+//   - User clicks the AppKit Fullscreen button.
+//     -- This invokes -[BrowserWindowController windowWillEnterFullscreen:]
+//   - User selects the menu item corresponding to "Canonical Fullscreen".

[Robert Sesek, 2014/09/16 15:49:02]

We're not going to call it that in the menu, so this name seems wrong.

[erikchen, 2014/09/16 17:12:36]

I was intentionally using the internal names for these fullscreen styles, since
the official copy is liable to change at any time. As per your comment, I've
changed the wording of these comments to use the current names of the menu
items.

+//     -- This invokes FullscreenController::ToggleFullscreenModeInternal(
+//        BROWSER_WITH_CHROME)
+//   - User selects the menu item corresponding to "Presentation Mode".
+//     -- This invokes FullscreenController::ToggleFullscreenModeInternal(
+//        BROWSER)
+//     -- The corresponding URL will be empty.
+//   - User requests fullscreen via an extension.
+//     -- This invokes FullscreenController::ToggleFullscreenModeInternal(
+//        BROWSER)
+//     -- The corresponding URL will be the url of the extension.
+//   - User requests fullscreen via Flash or js apis.

[Robert Sesek, 2014/09/16 15:49:02]

js ->  JavaScript

[erikchen, 2014/09/16 17:12:36]

Done.

+//     -- This invokes FullscreenController::ToggleFullscreenModeInternal(
+//        BROWSER)
+//     -- browser_->fullscreen_controller()->
+//        IsWindowFullscreenForTabOrPending() returns true.
+//     -- The corresponding URL will be the url of the web page.
 
 // Methods having to do with fullscreen and presentation mode.
 @interface BrowserWindowController(Fullscreen)
 
 // Toggles fullscreen mode.  Meant to be called by Lion windows when they enter
 // or exit Lion fullscreen mode.  Must not be called on Snow Leopard or earlier.
 - (void)handleLionToggleFullscreen;
 
 // Enters Canonical Fullscreen.
 - (void)enterFullscreenWithChrome;
@@ skipping 11 matching lines @@
 - (BOOL)isInImmersiveFullscreen;
 
 // Returns YES if the browser window is currently in or entering fullscreen via
 // the AppKit Fullscreen API.
 - (BOOL)isInAppKitFullscreen;
 
 // Returns YES if the PresentationModeController exists and hence the omnibox
 // and other UI is expected to slide.
 - (BOOL)isInFullscreenWithOmniboxSliding;
 
-// Enters (or exits) presentation mode.
-- (void)enterPresentationModeForURL:(const GURL&)url
-                         bubbleType:(FullscreenExitBubbleType)bubbleType;
+// Enters presentation mode.
+- (void)enterPresentationMode;
+
+// Enter fullscreen for an extension.
+- (void)enterExtensionFullscreenForURL:(const GURL&)url
+                            bubbleType:(FullscreenExitBubbleType)bubbleType;
 
 // Enters Immersive Fullscreen for the given URL.
-- (void)enterHTML5FullscreenForURL:(const GURL&)url
-                        bubbleType:(FullscreenExitBubbleType)bubbleType;
+- (void)enterWebContentFullscreenForURL:(const GURL&)url
+                             bubbleType:(FullscreenExitBubbleType)bubbleType;
 
 // Exits the current fullscreen mode.
 - (void)exitAnyFullscreen;
 
 // Whether the system is in the very specific fullscreen mode: Presentation
 // Mode.
 - (BOOL)inPresentationMode;
 
 // Resizes the fullscreen window to fit the screen it's currently on.  Called by
 // the PresentationModeController when there is a change in monitor placement or
@@ skipping 64 matching lines @@
 // positioned relative to.
 - (NSRect)omniboxPopupAnchorRect;
 
 // Force a layout of info bars.
 - (void)layoutInfoBars;
 
 @end  // @interface BrowserWindowController (TestingAPI)
 
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_