Refactor BrowserWindow fullscreen and presentation on Mac to be consistent with other platforms.

chrome/browser/ui/fullscreen/fullscreen_controller.cc

 // 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/fullscreen/fullscreen_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/download/download_shelf.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 
+#if defined(OS_MACOSX)
+#include "base/mac/mac_util.h"
+#endif
+
 using content::RenderViewHost;
 using content::UserMetricsAction;
 using content::WebContents;
 
 FullscreenController::FullscreenController(Browser* browser)
     : ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       browser_(browser),
       window_(browser->window()),
       profile_(browser->profile()),
       fullscreened_tab_(NULL),
@@ skipping 39 matching lines @@
 #if defined(OS_WIN)
   // For now, avoid breaking when initiating full screen tab mode while in
   // a metro snap.
   // TODO(robertshield): Find a way to reconcile tab-initiated fullscreen
   //                     modes with metro snap.
   if (IsInMetroSnapMode())
     return;
 #endif
 
   bool in_browser_or_tab_fullscreen_mode = window_->IsFullscreen();
-#if defined(OS_MACOSX)
-  in_browser_or_tab_fullscreen_mode |= window_->InPresentationMode();
-#endif
 
   if (enter_fullscreen) {
     SetFullscreenedTab(web_contents);
     if (!in_browser_or_tab_fullscreen_mode) {
       tab_caused_fullscreen_ = true;
 #if defined(OS_MACOSX)
       TogglePresentationModeInternal(true);
 #else
       ToggleFullscreenModeInternal(true);
 #endif
@@ skipping 146 matching lines @@
     // |fullscreened_tab_| may not be valid. Instead, we call it here to clean
     // up tab fullscreen related state.
     NotifyTabOfExitIfNecessary();
   }
 }
 
 void FullscreenController::WindowFullscreenStateChanged() {
   reentrant_window_state_change_call_check_ = true;
 
   bool exiting_fullscreen = !window_->IsFullscreen();
-#if defined(OS_MACOSX)
-  exiting_fullscreen &= !window_->InPresentationMode();
-#endif
+
   PostFullscreenChangeNotification(!exiting_fullscreen);
   if (exiting_fullscreen)
     NotifyTabOfExitIfNecessary();
   if (exiting_fullscreen)
     window_->GetDownloadShelf()->Unhide();
   else
     window_->GetDownloadShelf()->Hide();
 }
 
 bool FullscreenController::HandleUserPressedEscape() {
   if (IsFullscreenForTabOrPending() ||
       IsMouseLocked() || IsMouseLockRequested()) {
     ExitTabFullscreenOrMouseLockIfNecessary();
     return true;
   }
 
   return false;
 }
 
 void FullscreenController::ExitTabOrBrowserFullscreenToPreviousState() {
-  if (IsFullscreenForTabOrPending())
+  if (IsFullscreenForTabOrPending()) {
     ExitTabFullscreenOrMouseLockIfNecessary();
-  else if (IsFullscreenForBrowser())
+  } else if (IsFullscreenForBrowser()) {
+#if defined(OS_MACOSX)
+    TogglePresentationMode();
+#else
     ToggleFullscreenMode();
+#endif
+  }
 }
 
 void FullscreenController::OnAcceptFullscreenPermission() {
   FullscreenExitBubbleType bubble_type = GetFullscreenExitBubbleType();
   bool mouse_lock = false;
   bool fullscreen = false;
   fullscreen_bubble::PermissionRequestedByType(bubble_type, &fullscreen,
                                                &mouse_lock);
   DCHECK(!(fullscreen && tab_fullscreen_accepted_));
   DCHECK(!(mouse_lock && IsMouseLocked()));
@@ skipping 202 matching lines @@
 
 // TODO(koz): Change |for_tab| to an enum.
 void FullscreenController::ToggleFullscreenModeInternal(bool for_tab) {
 #if defined(OS_WIN)
   // When in Metro snap mode, toggling in and out of fullscreen is prevented.
   if (IsInMetroSnapMode())
     return;
 #endif
 
   toggled_into_fullscreen_ = !window_->IsFullscreen();
+#if defined(OS_MACOSX)
+  // When a Mac user requests a toggle they may be transitioning from
+  // FullscreenWithoutChrome to FullscreenWithChrome.
+  if (!IsFullscreenForTabOrPending())
+    toggled_into_fullscreen_ |= window_->IsFullscreenWithoutChrome();
+#endif
 
   // In kiosk mode, we always want to be fullscreen. When the browser first
   // starts we're not yet fullscreen, so let the initial toggle go through.
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode) &&
       !toggled_into_fullscreen_)
     return;
 
   GURL url;
   if (for_tab) {
     url = chrome::GetActiveWebContents(browser_)->GetURL();
     tab_fullscreen_accepted_ = toggled_into_fullscreen_ &&
         GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
   } else {
     if (!extension_caused_fullscreen_.is_empty())
       url = extension_caused_fullscreen_;
     content::RecordAction(UserMetricsAction("ToggleFullscreen"));
   }
   if (toggled_into_fullscreen_) {
+#if defined(OS_MACOSX)
+    CHECK(!for_tab);  // EnterFullscreenWithChrome invalid for tab fullscreen.
+    CHECK(base::mac::IsOSLionOrLater());
+    window_->EnterFullscreenWithChrome();
+#else
     window_->EnterFullscreen(url, GetFullscreenExitBubbleType());
+#endif
   } else {
 #if defined(OS_MACOSX)
     // Mac windows report a state change instantly, and so we must also clear
     // tab_caused_fullscreen_ to match them else other logic using
     // tab_caused_fullscreen_ will be incorrect.
     NotifyTabOfExitIfNecessary();
-
-    if (window_->InPresentationMode() && !for_tab)
-      window_->ExitPresentationMode();
-    else
 #endif
-      window_->ExitFullscreen();
+    window_->ExitFullscreen();
     extension_caused_fullscreen_ = GURL();
   }
   UpdateFullscreenExitBubbleContent();
 
   // Once the window has become fullscreen it'll call back to
   // WindowFullscreenStateChanged(). We don't do this immediately as
   // BrowserWindow::EnterFullscreen() asks for bookmark_bar_state_, so we let
   // the BrowserWindow invoke WindowFullscreenStateChanged when appropriate.
 }
 
 #if defined(OS_MACOSX)
 void FullscreenController::TogglePresentationModeInternal(bool for_tab) {
-  toggled_into_fullscreen_ = !window_->InPresentationMode();
+  toggled_into_fullscreen_ = !window_->IsFullscreenWithoutChrome();
   GURL url;
   if (for_tab) {
     url = chrome::GetActiveWebContents(browser_)->GetURL();
     tab_fullscreen_accepted_ = toggled_into_fullscreen_ &&
         GetFullscreenSetting(url) == CONTENT_SETTING_ALLOW;
   }
-  if (!window_->InPresentationMode()) {
-    window_->EnterPresentationMode(url, GetFullscreenExitBubbleType());
+  if (!window_->IsFullscreenWithoutChrome()) {
+    window_->EnterFullscreen(url, GetFullscreenExitBubbleType());
   } else {
     window_->ExitFullscreen();
 
     // Mac windows report a state change instantly, and so we must also clear
     // tab_caused_fullscreen_ to match them else other logic using
     // tab_caused_fullscreen_ will be incorrect.
     NotifyTabOfExitIfNecessary();
   }
   UpdateFullscreenExitBubbleContent();
 
@@ skipping 46 matching lines @@
 
 ContentSetting
 FullscreenController::GetMouseLockSetting(const GURL& url) const {
   if (url.SchemeIsFile())
     return CONTENT_SETTING_ALLOW;
 
   HostContentSettingsMap* settings_map = profile_->GetHostContentSettingsMap();
   return settings_map->GetContentSetting(url, url,
       CONTENT_SETTINGS_TYPE_MOUSELOCK, std::string());
 }