| 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 c0c44b89e1e31e8cdf3482360be12671e4974bb5..1f31c4728a2f977e9a6b13e5994eb3ec6d4c2edd 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller_private.mm
|
| @@ -514,11 +514,11 @@ willPositionSheet:(NSWindow*)sheet
|
| return base::mac::IsOSLionOrLater() && [self isFullscreen];
|
| }
|
|
|
| -- (void)moveViewsForFullscreenForSnowLeopardOrEarlier:(BOOL)fullscreen
|
| +- (void)moveViewsForFullscreenForSnowLeopard:(BOOL)fullscreen
|
| regularWindow:(NSWindow*)regularWindow
|
| fullscreenWindow:(NSWindow*)fullscreenWindow {
|
| - // This method is only for Snow Leopard and earlier.
|
| - DCHECK(base::mac::IsOSSnowLeopardOrEarlier());
|
| + // This method is only for Snow Leopard.
|
| + DCHECK(base::mac::IsOSSnowLeopard());
|
|
|
| NSWindow* sourceWindow = fullscreen ? regularWindow : fullscreenWindow;
|
| NSWindow* destWindow = fullscreen ? fullscreenWindow : regularWindow;
|
| @@ -634,8 +634,8 @@ willPositionSheet:(NSWindow*)sheet
|
| [self layoutSubviews];
|
| }
|
|
|
| -- (void)enterFullscreenForSnowLeopardOrEarlier {
|
| - DCHECK(base::mac::IsOSSnowLeopardOrEarlier());
|
| +- (void)enterFullscreenForSnowLeopard {
|
| + DCHECK(base::mac::IsOSSnowLeopard());
|
|
|
| // Fade to black.
|
| const CGDisplayReservationInterval kFadeDurationSeconds = 0.6;
|
| @@ -654,9 +654,9 @@ willPositionSheet:(NSWindow*)sheet
|
| savedRegularWindow_ = [[self window] retain];
|
| savedRegularWindowFrame_ = [savedRegularWindow_ frame];
|
|
|
| - [self moveViewsForFullscreenForSnowLeopardOrEarlier:YES
|
| - regularWindow:[self window]
|
| - fullscreenWindow:fullscreenWindow_.get()];
|
| + [self moveViewsForFullscreenForSnowLeopard:YES
|
| + regularWindow:[self window]
|
| + fullscreenWindow:fullscreenWindow_.get()];
|
| [self adjustUIForPresentationMode:YES];
|
| [self setPresentationModeInternal:YES forceDropdown:NO];
|
| [self layoutSubviews];
|
| @@ -671,8 +671,8 @@ willPositionSheet:(NSWindow*)sheet
|
| }
|
| }
|
|
|
| -- (void)exitFullscreenForSnowLeopardOrEarlier {
|
| - DCHECK(base::mac::IsOSSnowLeopardOrEarlier());
|
| +- (void)exitFullscreenForSnowLeopard {
|
| + DCHECK(base::mac::IsOSSnowLeopard());
|
|
|
| // Fade to black.
|
| const CGDisplayReservationInterval kFadeDurationSeconds = 0.6;
|
| @@ -687,7 +687,7 @@ willPositionSheet:(NSWindow*)sheet
|
|
|
| [self windowWillExitFullScreen:nil];
|
|
|
| - [self moveViewsForFullscreenForSnowLeopardOrEarlier:NO
|
| + [self moveViewsForFullscreenForSnowLeopard:NO
|
| regularWindow:savedRegularWindow_
|
| fullscreenWindow:fullscreenWindow_.get()];
|
|
|
|
|