[Mac] Refactor the fullscreen code to move logic from BWC into FullscreenCont...

chrome/browser/cocoa/fullscreen_controller.mm

 // Copyright (c) 2010 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/cocoa/fullscreen_controller.h"
 
 #include <algorithm>
 
 #import "chrome/browser/cocoa/browser_window_controller.h"
+#import "chrome/browser/cocoa/floating_bar_backing_view.h"
+#import "chrome/browser/cocoa/fullscreen_window.h"
 #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"
 
 NSString* const kWillEnterFullscreenNotification =
     @"WillEnterFullscreenNotification";
 NSString* const kWillLeaveFullscreenNotification =
     @"WillLeaveFullscreenNotification";
 
 namespace {
 // The activation zone for the main menu is 4 pixels high; if we make it any
 // smaller, then the menu can be made to appear without the bar sliding down.
@@ skipping 140 matching lines @@
 
 
 @implementation FullscreenController
 
 @synthesize isFullscreen = isFullscreen_;
 
 - (id)initWithBrowserController:(BrowserWindowController*)controller {
   if ((self == [super init])) {
     browserController_ = controller;
     currentFullscreenMode_ = mac_util::kFullScreenModeNormal;
+
+    NSScreen* screen = [[browserController_ window] screen];
+    fullscreenWindow_.reset([[FullscreenWindow alloc] initForScreen:screen]);
+
+    floatingBarBackingView_.reset(
+        [[FloatingBarBackingView alloc] initWithFrame:NSZeroRect]);
   }
 
   // Let the world know what we're up to.
   [[NSNotificationCenter defaultCenter]
     postNotificationName:kWillEnterFullscreenNotification
                   object:nil];
 
   return self;
 }
 
 - (void)dealloc {
   DCHECK(!isFullscreen_);
   DCHECK(!trackingArea_);
   [super dealloc];
 }
 
 - (void)enterFullscreenForContentView:(NSView*)contentView
                          showDropdown:(BOOL)showDropdown {
   DCHECK(!isFullscreen_);
   isFullscreen_ = YES;
   contentView_ = contentView;
   [self changeFloatingBarShownFraction:(showDropdown ? 1 : 0)];
 
   // Register for notifications.  Self is removed as an observer in |-cleanup|.
   NSNotificationCenter* nc = [NSNotificationCenter defaultCenter];
-  NSWindow* window = [browserController_ window];
   [nc addObserver:self
          selector:@selector(windowDidChangeScreen:)
              name:NSWindowDidChangeScreenNotification
-           object:window];
+           object:fullscreenWindow_];
 
   [nc addObserver:self
          selector:@selector(windowDidBecomeMain:)
              name:NSWindowDidBecomeMainNotification
-           object:window];
+           object:fullscreenWindow_];
 
   [nc addObserver:self
          selector:@selector(windowDidResignMain:)
              name:NSWindowDidResignMainNotification
-           object:window];
+           object:fullscreenWindow_];
 }
 
 - (void)exitFullscreen {
   [[NSNotificationCenter defaultCenter]
     postNotificationName:kWillLeaveFullscreenNotification
                   object:nil];
   DCHECK(isFullscreen_);
   [self cleanup];
   isFullscreen_ = NO;
 }
 
+- (FullscreenWindow*)window {
+  return fullscreenWindow_.get();
+}
+
+- (BOOL)hasFloatingBarBackingView {
+  return floatingBarBackingView_.get() != nil;
+}
+
+- (NSView*)floatingBarBackingView {
+  return floatingBarBackingView_.get();
+}
+
 - (void)windowDidChangeScreen:(NSNotification*)notification {
   [browserController_ resizeFullscreenWindow];
 }
 
 - (void)windowDidBecomeMain:(NSNotification*)notification {
   [self showActiveWindowUI];
 }
 
 - (void)windowDidResignMain:(NSNotification*)notification {
   [self hideActiveWindowUI];
@@ skipping 62 matching lines @@
   }
 }
 
 - (void)cancelAnimationAndTimers {
   [self cancelAllTimers];
   [currentAnimation_ stopAnimation];
   currentAnimation_.reset();
 }
 
 - (CGFloat)floatingBarShownFraction {
-  return [browserController_ floatingBarShownFraction];
+  return floatingBarShownFraction_;
 }
 
 - (void)changeFloatingBarShownFraction:(CGFloat)fraction {
-  [browserController_ setFloatingBarShownFraction:fraction];
+  floatingBarShownFraction_ = fraction;
 
   mac_util::FullScreenMode desiredMode = [self desiredFullscreenMode];
   if (desiredMode != currentFullscreenMode_ && [self shouldToggleMenuBar]) {
     if (currentFullscreenMode_ == mac_util::kFullScreenModeNormal)
       mac_util::RequestFullScreen(desiredMode);
     else
       mac_util::SwitchFullScreenModes(currentFullscreenMode_, desiredMode);
     currentFullscreenMode_ = desiredMode;
   }
+
+  [browserController_ floatingBarShownFractionChanged];
 }
 
 // Used to activate the floating bar in fullscreen mode.
 - (void)mouseEntered:(NSEvent*)event {
   DCHECK(isFullscreen_);
 
   // Having gotten a mouse entered, we no longer need to do exit checks.
   [self cancelMouseExitCheck];
 
   NSTrackingArea* trackingArea = [event trackingArea];
@@ skipping 52 matching lines @@
   if (![self mouseInsideTrackingRect])
     [self scheduleHideForMouse];
 }
 
 @end
 
 
 @implementation FullscreenController (PrivateMethods)
 
 - (BOOL)isWindowOnPrimaryScreen {
-  NSScreen* screen = [[browserController_ window] screen];
+  NSScreen* screen = [fullscreenWindow_ screen];
   NSScreen* primaryScreen = [[NSScreen screens] objectAtIndex:0];
   return (screen == primaryScreen);
 }
 
 - (BOOL)shouldToggleMenuBar {
-  return [self isWindowOnPrimaryScreen] &&
-         [[browserController_ window] isMainWindow];
+  return [self isWindowOnPrimaryScreen] && [fullscreenWindow_ isMainWindow];
 }
 
 - (mac_util::FullScreenMode)desiredFullscreenMode {
-  if ([browserController_ floatingBarShownFraction] >= 1.0)
+  if (floatingBarShownFraction_ >= 1.0)
     return mac_util::kFullScreenModeHideDock;
   return mac_util::kFullScreenModeHideAll;
 }
 
 - (void)changeOverlayToFraction:(CGFloat)fraction
                   withAnimation:(BOOL)animate {
   // The non-animated case is really simple, so do it and return.
   if (!animate) {
     [currentAnimation_ stopAnimation];
     [self changeFloatingBarShownFraction:fraction];
     return;
   }
 
   // If we're already animating to the given fraction, then there's nothing more
   // to do.
   if (currentAnimation_ && [currentAnimation_ endFraction] == fraction)
     return;
 
   // In all other cases, we want to cancel any running animation (which may be
   // to show or to hide).
   [currentAnimation_ stopAnimation];
 
   // Now, if it happens to already be in the right state, there's nothing more
   // to do.
-  if ([browserController_ floatingBarShownFraction] == fraction)
+  if (floatingBarShownFraction_ == fraction)
     return;
 
   // Create the animation and set it up.
   currentAnimation_.reset(
       [[DropdownAnimation alloc] initWithFraction:fraction
                                      fullDuration:kDropdownAnimationDuration
                                    animationCurve:NSAnimationEaseOut
                                        controller:self]);
   DCHECK(currentAnimation_);
   [currentAnimation_ setAnimationBlockingMode:NSAnimationNonblocking];
@@ skipping 42 matching lines @@
 
 - (void)removeTrackingAreaIfNecessary {
   if (trackingArea_) {
     DCHECK(contentView_);  // |contentView_| better be valid.
     [contentView_ removeTrackingArea:trackingArea_];
     trackingArea_.reset();
   }
 }
 
 - (BOOL)mouseInsideTrackingRect {
-  NSWindow* window = [browserController_ window];
-  NSPoint mouseLoc = [window mouseLocationOutsideOfEventStream];
+  NSPoint mouseLoc = [fullscreenWindow_ mouseLocationOutsideOfEventStream];
   NSPoint mousePos = [contentView_ convertPoint:mouseLoc fromView:nil];
   return NSMouseInRect(mousePos, trackingAreaBounds_, [contentView_ isFlipped]);
 }
 
 - (void)setupMouseExitCheck {
   [self performSelector:@selector(checkForMouseExit)
              withObject:nil
              afterDelay:kMouseExitCheckDelay];
 }
 
@@ skipping 87 matching lines @@
   // This isn't tracked when not in fullscreen mode.
   [browserController_ releaseBarVisibilityForOwner:self
                                      withAnimation:NO
                                              delay:NO];
 
   // Call the main status resignation code to perform the associated cleanup,
   // since we will no longer be receiving actual status resignation
   // notifications.
   [self hideActiveWindowUI];
 
+  // Just in case.
+  [floatingBarBackingView_ removeFromSuperview];
+
   // No more calls back up to the BWC.
   browserController_ = nil;
 }
 
 - (void)showActiveWindowUI {
   DCHECK_EQ(currentFullscreenMode_, mac_util::kFullScreenModeNormal);
   if (currentFullscreenMode_ != mac_util::kFullScreenModeNormal)
     return;
 
   if ([self shouldToggleMenuBar]) {
     mac_util::FullScreenMode desiredMode = [self desiredFullscreenMode];
     mac_util::RequestFullScreen(desiredMode);
     currentFullscreenMode_ = desiredMode;
   }
 
   // TODO(rohitrao): Insert the Exit Fullscreen button.  http://crbug.com/35956
 }
 
 - (void)hideActiveWindowUI {
   if (currentFullscreenMode_ != mac_util::kFullScreenModeNormal) {
     mac_util::ReleaseFullScreen(currentFullscreenMode_);
     currentFullscreenMode_ = mac_util::kFullScreenModeNormal;
   }
 
   // TODO(rohitrao): Remove the Exit Fullscreen button.  http://crbug.com/35956
 }
 
 @end