Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(411)

Unified Diff: chrome/browser/ui/cocoa/presentation_mode_controller.mm

Issue 1979663002: Fix for Fullscreen toolbar with multiple monitors on OSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/presentation_mode_controller.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « chrome/browser/ui/cocoa/presentation_mode_controller.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698