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 d2c4d4b54d87173d6dfceeabd7c92732d41abbe0..6fd707a6cc53ef7d706263d5af6bac1c887d42e7 100644 |
--- a/chrome/browser/ui/cocoa/browser_window_controller.mm |
+++ b/chrome/browser/ui/cocoa/browser_window_controller.mm |
@@ -2032,7 +2032,6 @@ willAnimateFromState:(BookmarkBar::State)oldState |
@end // @implementation BrowserWindowController |
- |
@implementation BrowserWindowController(Fullscreen) |
- (void)handleLionToggleFullscreen { |
@@ -2121,7 +2120,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 { |
@@ -2134,15 +2134,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_); |