Commit 71aac2d2 authored by Sidney San Martín's avatar Sidney San Martín Committed by Commit Bot

Disable custom fullscreen transition on 10.13+, fix titlebar appearance during the transition.

Bug: 741478
Change-Id: I7b576273b0e7ec08af24291115db1c8e8f9b3da8
Reviewed-on: https://chromium-review.googlesource.com/581232Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: default avatarSarah Chan <spqchan@chromium.org>
Commit-Queue: Sidney San Martin <sdy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#488687}
parent ec87aec2
...@@ -1081,6 +1081,10 @@ willPositionSheet:(NSWindow*)sheet ...@@ -1081,6 +1081,10 @@ willPositionSheet:(NSWindow*)sheet
} }
- (BOOL)shouldUseCustomAppKitFullscreenTransition:(BOOL)enterFullScreen { - (BOOL)shouldUseCustomAppKitFullscreenTransition:(BOOL)enterFullScreen {
// Use the native transition on 10.13+: https://crbug.com/741478.
if (base::mac::IsAtLeastOS10_13())
return NO;
// Disable the custom exit animation in OSX 10.9: http://crbug.com/526327#c3. // Disable the custom exit animation in OSX 10.9: http://crbug.com/526327#c3.
if (base::mac::IsOS10_9() && !enterFullScreen) if (base::mac::IsOS10_9() && !enterFullScreen)
return NO; return NO;
......
...@@ -198,6 +198,9 @@ const CGFloat kWindowGradientHeight = 24.0; ...@@ -198,6 +198,9 @@ const CGFloat kWindowGradientHeight = 24.0;
} }
- (void)adjustTitlebarContainer:(NSView*)titlebarContainer { - (void)adjustTitlebarContainer:(NSView*)titlebarContainer {
if ([self styleMask] & NSFullScreenWindowMask)
return;
DCHECK(chrome::ShouldUseFullSizeContentView()); DCHECK(chrome::ShouldUseFullSizeContentView());
DCHECK([NSStringFromClass([titlebarContainer class]) DCHECK([NSStringFromClass([titlebarContainer class])
isEqual:@"NSTitlebarContainerView"]); isEqual:@"NSTitlebarContainerView"]);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment