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

Side by Side Diff: chrome/browser/ui/cocoa/browser_window_controller_private.mm

Issue 1790663003: Fix for flash fullscreen animations on OSX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 4 years, 9 months 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 unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h" 5 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 8
9 #import "base/auto_reset.h" 9 #import "base/auto_reset.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1132 1132
1133 - (BOOL)shouldUseCustomAppKitFullscreenTransition:(BOOL)enterFullScreen { 1133 - (BOOL)shouldUseCustomAppKitFullscreenTransition:(BOOL)enterFullScreen {
1134 // Custom fullscreen transitions should only be available in OSX 10.9+. 1134 // Custom fullscreen transitions should only be available in OSX 10.9+.
1135 if (base::mac::IsOSMountainLionOrEarlier()) 1135 if (base::mac::IsOSMountainLionOrEarlier())
1136 return NO; 1136 return NO;
1137 1137
1138 // Disable the custom exit animation in OSX 10.9: http://crbug.com/526327#c3. 1138 // Disable the custom exit animation in OSX 10.9: http://crbug.com/526327#c3.
1139 if (base::mac::IsOSMavericks() && !enterFullScreen) 1139 if (base::mac::IsOSMavericks() && !enterFullScreen)
1140 return NO; 1140 return NO;
1141 1141
1142 // TODO(spqchan): Fix Flash fullscreen animation in popups.
1143 // See http://crbug.com/566588.
1144 if ([self isFullscreenForTabContent] && browser_->is_type_popup())
1145 return NO;
1146
1147 NSView* root = [[self.window contentView] superview]; 1142 NSView* root = [[self.window contentView] superview];
1148 if (!root.layer) 1143 if (!root.layer)
1149 return NO; 1144 return NO;
1150 1145
1151 // AppKit on OSX 10.9 has a bug for applications linked against OSX 10.8 SDK 1146 // AppKit on OSX 10.9 has a bug for applications linked against OSX 10.8 SDK
1152 // and earlier. Under specific circumstances, it prevents the custom AppKit 1147 // and earlier. Under specific circumstances, it prevents the custom AppKit
1153 // transition from working well. See http://crbug.com/396980 for more 1148 // transition from working well. See http://crbug.com/396980 for more
1154 // details. 1149 // details.
1155 if ([[self class] systemSettingsRequireMavericksAppKitFullscreenHack] && 1150 if ([[self class] systemSettingsRequireMavericksAppKitFullscreenHack] &&
1156 ![[[self window] screen] isEqual:[[NSScreen screens] firstObject]]) { 1151 ![[[self window] screen] isEqual:[[NSScreen screens] firstObject]]) {
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1243 return nil; 1238 return nil;
1244 } 1239 }
1245 1240
1246 - (BOOL)isFullscreenForTabContent { 1241 - (BOOL)isFullscreenForTabContent {
1247 return browser_->exclusive_access_manager() 1242 return browser_->exclusive_access_manager()
1248 ->fullscreen_controller() 1243 ->fullscreen_controller()
1249 ->IsWindowFullscreenForTabOrPending(); 1244 ->IsWindowFullscreenForTabOrPending();
1250 } 1245 }
1251 1246
1252 @end // @implementation BrowserWindowController(Private) 1247 @end // @implementation BrowserWindowController(Private)
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698