Revert to Immersive Fullscreen on OSX for a special case

If the user is using multiple monitors and turned off "Separate Space
in Each Display", use Immersive Fullscreen so that the other monitors
won't blank out.

BUG=582944,580843

Review URL: https://codereview.chromium.org/1725643002
TBR=avi@chromium.org
Cr-Commit-Position: refs/heads/master@{#377116}
(cherry picked from commit d310f829e7f38f725a5b695ea701a3ffa3b3cf89)

Review URL: https://codereview.chromium.org/1743663002 .

Cr-Commit-Position: refs/branch-heads/2623@{#522}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}

1 files changed, 10 insertions, 2 deletions

diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 9c2e44c..f0b4e5b 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -100,6 +100,7 @@
 #include "ui/base/l10n/l10n_util_mac.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #include "ui/gfx/mac/scoped_cocoa_disable_screen_updates.h"
+#include "ui/gfx/screen.h"
 
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
@@ -2026,11 +2027,18 @@ willAnimateFromState:(BookmarkBar::State)oldState
 - (void)enterWebContentFullscreenForURL:(const GURL&)url
                              bubbleType:(ExclusiveAccessBubbleType)bubbleType {
   // HTML5 Fullscreen should only use AppKit fullscreen in 10.10+.
+  // However, if the user is using multiple monitors and turned off
+  // "Separate Space in Each Display", use Immersive Fullscreen so
+  // that the other monitors won't blank out.
+  gfx::Screen* screen = gfx::Screen::GetScreenFor([[self window] contentView]);
+  BOOL hasMultipleMonitors = screen && screen->GetNumDisplays() > 1;
   if (chrome::mac::SupportsSystemFullscreen() &&
-      base::mac::IsOSYosemiteOrLater())
+      base::mac::IsOSYosemiteOrLater() &&
+      !(hasMultipleMonitors && ![NSScreen screensHaveSeparateSpaces])) {
     [self enterAppKitFullscreen];
-  else
+  } else {
     [self enterImmersiveFullscreen];
+  }
 
   if (!url.is_empty())
     [self updateFullscreenExitBubbleURL:url bubbleType:bubbleType];