Mac: Fix accidental changes to fullscreen logic from refactor.

chrome/browser/ui/cocoa/browser_window_cocoa.mm

 // 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.
 
 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
@@ skipping 25 matching lines @@
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_base_controller.h"
 #import "chrome/browser/ui/cocoa/profiles/avatar_menu_bubble_controller.h"
 #include "chrome/browser/ui/cocoa/restart_browser.h"
 #include "chrome/browser/ui/cocoa/status_bubble_mac.h"
 #include "chrome/browser/ui/cocoa/task_manager_mac.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/web_dialog_window_controller.h"
 #import "chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h"
+#include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/translate/core/browser/language_state.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 287 matching lines @@
   [window() miniaturize:controller_];
 }
 
 void BrowserWindowCocoa::Restore() {
   if (IsMaximized())
     [window() zoom:controller_];  // Toggles zoom mode.
   else if (IsMinimized())
     [window() deminiaturize:controller_];
 }
 
-void BrowserWindowCocoa::EnterFullscreen(
-      const GURL& url, FullscreenExitBubbleType bubble_type) {
-  [controller_ enterHTML5FullscreenForURL:url bubbleType:bubble_type];
+// See browser_window_controller.h for a detailed explanation of the logic in
+// this method.
+void BrowserWindowCocoa::EnterFullscreen(const GURL& url,
+                                         FullscreenExitBubbleType bubble_type) {

[erikchen, 2014/09/15 23:55:37]

I considered moving this logic into fullscreen_controller. It would be less
fragile that way, as these inferences wouldn't have to be made, but it would
also be adding complexity to cross-platform code. Given that I expect this logic
to be changed in the near future, I've kept this logic inside of
chrome/browser/ui/cocoa

+  if (browser_->fullscreen_controller()->IsWindowFullscreenForTabOrPending()) {
+    [controller_ enterWebContentFullscreenForURL:url bubbleType:bubble_type];
+    return;
+  }
+
+  if (url.is_empty()) {
+    [controller_ enterPresentationMode];
+  } else {
+    [controller_ enterExtensionFullscreenForURL:url bubbleType:bubble_type];
+  }
 }
 
 void BrowserWindowCocoa::ExitFullscreen() {
   [controller_ exitAnyFullscreen];
 }
 
 void BrowserWindowCocoa::UpdateFullscreenExitBubbleContent(
       const GURL& url,
       FullscreenExitBubbleType bubble_type) {
   [controller_ updateFullscreenExitBubbleURL:url bubbleType:bubble_type];
@@ skipping 328 matching lines @@
   if (browser_->bookmark_bar_state() != BookmarkBar::DETACHED)
     return 0;
   return 40;
 }
 
 void BrowserWindowCocoa::ExecuteExtensionCommand(
     const extensions::Extension* extension,
     const extensions::Command& command) {
   [cocoa_controller() executeExtensionCommand:extension->id() command:command];
 }