diff options
| author | spqchan <spqchan@chromium.org> | 2016-03-14 13:57:15 -0700 |
|---|---|---|
| committer | spqchan <spqchan@chromium.org> | 2016-03-14 20:58:58 +0000 |
| commit | 42f5187a651650c2cb6a18d9ddeca559003ed310 (patch) | |
| tree | 4f58cb303cf011816dcf752e9c065f9127fea251 | |
| parent | eff51d7f79425e6c3a4bc7b80f3c73da92b4494c (diff) | |
| download | chromium_src-42f5187a651650c2cb6a18d9ddeca559003ed310.zip chromium_src-42f5187a651650c2cb6a18d9ddeca559003ed310.tar.gz chromium_src-42f5187a651650c2cb6a18d9ddeca559003ed310.tar.bz2 | |
Disable the animation for tab fullscreen in popups.
BUG=566588
Review URL: https://codereview.chromium.org/1779323002
Cr-Commit-Position: refs/heads/master@{#380524}
(cherry picked from commit e555844403d02ae83b70d4c6be174bd1ee09716b)
Review URL: https://codereview.chromium.org/1800783002 .
Cr-Commit-Position: refs/branch-heads/2623@{#620}
Cr-Branched-From: 92d77538a86529ca35f9220bd3cd512cbea1f086-refs/heads/master@{#369907}
| -rw-r--r-- | chrome/browser/ui/cocoa/browser_window_controller_private.mm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_private.mm b/chrome/browser/ui/cocoa/browser_window_controller_private.mm index b14650f..6e2479e 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm @@ -1143,15 +1143,19 @@ willPositionSheet:(NSWindow*)sheet } - (BOOL)shouldUseCustomAppKitFullscreenTransition:(BOOL)enterFullScreen { - // Custom fullscreen transitions should only be available in OSX 10.10+. + // Custom fullscreen transitions should only be available in OSX 10.9+. if (base::mac::IsOSMountainLionOrEarlier()) return NO; - // Disable the custom exit animation in OSX 10.9: - // https://code.google.com/p/chromium/issues/detail?id=526327#c3. + // Disable the custom exit animation in OSX 10.9: http://crbug.com/526327#c3. if (base::mac::IsOSMavericks() && !enterFullScreen) return NO; + // TODO(spqchan): Fix Flash fullscreen animation in popups. + // See http://crbug.com/566588. + if ([self isFullscreenForTabContent] && browser_->is_type_popup()) + return NO; + NSView* root = [[self.window contentView] superview]; if (!root.layer) return NO; |