| 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 6bbb6d210f397861d7d4aa664cb132e646486e32..36f13de383fb707a7e371ba3babf860741bda3a2 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| @@ -681,7 +681,7 @@ willPositionSheet:(NSWindow*)sheet
|
| // full-screen mode. We do not want either to show. Search for the window that
|
| // contains the views, and hide it. There is no need to ever unhide the view.
|
| // http://crbug.com/380235
|
| - if (base::mac::IsOSYosemiteOrLater()) {
|
| + if (base::mac::IsAtLeastOS10_10()) {
|
| for (NSWindow* window in [[NSApplication sharedApplication] windows]) {
|
| if ([window
|
| isKindOfClass:NSClassFromString(@"NSToolbarFullScreenWindow")]) {
|
| @@ -1114,7 +1114,7 @@ willPositionSheet:(NSWindow*)sheet
|
| }
|
|
|
| + (BOOL)systemSettingsRequireMavericksAppKitFullscreenHack {
|
| - if (!base::mac::IsOSMavericks())
|
| + if (!base::mac::IsOS10_9())
|
| return NO;
|
| return [NSScreen respondsToSelector:@selector(screensHaveSeparateSpaces)] &&
|
| [NSScreen screensHaveSeparateSpaces];
|
| @@ -1133,7 +1133,7 @@ willPositionSheet:(NSWindow*)sheet
|
|
|
| - (BOOL)shouldUseCustomAppKitFullscreenTransition:(BOOL)enterFullScreen {
|
| // Disable the custom exit animation in OSX 10.9: http://crbug.com/526327#c3.
|
| - if (base::mac::IsOSMavericks() && !enterFullScreen)
|
| + if (base::mac::IsOS10_9() && !enterFullScreen)
|
| return NO;
|
|
|
| NSView* root = [[self.window contentView] superview];
|
|
|