| 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..58281ea47ef98c806e102692498e67021a0319d8 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| @@ -1074,7 +1074,14 @@ willPositionSheet:(NSWindow*)sheet
|
| return YES;
|
| }
|
|
|
| -- (BOOL)shouldUseCustomAppKitFullscreenTransition {
|
| +- (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)
|
| + return NO;
|
| +
|
| if (base::mac::IsOSMountainLionOrEarlier())
|
| return NO;
|
|
|
| @@ -1097,7 +1104,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 +1117,7 @@ willPositionSheet:(NSWindow*)sheet
|
| - (NSArray*)customWindowsToExitFullScreenForWindow:(NSWindow*)window {
|
| DCHECK([window isEqual:self.window]);
|
|
|
| - if (![self shouldUseCustomAppKitFullscreenTransition])
|
| + if (![self shouldUseCustomAppKitFullscreenTransition:NO])
|
| return nil;
|
|
|
| FramedBrowserWindow* framedBrowserWindow =
|
|
|