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

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

Issue 1408033010: Fix for Exit Fullscreen Animation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Updated comment Created 5 years, 1 month 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 | « no previous file | chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h » ('j') | 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 0fdcfa38db91b676b04156afd53bda05c5d67a61..1e4853e164fd5df41286da4d72dd985f20fb23b4 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
@@ -1108,14 +1108,13 @@ 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:
+ // https://code.google.com/p/chromium/issues/detail?id=526327#c3.
+ if (base::mac::IsOSMavericks() && !enterFullScreen)
return NO;
NSView* root = [[self.window contentView] superview];
@@ -1156,8 +1155,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];
}
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/browser_window_fullscreen_transition.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698