Refactored FullscreenController

chrome/browser/ui/exclusive_access/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/exclusive_access/fullscreen_controller.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/metrics/histogram_macros.h"
@@ skipping 122 matching lines @@
   ExclusiveAccessContext* exclusive_access_context =
       exclusive_access_manager()->context();
 
   if (!exclusive_access_context->IsFullscreen()) {
     // Normal -> Tab Fullscreen.
     state_prior_to_tab_fullscreen_ = STATE_NORMAL;
     ToggleFullscreenModeInternal(TAB);
     return;
   }
 
+  // Browser Fullscreen -> Tab Fullscreen.
   if (exclusive_access_context->IsFullscreen()) {
-    // Browser Fullscreen with Toolbar -> Tab Fullscreen (no toolbar).
-    exclusive_access_context->UpdateFullscreenWithToolbar(false);
-    state_prior_to_tab_fullscreen_ = STATE_BROWSER_FULLSCREEN_WITH_TOOLBAR;
-  } else {
-    // Browser Fullscreen without Toolbar -> Tab Fullscreen.
-    state_prior_to_tab_fullscreen_ = STATE_BROWSER_FULLSCREEN_NO_TOOLBAR;
+    exclusive_access_context->UpdateUIForTabFullscreen(true);
+    state_prior_to_tab_fullscreen_ = STATE_BROWSER_FULLSCREEN;
   }
 
   // We need to update the fullscreen exit bubble, e.g., going from browser
   // fullscreen to tab fullscreen will need to show different content.
   tab_fullscreen_ = true;
   exclusive_access_manager()->UpdateExclusiveAccessExitBubbleContent();
 
   // This is only a change between Browser and Tab fullscreen. We generate
   // a fullscreen notification now because there is no window change.
   PostFullscreenChangeNotification(true);
@@ skipping 16 matching lines @@
 
   if (!exclusive_access_context->IsFullscreen())
     return;
 
   if (IsFullscreenCausedByTab()) {
     // Tab Fullscreen -> Normal.
     ToggleFullscreenModeInternal(TAB);
     return;
   }
 
-  // Tab Fullscreen -> Browser Fullscreen (with or without toolbar).
-  if (state_prior_to_tab_fullscreen_ == STATE_BROWSER_FULLSCREEN_WITH_TOOLBAR) {
-    // Tab Fullscreen (no toolbar) -> Browser Fullscreen with Toolbar.
-    exclusive_access_context->UpdateFullscreenWithToolbar(true);
-  }
+  // Tab Fullscreen -> Browser Fullscreen.
+  if (state_prior_to_tab_fullscreen_ == STATE_BROWSER_FULLSCREEN)
+    exclusive_access_context->UpdateUIForTabFullscreen(false);
 
 #if defined(OS_MACOSX)
   // Clear the bubble URL, which forces the Mac UI to redraw.
   exclusive_access_manager()->UpdateExclusiveAccessExitBubbleContent();
 #endif  // defined(OS_MACOSX)
 
   // If currently there is a tab in "tab fullscreen" mode and fullscreen
   // was not caused by it (i.e., previously it was in "browser fullscreen"
   // mode), we need to switch back to "browser fullscreen" mode. In this
   // case, all we have to do is notifying the tab that it has exited "tab
@@ skipping 129 matching lines @@
     int bubble_reshow_count) {
   UMA_HISTOGRAM_COUNTS_100(kBubbleReshowsHistogramName, bubble_reshow_count);
 }
 
 void FullscreenController::ToggleFullscreenModeInternal(
     FullscreenInternalOption option) {
   ExclusiveAccessContext* const exclusive_access_context =
       exclusive_access_manager()->context();
   bool enter_fullscreen = !exclusive_access_context->IsFullscreen();
 
-#if defined(OS_MACOSX)
-  // When a Mac user requests a toggle they may be toggling between
-  // FullscreenWithoutChrome and FullscreenWithToolbar.
-  // TODO(spqchan): Refactor toolbar related code since most of it should be
-  // deprecated.
-  if (exclusive_access_context->IsFullscreen() &&
-      !IsWindowFullscreenForTabOrPending() &&
-      IsExtensionFullscreenOrPending()) {
-    enter_fullscreen = enter_fullscreen ||
-        exclusive_access_context->IsFullscreen();
-  }
-#endif

[Nico, 2016/06/22 21:35:54]

why is this block no longer needed?

[spqchan, 2016/06/22 22:33:37]

This is only used if we're switching between Presentation Mode and Fullscreen.
Since Presentation Mode no longer exists, this is dead code.

-
   // 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 (chrome::IsRunningInAppMode() && exclusive_access_context->IsFullscreen())
     return;
 
 #if !defined(OS_MACOSX)
   // Do not enter fullscreen mode if disallowed by pref. This prevents the user
   // from manually entering fullscreen mode and also disables kiosk mode on
   // desktop platforms.
   if (enter_fullscreen &&
@@ skipping 105 matching lines @@
     return fullscreened_origin_;
 
   return exclusive_access_tab()->GetLastCommittedURL();
 }
 
 GURL FullscreenController::GetEmbeddingOrigin() const {
   DCHECK(exclusive_access_tab());
 
   return exclusive_access_tab()->GetLastCommittedURL();
 }