[Mac] Move the fullscreen toolbar style to FullscreenToolbarController

chrome/browser/ui/cocoa/fullscreen_toolbar_controller.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.
 
 #import "chrome/browser/ui/cocoa/fullscreen_toolbar_controller.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #import "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
+#include "chrome/browser/profiles/profile.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_menubar_tracker.h"
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_animation_controller.h"
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_mouse_tracker.h"
 #import "chrome/browser/ui/cocoa/fullscreen/fullscreen_toolbar_visibility_lock_controller.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/pref_names.h"
 #include "ui/base/cocoa/appkit_utils.h"
 #import "ui/base/cocoa/nsview_additions.h"
-#import "ui/base/cocoa/tracking_area.h"
 
 namespace {
 
 // Visibility fractions for the menubar and toolbar.
 const CGFloat kHideFraction = 0.0;
 const CGFloat kShowFraction = 1.0;
 
 // The amount by which the toolbar is offset downwards (to avoid the menu)
-// when the toolbar style is OMNIBOX_TABS_HIDDEN. (We can't use
+// when the toolbar style is TOOLBAR_HIDDEN. (We can't use
 // |-[NSMenu menuBarHeight]| since it returns 0 when the menu bar is hidden.)
 const CGFloat kToolbarVerticalOffset = 22;
 
 }  // end namespace
 
 @interface FullscreenToolbarController (PrivateMethods)
 
 // Updates the visibility of the menu bar and the dock.
 - (void)updateMenuBarAndDockVisibility;
 
@@ skipping 12 matching lines @@
 - (void)cleanup;
 
 // Whether the menu bar should be shown in immersive fullscreen for the screen
 // that contains the window.
 - (BOOL)shouldShowMenubarInImmersiveFullscreen;
 
 @end
 
 @implementation FullscreenToolbarController
 
-@synthesize slidingStyle = slidingStyle_;
+@synthesize toolbarStyle = toolbarStyle_;
 
-- (id)initWithBrowserController:(BrowserWindowController*)controller
-                          style:(FullscreenSlidingStyle)style {
+- (id)initWithBrowserController:(BrowserWindowController*)controller {
   if ((self = [super init])) {
     browserController_ = controller;
     systemFullscreenMode_ = base::mac::kFullScreenModeNormal;
-    slidingStyle_ = style;
     animationController_.reset(new FullscreenToolbarAnimationController(self));
     visibilityLockController_.reset(
         [[FullscreenToolbarVisibilityLockController alloc]
             initWithFullscreenToolbarController:self
                             animationController:animationController_.get()]);
   }
 
   return self;
 }
 
 - (void)dealloc {
   DCHECK(!inFullscreenMode_);
+  browserController_ = nil;
   [super dealloc];
 }
 
 - (void)enterFullscreenMode {
   DCHECK(!inFullscreenMode_);
   inFullscreenMode_ = YES;
 
+  [self updateToolbarStyle];
+
   menubarTracker_.reset([[FullscreenMenubarTracker alloc]
       initWithFullscreenToolbarController:self]);
   mouseTracker_.reset([[FullscreenToolbarMouseTracker alloc]
       initWithFullscreenToolbarController:self
                       animationController:animationController_.get()]);
 
   [self updateMenuBarAndDockVisibility];
 
   // Register for notifications.  Self is removed as an observer in |-cleanup|.
   NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
   NSWindow* window = [browserController_ window];
 
   [nc addObserver:self
          selector:@selector(windowDidBecomeMain:)
              name:NSWindowDidBecomeMainNotification
            object:window];
 
   [nc addObserver:self
          selector:@selector(windowDidResignMain:)
              name:NSWindowDidResignMainNotification
            object:window];
 }
 
 - (void)exitFullscreenMode {
-  DCHECK(inFullscreenMode_);
+  if (!inFullscreenMode_)

[erikchen, 2016/11/02 00:25:36]

why the move away from DCHECK?

[spqchan, 2016/11/02 20:00:27]

Whoops, this shouldn't be here. Thanks for catching it

+    return;
+
   inFullscreenMode_ = NO;
 
   [self cleanup];
 }
 
 - (void)windowDidChangeScreen:(NSNotification*)notification {
   [browserController_ resizeFullscreenWindow];
 }
 
 - (void)windowDidMove:(NSNotification*)notification {
@@ skipping 27 matching lines @@
     return;
   if (systemFullscreenMode_ == base::mac::kFullScreenModeNormal)
     base::mac::RequestFullScreen(mode);
   else if (mode == base::mac::kFullScreenModeNormal)
     base::mac::ReleaseFullScreen(systemFullscreenMode_);
   else
     base::mac::SwitchFullScreenModes(systemFullscreenMode_, mode);
   systemFullscreenMode_ = mode;
 }
 
+- (void)updateToolbarStyle {
+  FullscreenToolbarStyle oldStyle = toolbarStyle_;
+
+  if ([browserController_ isFullscreenForTabContentOrExtension]) {
+    toolbarStyle_ = FullscreenToolbarStyle::TOOLBAR_NONE;
+  } else {
+    PrefService* prefs = [browserController_ profile]->GetPrefs();
+    toolbarStyle_ = prefs->GetBoolean(prefs::kShowFullscreenToolbar)
+                        ? FullscreenToolbarStyle::TOOLBAR_PRESENT
+                        : FullscreenToolbarStyle::TOOLBAR_HIDDEN;
+  }
+
+  if (oldStyle != toolbarStyle_)
+    [self updateToolbar];
+}
+
 - (void)updateToolbar {
   [browserController_ layoutSubviews];
   animationController_->ToolbarDidUpdate();
   [mouseTracker_ updateTrackingArea];
 
   // In AppKit fullscreen, moving the mouse to the top of the screen toggles
   // menu visibility. Replicate the same effect for immersive fullscreen.
   if ([browserController_ isInImmersiveFullscreen])
     [self updateMenuBarAndDockVisibility];
 }
@@ skipping 24 matching lines @@
   }
 
   return [self shouldShowMenubarInImmersiveFullscreen] ? -kToolbarVerticalOffset
                                                        : 0;
 }
 
 - (CGFloat)toolbarFraction {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode))
     return kHideFraction;
 
-  switch (slidingStyle_) {
-    case FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT:
+  switch (toolbarStyle_) {
+    case FullscreenToolbarStyle::TOOLBAR_PRESENT:
       return kShowFraction;
-    case FullscreenSlidingStyle::OMNIBOX_TABS_NONE:
+    case FullscreenToolbarStyle::TOOLBAR_NONE:
       return kHideFraction;
-    case FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN:
+    case FullscreenToolbarStyle::TOOLBAR_HIDDEN:
       if ([self mustShowFullscreenToolbar])
         return kShowFraction;
 
       if (animationController_->IsAnimationRunning())
         return animationController_->GetToolbarFractionFromProgress();
 
       return [menubarTracker_ menubarFraction];
   }
 }
 
 - (BOOL)mustShowFullscreenToolbar {
   if (!inFullscreenMode_)
     return NO;
 
-  if (slidingStyle_ == FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT)
+  if (toolbarStyle_ == FullscreenToolbarStyle::TOOLBAR_PRESENT)
     return YES;
 
-  if (slidingStyle_ == FullscreenSlidingStyle::OMNIBOX_TABS_NONE)
+  if (toolbarStyle_ == FullscreenToolbarStyle::TOOLBAR_NONE)
     return NO;
 
   FullscreenMenubarState menubarState = [menubarTracker_ state];
   return menubarState == FullscreenMenubarState::SHOWN ||
          [mouseTracker_ mouseInsideTrackingArea] ||
          [visibilityLockController_ isToolbarVisibilityLocked];
 }
 
 - (BOOL)isFullscreenTransitionInProgress {
   return [browserController_ isFullscreenTransitionInProgress];
@@ skipping 58 matching lines @@
   animationController_->StopAnimationAndTimer();
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 
   // Call the main status resignation code to perform the associated cleanup,
   // since we will no longer be receiving actual status resignation
   // notifications.
   [self setSystemFullscreenModeTo:base::mac::kFullScreenModeNormal];
 
   menubarTracker_.reset();
   mouseTracker_.reset();
-
-  // No more calls back up to the BWC.
-  browserController_ = nil;

[erikchen, 2016/11/02 00:25:36]

why did you get rid of this? It seems important.

[spqchan, 2016/11/02 20:00:27]

I didn't get rid of it, I moved it into dealloc. Sorry, I should've mentioned
this earlier. I updated the CL description about these changes. Let me know if
you need any clarifications!

 }
 
 - (BOOL)shouldShowMenubarInImmersiveFullscreen {
   return [self doesScreenHaveMenuBar] && [self toolbarFraction] > 0.99;
 }
 
 @end