Refactored FullscreenController

chrome/browser/ui/cocoa/browser_window_controller.mm

Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 4ab8af89a5846f6f22131b898c78520a55fe9f89..2eab847dc567385b0d03799ba4baf4f1a6422371 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -1854,10 +1854,17 @@ willAnimateFromState:(BookmarkBar::State)oldState
   [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 {
@@ -1881,8 +1888,9 @@ willAnimateFromState:(BookmarkBar::State)oldState
 
   [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 {