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

chrome/browser/ui/cocoa/browser_window_controller.mm

Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index c43683d2b906779444d79bb33098c22e439ce3fa..0c6387d7deedaf5ff3c36285531ac8950cd3e93b 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -2101,11 +2101,11 @@ willAnimateFromState:(BookmarkBar::State)oldState
   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.
@@ -2119,8 +2119,21 @@ willAnimateFromState:(BookmarkBar::State)oldState
   }
 }
 
-- (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];