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

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

Issue 10836086: [Mac] Make entering system fullscreen from presentation mode possible. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
Index: chrome/browser/ui/cocoa/browser_window_controller.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
index 72d372b28295bbb1939d0821885ff9a3450f3e0a..5b8164e21e8e9c66132dc3739be0334403bec4d3 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
@@ -2057,11 +2057,9 @@ willAnimateFromState:(bookmarks::VisualState)oldState
[static_cast<FramedBrowserWindow*>(window) toggleSystemFullScreen];
}
} else {
- // The user is currently in presentation mode and is now exiting it, which
- // also exits fullscreen using the Lion machinery.
- NSWindow* window = [self window];
- if ([window isKindOfClass:[FramedBrowserWindow class]])
- [static_cast<FramedBrowserWindow*>(window) toggleSystemFullScreen];
+ // Exiting presentation mode does not exit system fullscreen; it merely
+ // switches from presentation mode to normal fullscreen.
+ [self setPresentationModeInternal:NO forceDropdown:NO];
}
}
@@ -2072,7 +2070,7 @@ willAnimateFromState:(bookmarks::VisualState)oldState
- (void)exitPresentationMode {
// url: and bubbleType: are ignored when leaving presentation mode.
- [self setPresentationMode:NO url:GURL() bubbleType:FEB_TYPE_NONE];
+ [self setPresentationMode:NO url:GURL() bubbleType:FEB_TYPE_NONE];
}
- (BOOL)inPresentationMode {

Powered by Google App Engine
This is Rietveld 408576698