Refactored FullscreenController

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 #include <utility>
 
@@ skipping 1836 matching lines @@
 @implementation BrowserWindowController(Fullscreen)
 
 - (void)handleLionToggleFullscreen {
   chrome::ExecuteCommand(browser_.get(), IDC_FULLSCREEN);
 }
 
 - (void)enterBrowserFullscreen {
   [self enterAppKitFullscreen];
 }
 
-- (void)updateFullscreenWithToolbar:(BOOL)withToolbar {
+- (void)updateUIForTabFullscreen:
+    (ExclusiveAccessContext::TabFullscreenState)state {
+  DCHECK([self isInAnyFullscreenMode]);
+  if (state == ExclusiveAccessContext::STATE_ENTER_TAB_FULLSCREEN) {
+    [self adjustUIForSlidingFullscreenStyle:fullscreen_mac::OMNIBOX_TABS_NONE];
+    return;
+  }
+
   [self adjustUIForSlidingFullscreenStyle:
-            withToolbar ? fullscreen_mac::OMNIBOX_TABS_PRESENT
-                        : fullscreen_mac::OMNIBOX_TABS_HIDDEN];
+            shouldShowFullscreenToolbar_ ? fullscreen_mac::OMNIBOX_TABS_PRESENT
+                                         : fullscreen_mac::OMNIBOX_TABS_HIDDEN];
 }
 
 - (void)updateFullscreenExitBubble {
   [self layoutSubviews];
   [self showFullscreenExitBubbleIfNecessary];
 }
 
 - (BOOL)exitExtensionFullscreenIfPossible {
   if (browser_->exclusive_access_manager()
           ->fullscreen_controller()
           ->IsExtensionFullscreenOrPending()) {
     browser_->extension_window_controller()->SetFullscreenMode(NO, GURL());
     return YES;
   }
   return NO;
 }
 
 - (void)setFullscreenToolbarVisible:(BOOL)visible {
   if (shouldShowFullscreenToolbar_ == visible)
     return;
 
   [presentationModeController_ setToolbarFraction:0.0];
   shouldShowFullscreenToolbar_ = visible;
-  if ([self isInAppKitFullscreen])
-    [self updateFullscreenWithToolbar:shouldShowFullscreenToolbar_];
+  [self adjustUIForSlidingFullscreenStyle:
+            shouldShowFullscreenToolbar_ ? fullscreen_mac::OMNIBOX_TABS_PRESENT
+                                         : fullscreen_mac::OMNIBOX_TABS_HIDDEN];

[Nico, 2016/06/27 18:14:16]

i can't quite follow the changes in this file

[spqchan, 2016/06/27 18:33:49]

The changes in this file are less of a refactor, and more of a fix.  I updated
the CL description to reflect this. The old code updateWithToolbar was
incorrectly setting the the fullscreen style to be always OMNIBOX_TABS_PRESENT
after exiting fullscreen. 

 }
 
 - (BOOL)isInAnyFullscreenMode {
   return [self isInImmersiveFullscreen] || [self isInAppKitFullscreen];
 }
 
 - (BOOL)isInImmersiveFullscreen {
   return fullscreenWindow_.get() != nil || enteringImmersiveFullscreen_;
 }
 
@@ skipping 128 matching lines @@
 
 - (NSRect)savedRegularWindowFrame {
   return savedRegularWindowFrame_;
 }
 
 - (BOOL)isFullscreenTransitionInProgress {
   return enteringAppKitFullscreen_ || exitingAppKitFullscreen_;
 }
 
 @end  // @implementation BrowserWindowController(WindowType)