Chromium Code Reviews| 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 = |