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

chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm

Index: chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm
diff --git a/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm b/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm
index b55f5d3423274f5a6df096fd925ab55058b7dfc6..5138fdaead80f8b254ebe32c82098586765c507e 100644
--- a/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/fullscreen_toolbar_controller.mm
@@ -240,6 +240,13 @@ OSStatus MenuBarRevealHandler(EventHandlerCallRef handler,
          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 {
@@ -265,6 +272,12 @@ OSStatus MenuBarRevealHandler(EventHandlerCallRef handler,
   [self updateMenuBarAndDockVisibility];
 }
 
+- (void)activeSpaceDidChange:(NSNotification*)notification {
+  menubarFraction_ = kHideFraction;
+  menubarState_ = FullscreenMenubarState::HIDDEN;
+  [browserController_ layoutSubviews];
+}
+
 - (CGFloat)floatingBarVerticalOffset {
   return kFloatingBarVerticalOffset;
 }
@@ -477,6 +490,10 @@ OSStatus MenuBarRevealHandler(EventHandlerCallRef handler,
   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))
@@ -635,6 +652,7 @@ OSStatus MenuBarRevealHandler(EventHandlerCallRef handler,
 - (void)cleanup {
   [self cancelAnimationAndTimer];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
+  [[[NSWorkspace sharedWorkspace] notificationCenter] removeObserver:self];
 
   [self removeTrackingAreaIfNecessary];