| Index: chrome/browser/ui/cocoa/browser_window_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| index 8eca95c4ebd3d8170145d4c4425d52faea069ad1..a6ebb0842b4ff787ca1e4a5c16df365d8ca001df 100644
|
| --- a/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm
|
| @@ -2036,7 +2036,6 @@ willAnimateFromState:(BookmarkBar::State)oldState
|
|
|
| @end // @implementation BrowserWindowController
|
|
|
| -
|
| @implementation BrowserWindowController(Fullscreen)
|
|
|
| - (void)handleLionToggleFullscreen {
|
| @@ -2080,7 +2079,6 @@ willAnimateFromState:(BookmarkBar::State)oldState
|
|
|
| - (BOOL)isInFullscreenWithOmniboxSliding {
|
| return presentationModeController_.get() != nil;
|
| - //[presentationModeController_ inPresentationMode]);
|
| }
|
|
|
| - (void)enterPresentationModeForURL:(const GURL&)url
|
| @@ -2124,7 +2122,8 @@ willAnimateFromState:(BookmarkBar::State)oldState
|
| - (BOOL)inPresentationMode {
|
| return presentationModeController_.get() &&
|
| [presentationModeController_ inPresentationMode] &&
|
| - fullscreenStyle_ == fullscreen_mac::OMNIBOX_TABS_HIDDEN;
|
| + presentationModeController_.get().slidingStyle ==
|
| + fullscreen_mac::OMNIBOX_TABS_HIDDEN;
|
| }
|
|
|
| - (void)resizeFullscreenWindow {
|
| @@ -2137,15 +2136,6 @@ willAnimateFromState:(BookmarkBar::State)oldState
|
| [self layoutSubviews];
|
| }
|
|
|
| -- (CGFloat)floatingBarShownFraction {
|
| - return floatingBarShownFraction_;
|
| -}
|
| -
|
| -- (void)setFloatingBarShownFraction:(CGFloat)fraction {
|
| - floatingBarShownFraction_ = fraction;
|
| - [self layoutSubviews];
|
| -}
|
| -
|
| - (BOOL)isBarVisibilityLockedForOwner:(id)owner {
|
| DCHECK(owner);
|
| DCHECK(barVisibilityLocks_);
|
|
|