| Index: chrome/browser/ui/cocoa/browser_window_layout.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_layout.mm b/chrome/browser/ui/cocoa/browser_window_layout.mm
|
| index bcb64898702ffa3d854b7e5ca3effb1eada7f25c..8fccb7c60b250fe606c3793f837bb5a3bb883932 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_layout.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_layout.mm
|
| @@ -88,7 +88,7 @@ const CGFloat kLocationBarRightOffset = 35;
|
| parameters_.inAnyFullscreen = inAnyFullscreen;
|
| }
|
|
|
| -- (void)setFullscreenSlidingStyle:(fullscreen_mac::SlidingStyle)slidingStyle {
|
| +- (void)setSlidingStyle:(FullscreenSlidingStyle)slidingStyle {
|
| parameters_.slidingStyle = slidingStyle;
|
| }
|
|
|
| @@ -296,8 +296,9 @@ const CGFloat kLocationBarRightOffset = 35;
|
| output_.fullscreenExitButtonMaxY = maxY;
|
|
|
| if (parameters_.inAnyFullscreen &&
|
| - (parameters_.slidingStyle == fullscreen_mac::OMNIBOX_TABS_HIDDEN ||
|
| - parameters_.slidingStyle == fullscreen_mac::OMNIBOX_TABS_NONE)) {
|
| + (parameters_.slidingStyle ==
|
| + FullscreenSlidingStyle::OMNIBOX_TABS_HIDDEN ||
|
| + parameters_.slidingStyle == FullscreenSlidingStyle::OMNIBOX_TABS_NONE)) {
|
| // If in presentation mode, reset |maxY| to top of screen, so that the
|
| // floating bar slides over the things which appear to be in the content
|
| // area.
|
| @@ -347,7 +348,8 @@ const CGFloat kLocationBarRightOffset = 35;
|
| }
|
|
|
| if (parameters_.inAnyFullscreen &&
|
| - parameters_.slidingStyle == fullscreen_mac::OMNIBOX_TABS_PRESENT) {
|
| + parameters_.slidingStyle ==
|
| + FullscreenSlidingStyle::OMNIBOX_TABS_PRESENT) {
|
| // If in Canonical Fullscreen, content should be shifted down by an amount
|
| // equal to all the widgets and views at the top of the window. It should
|
| // not be further shifted by the appearance/disappearance of the AppKit
|
|
|