chrome/browser/ui/cocoa/browser_window_controller_private.mm - Issue 2271653006: base::mac::IsOSSierra() -> base::mac::IsOS10_12(), etc.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 2271653006: base::mac::IsOSSierra() -> base::mac::IsOS10_12(), etc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Nits Created 4 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/browser_window_controller.mm ('k') | chrome/browser/ui/cocoa/browser_window_fullscreen_transition.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | 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 7e6e3eeb9ed99521fc3333c559544e57fdf36d60..dfbe07d60f91eb4b97418ad48cea6a36e45a9829 100644

--- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm

+++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm

@@ -680,7 +680,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")]) {

@@ -1116,7 +1116,7 @@ willPositionSheet:(NSWindow*)sheet

}

+ (BOOL)systemSettingsRequireMavericksAppKitFullscreenHack {

- if (!base::mac::IsOSMavericks())

+ if (!base::mac::IsOS10_9())

return NO;

return [NSScreen respondsToSelector:@selector(screensHaveSeparateSpaces)] &&

[NSScreen screensHaveSeparateSpaces];

@@ -1135,7 +1135,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];