| Index: chrome/browser/ui/cocoa/presentation_mode_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/presentation_mode_controller.mm b/chrome/browser/ui/cocoa/presentation_mode_controller.mm
|
| index b81b5210bc167a7e16ddc4c4fc189e12d0781cbb..709fee8e0aa9ef61530495f1393905d89bc6ea5d 100644
|
| --- a/chrome/browser/ui/cocoa/presentation_mode_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/presentation_mode_controller.mm
|
| @@ -52,7 +52,7 @@ OSStatus MenuBarRevealHandler(EventHandlerCallRef handler,
|
| // As such, we should ignore the kMenuBarRevealEventKind event if it gives
|
| // us a fraction of 0.0 or 1.0, and rely on kEventMenuBarShown and
|
| // kEventMenuBarHidden to set these values.
|
| - if ([self isOnActiveSpace]) {
|
| + if ([self isMainWindow]) {
|
| if (GetEventKind(event) == kMenuBarRevealEventKind) {
|
| CGFloat revealFraction = 0;
|
| GetEventParameter(event, FOUR_CHAR_CODE('rvlf'), typeCGFloat, NULL,
|
| @@ -431,8 +431,8 @@ OSStatus MenuBarRevealHandler(EventHandlerCallRef handler,
|
| : 0;
|
| }
|
|
|
| -- (BOOL)isOnActiveSpace {
|
| - return [browserController_ window].onActiveSpace;
|
| +- (BOOL)isMainWindow {
|
| + return [browserController_ window].isMainWindow;
|
| }
|
|
|
| // Used to activate the floating bar in presentation mode.
|
| @@ -521,8 +521,7 @@ OSStatus MenuBarRevealHandler(EventHandlerCallRef handler,
|
| @implementation PresentationModeController (PrivateMethods)
|
|
|
| - (void)updateMenuBarAndDockVisibility {
|
| - if (![[browserController_ window] isMainWindow] ||
|
| - ![browserController_ isInImmersiveFullscreen]) {
|
| + if (![self isMainWindow] || ![browserController_ isInImmersiveFullscreen]) {
|
| [self setSystemFullscreenModeTo:base::mac::kFullScreenModeNormal];
|
| return;
|
| }
|
|
|