[Mac] Fix for the fullscreen toolbar issue with Active Spaces

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>
 
 #import "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 222 matching lines @@
 
   [nc addObserver:self
          selector:@selector(windowDidBecomeMain:)
              name:NSWindowDidBecomeMainNotification
            object:window];
 
   [nc addObserver:self
          selector:@selector(windowDidResignMain:)
              name:NSWindowDidResignMainNotification
            object:window];
+
+  // Register for Active Space change notifications.
+  [[[NSWorkspace sharedWorkspace] notificationCenter]
+      addObserver:self
+         selector:@selector(activeSpaceDidChange:)
+             name:NSWorkspaceActiveSpaceDidChangeNotification
+           object:nil];
 }
 
 - (void)exitFullscreenMode {
   DCHECK(inFullscreenMode_);
   inFullscreenMode_ = NO;
 
   [self cleanup];
 }
 
 - (void)windowDidChangeScreen:(NSNotification*)notification {
   [browserController_ resizeFullscreenWindow];
 }
 
 - (void)windowDidMove:(NSNotification*)notification {
   [browserController_ resizeFullscreenWindow];
 }
 
 - (void)windowDidBecomeMain:(NSNotification*)notification {
   [self updateMenuBarAndDockVisibility];
 }
 
 - (void)windowDidResignMain:(NSNotification*)notification {
   [self updateMenuBarAndDockVisibility];
 }
 
+- (void)activeSpaceDidChange:(NSNotification*)notification {
+  menubarFraction_ = kHideFraction;
+  menubarState_ = FullscreenMenubarState::HIDDEN;
+  [browserController_ layoutSubviews];
+}
+
 - (CGFloat)floatingBarVerticalOffset {
   return kFloatingBarVerticalOffset;
 }
 
 - (void)lockBarVisibilityWithAnimation:(BOOL)animate {
   base::AutoReset<BOOL> autoReset(&isLockingBarVisibility_, YES);
   [self ensureOverlayShownWithAnimation:animate];
 }
 
 - (void)releaseBarVisibilityWithAnimation:(BOOL)animate {
@@ skipping 192 matching lines @@
   [self animationDidStop:animation];
   [self updateTrackingArea];
 }
 
 - (void)setMenuBarRevealProgress:(CGFloat)progress {
   // If the menubarFraction increases, check if we are in the right screen
   // so that the toolbar is not revealed on the wrong screen.
   if (![self isMouseOnScreen] && progress > menubarFraction_)
     return;
 
+  // Ignore the menubarFraction changes if the Space is inactive.
+  if (![[browserController_ window] isOnActiveSpace])
+    return;
+
   if (IsCGFloatEqual(progress, kShowFraction))
     menubarState_ = FullscreenMenubarState::SHOWN;
   else if (IsCGFloatEqual(progress, kHideFraction))
     menubarState_ = FullscreenMenubarState::HIDDEN;
   else if (progress < menubarFraction_)
     menubarState_ = FullscreenMenubarState::HIDING;
   else if (progress > menubarFraction_)
     menubarState_ = FullscreenMenubarState::SHOWING;
 
   menubarFraction_ = progress;
@@ skipping 138 matching lines @@
   DCHECK_EQ(hideTimer_, timer);  // This better be our hide timer.
   [hideTimer_ invalidate];       // Make sure it doesn't repeat.
   hideTimer_.reset();            // And get rid of it.
   base::AutoReset<BOOL> autoReset(&shouldAnimateToolbarOut_, YES);
   [self animateToolbarVisibility:NO];
 }
 
 - (void)cleanup {
   [self cancelAnimationAndTimer];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
+  [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
 
   [self removeTrackingAreaIfNecessary];
 
   // 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];
 
   // No more calls back up to the BWC.
   browserController_ = nil;
 }
 
 - (BOOL)shouldShowMenubarInImmersiveFullscreen {
   return [self doesScreenHaveMenuBar] && [self toolbarFraction] > 0.99;
 }
 
 @end