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 0fdcfa38db91b676b04156afd53bda05c5d67a61..27611485617a72902d4500ffdcbac5556635502e 100644 |
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm |
| @@ -1108,14 +1108,12 @@ willPositionSheet:(NSWindow*)sheet |
| } |
| - (BOOL)shouldUseCustomAppKitFullscreenTransition:(BOOL)enterFullScreen { |
| - // We are temporary disabling exit fullscreen animation because it only |
| - // works on OSX 10.10. |
| - // TODO(spqchan): Fix exit fullscreen animation so that it works on all |
| - // OSX versions. |
| - if (!enterFullScreen) |
| + // Custom fullscreen transitions should only be available in OSX 10.10+. |
| + if (base::mac::IsOSMountainLionOrEarlier()) |
| return NO; |
| - if (base::mac::IsOSMountainLionOrEarlier()) |
| + // Disable the custom exit animation in OSX 10.9. |
| + if (base::mac::IsOSMavericks() && !enterFullScreen) |
|
erikchen
2015/11/09 18:29:21
Why? Add a link to a crbug post or add more detail
spqchan
2015/11/09 22:27:19
Done.
erikchen
2015/11/10 02:15:43
Use the link:
https://code.google.com/p/chromium/
spqchan
2015/11/10 18:45:31
Done.
|
| return NO; |
| NSView* root = [[self.window contentView] superview]; |
| @@ -1156,8 +1154,9 @@ willPositionSheet:(NSWindow*)sheet |
| FramedBrowserWindow* framedBrowserWindow = |
| base::mac::ObjCCast<FramedBrowserWindow>([self window]); |
| fullscreenTransition_.reset([[BrowserWindowFullscreenTransition alloc] |
| - initExitWithWindow:framedBrowserWindow |
| - frame:savedRegularWindowFrame_]); |
| + initExitWithWindow:framedBrowserWindow |
| + frame:savedRegularWindowFrame_ |
| + tabStripBackgroundView:[self tabStripBackgroundView]]); |
| return [fullscreenTransition_ customWindowsForFullScreenTransition]; |
| } |