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

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

Issue 1335333002: Disable exit fullscreen animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 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/browser_window_controller_private.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/browser_window_controller_private.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
index 6cf444570a8bfad5b63510e52eae920ff225c325..b7f23688415402edbbdb062ffab770b341539279 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -1074,7 +1074,12 @@ willPositionSheet:(NSWindow*)sheet
return YES;
}
-- (BOOL)shouldUseCustomAppKitFullscreenTransition {
+- (BOOL)shouldUseCustomAppKitFullscreenTransition:(BOOL)enterFullScreen {
+ // TODO(spqchan): Fix exit fullscreen transition so that it works on other
+ // OSX versions.
+ if (!enterFullScreen && !base::mac::IsOSYosemite())
erikchen 2015/09/11 22:30:22 This disables the fullscreen animation as well, is
spqchan1 2015/09/11 22:34:50 Yes, that was intentional. Sure, that would make s
erikchen 2015/09/12 01:07:33 Can you update your comment then, since it implies
+ return NO;
+
if (base::mac::IsOSMountainLionOrEarlier())
return NO;
@@ -1097,7 +1102,7 @@ willPositionSheet:(NSWindow*)sheet
- (NSArray*)customWindowsToEnterFullScreenForWindow:(NSWindow*)window {
DCHECK([window isEqual:self.window]);
- if (![self shouldUseCustomAppKitFullscreenTransition])
+ if (![self shouldUseCustomAppKitFullscreenTransition:YES])
return nil;
FramedBrowserWindow* framedBrowserWindow =
@@ -1110,7 +1115,7 @@ willPositionSheet:(NSWindow*)sheet
- (NSArray*)customWindowsToExitFullScreenForWindow:(NSWindow*)window {
DCHECK([window isEqual:self.window]);
- if (![self shouldUseCustomAppKitFullscreenTransition])
+ if (![self shouldUseCustomAppKitFullscreenTransition:NO])
return nil;
FramedBrowserWindow* framedBrowserWindow =
« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller_private.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698