Mac: Fix accidental changes to fullscreen logic from refactor. (reland)

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 "base/command_line.h"
@@ skipping 2083 matching lines @@
 - (BOOL)isInAppKitFullscreen {
   return ([[self window] styleMask] & NSFullScreenWindowMask) ==
              NSFullScreenWindowMask ||
          enteringAppKitFullscreen_;
 }
 
 - (BOOL)isInFullscreenWithOmniboxSliding {
   return presentationModeController_.get() != nil;
 }
 
-- (void)enterPresentationModeForURL:(const GURL&)url
-                         bubbleType:(FullscreenExitBubbleType)bubbleType {
-  DCHECK(chrome::mac::SupportsSystemFullscreen());
-  fullscreenUrl_ = url;
-  fullscreenBubbleType_ = bubbleType;
+- (void)enterPresentationMode {
+  if (!chrome::mac::SupportsSystemFullscreen()) {
+    [self enterImmersiveFullscreen];
+    return;
+  }
 
   if ([self isInAppKitFullscreen]) {
     // Already in AppKit Fullscreen. Adjust the UI to use Presentation Mode.
     [self
         adjustUIForSlidingFullscreenStyle:fullscreen_mac::OMNIBOX_TABS_HIDDEN];
   } else {
     // Need to invoke AppKit Fullscreen API. Presentation mode will
     // automatically be enabled in |-windowWillEnterFullScreen:|.
     enteringPresentationMode_ = YES;
     [self enterAppKitFullscreen];
   }
 }
 
-- (void)enterHTML5FullscreenForURL:(const GURL&)url
-                        bubbleType:(FullscreenExitBubbleType)bubbleType {
+- (void)enterExtensionFullscreenForURL:(const GURL&)url
+                            bubbleType:(FullscreenExitBubbleType)bubbleType {
+  if (chrome::mac::SupportsSystemFullscreen()) {
+    fullscreenUrl_ = url;
+    fullscreenBubbleType_ = bubbleType;
+    [self enterPresentationMode];
+  } else {
+    [self enterImmersiveFullscreen];
+    DCHECK(!url.is_empty());
+    [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType];
+  }
+}
+
+- (void)enterWebContentFullscreenForURL:(const GURL&)url
+                             bubbleType:(FullscreenExitBubbleType)bubbleType {
   [self enterImmersiveFullscreen];
   if (!url.is_empty())
     [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType];
 }
 
 - (void)exitAnyFullscreen {
   // TODO(erikchen): Fullscreen modes should stack. Should be able to exit
   // Immersive Fullscreen and still be in AppKit Fullscreen.
   if ([self isInAppKitFullscreen])
     [self exitAppKitFullscreen];
@@ skipping 82 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)