mac, fullscreen: Several bug fixes after major refactor.

chrome/browser/ui/cocoa/browser_window_controller.mm

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 
 #include <cmath>
 #include <numeric>
 
 #include "base/command_line.h"
@@ skipping 2018 matching lines @@
 - (void)activatePageAction:(const std::string&)extension_id {
   [toolbarController_ activatePageAction:extension_id];
 }
 
 - (void)activateBrowserAction:(const std::string&)extension_id {
   [toolbarController_ activateBrowserAction:extension_id];
 }
 
 @end  // @implementation BrowserWindowController
 
-
 @implementation BrowserWindowController(Fullscreen)
 
 - (void)handleLionToggleFullscreen {
   DCHECK(base::mac::IsOSLionOrLater());
   chrome::ExecuteCommand(browser_.get(), IDC_FULLSCREEN);
 }
 
 - (void)enterFullscreenWithChrome {
   if (![self isInAppKitFullscreen]) {
     // Invoking the AppKitFullscreen API by default uses Canonical Fullscreen.
@@ skipping 23 matching lines @@
 }
 
 - (BOOL)isInAppKitFullscreen {
   return ([[self window] styleMask] & NSFullScreenWindowMask) ==
              NSFullScreenWindowMask ||
          enteringAppKitFullscreen_;
 }
 
 - (BOOL)isInFullscreenWithOmniboxSliding {
   return presentationModeController_.get() != nil;
-  //[presentationModeController_ inPresentationMode]);
 }
 
 - (void)enterPresentationModeForURL:(const GURL&)url
                          bubbleType:(FullscreenExitBubbleType)bubbleType {
   DCHECK(chrome::mac::SupportsSystemFullscreen());
   fullscreenUrl_ = url;
   fullscreenBubbleType_ = bubbleType;
 
   if ([self isInAppKitFullscreen]) {
     // Already in AppKit Fullscreen. Adjust the UI to use Presentation Mode.
@@ skipping 23 matching lines @@
 - (void)exitGenericFullscreen {
   if ([self isInAppKitFullscreen])
     [self exitAppKitFullscreen];
   if ([self isInImmersiveFullscreen])
     [self exitImmersiveFullscreen];
 }
 
 - (BOOL)inPresentationMode {
   return presentationModeController_.get() &&
          [presentationModeController_ inPresentationMode] &&
-         fullscreenStyle_ == fullscreen_mac::OMNIBOX_TABS_HIDDEN;
+         presentationModeController_.get().slidingStyle ==
+             fullscreen_mac::OMNIBOX_TABS_HIDDEN;
 }
 
 - (void)resizeFullscreenWindow {
   DCHECK([self isInAnyFullscreenMode]);
   if (![self isInAnyFullscreenMode])
     return;
 
   NSWindow* window = [self window];
   [window setFrame:[[window screen] frame] display:YES];
   [self layoutSubviews];
 }
 
-- (CGFloat)floatingBarShownFraction {
-  return floatingBarShownFraction_;
-}
-
-- (void)setFloatingBarShownFraction:(CGFloat)fraction {
-  floatingBarShownFraction_ = fraction;
-  [self layoutSubviews];
-}
-
 - (BOOL)isBarVisibilityLockedForOwner:(id)owner {
   DCHECK(owner);
   DCHECK(barVisibilityLocks_);
   return [barVisibilityLocks_ containsObject:owner];
 }
 
 - (void)lockBarVisibilityForOwner:(id)owner
                     withAnimation:(BOOL)animate
                             delay:(BOOL)delay {
   if (![self isBarVisibilityLockedForOwner:owner]) {
@@ skipping 51 matching lines @@
 
 - (BOOL)supportsBookmarkBar {
   return [self supportsWindowFeature:Browser::FEATURE_BOOKMARKBAR];
 }
 
 - (BOOL)isTabbedWindow {
   return browser_->is_type_tabbed();
 }
 
 @end  // @implementation BrowserWindowController(WindowType)