mac, fullscreen: Several bug fixes after major refactor.

chrome/browser/ui/cocoa/presentation_mode_controller.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_UI_COCOA_PRESENTATION_MODE_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_PRESENTATION_MODE_CONTROLLER_H_
 
+#include <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 
 #include "base/mac/mac_util.h"
 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
 @class BrowserWindowController;
 @class DropdownAnimation;
 
+namespace fullscreen_mac {
+enum SlidingStyle {
+  OMNIBOX_TABS_PRESENT = 0,  // Tab strip and omnibox both visible.
+  OMNIBOX_PRESENT,           // Tab strip hidden.
+  OMNIBOX_TABS_HIDDEN,       // Tab strip and omnibox both hidden.
+};
+}  // namespace fullscreen_mac
+
 // TODO(erikchen): This controller is misnamed. It manages the sliding tab
 // strip and omnibox in all fullscreen modes.
 
 // Provides a controller to manage presentation mode for a single browser
 // window.  This class handles running animations, showing and hiding the
 // floating dropdown bar, and managing the tracking area associated with the
 // dropdown.  This class does not directly manage any views -- the
 // BrowserWindowController is responsible for positioning and z-ordering views.
 //
 // Tracking areas are disabled while animations are running.  If
@@ skipping 41 matching lines @@
   // Tracks the currently requested system fullscreen mode, used to show or hide
   // the menubar.  This should be |kFullScreenModeNormal| when the window is not
   // main or not fullscreen, |kFullScreenModeHideAll| while the overlay is
   // hidden, and |kFullScreenModeHideDock| while the overlay is shown.  If the
   // window is not on the primary screen, this should always be
   // |kFullScreenModeNormal|.  This value can get out of sync with the correct
   // state if we miss a notification (which can happen when a window is closed).
   // Used to track the current state and make sure we properly restore the menu
   // bar when this controller is destroyed.
   base::mac::FullScreenMode systemFullscreenMode_;
+
+  // Whether the omnibox is hidden in fullscreen.
+  fullscreen_mac::SlidingStyle slidingStyle_;
+
+  // The fraction of the AppKit Menubar that is showing. Ranges from 0 to 1.
+  // Only used in AppKit Fullscreen.
+  CGFloat menubarFraction_;
+
+  // The fraction of the omnibox/tabstrip that is showing. Ranges from 0 to 1.
+  // Used in both AppKit and Immersive Fullscreen.
+  CGFloat toolbarFraction_;
+
+  // A Carbon event handler that tracks the revealed fraction of the menu bar.
+  EventHandlerRef menuBarTrackingHandler_;
 }
 
 @property(readonly, nonatomic) BOOL inPresentationMode;
+@property(nonatomic, assign) fullscreen_mac::SlidingStyle slidingStyle;
+@property(nonatomic, assign) CGFloat toolbarFraction;
 
 // Designated initializer.
-- (id)initWithBrowserController:(BrowserWindowController*)controller;
+- (id)initWithBrowserController:(BrowserWindowController*)controller
+                          style:(fullscreen_mac::SlidingStyle)style;
 
 // Informs the controller that the browser has entered or exited presentation
 // mode. |-enterPresentationModeForContentView:showDropdown:| should be called
 // after the window is setup, just before it is shown. |-exitPresentationMode|
 // should be called before any views are moved back to the non-fullscreen
 // window.  If |-enterPresentationModeForContentView:showDropdown:| is called,
 // it must be balanced with a call to |-exitPresentationMode| before the
 // controller is released.
 - (void)enterPresentationModeForContentView:(NSView*)contentView
                                showDropdown:(BOOL)showDropdown;
@@ skipping 10 matching lines @@
 - (void)overlayFrameChanged:(NSRect)frame;
 
 // Informs the controller that the overlay should be shown/hidden, possibly with
 // animation, possibly after a delay (only applicable for the animated case).
 - (void)ensureOverlayShownWithAnimation:(BOOL)animate delay:(BOOL)delay;
 - (void)ensureOverlayHiddenWithAnimation:(BOOL)animate delay:(BOOL)delay;
 
 // Cancels any running animation and timers.
 - (void)cancelAnimationAndTimers;
 
-// Gets the current floating bar shown fraction.
-- (CGFloat)floatingBarShownFraction;
-
-// Sets a new current floating bar shown fraction.  NOTE: This function has side
-// effects, such as modifying the system fullscreen mode (menu bar shown state).
-- (void)changeFloatingBarShownFraction:(CGFloat)fraction;
+// In any fullscreen mode, the y offset to use for the content at the top of
+// the screen (tab strip, omnibox, bookmark bar, etc).
+// Ranges from 0 to -22.
+- (CGFloat)menubarOffset;
 
 @end
 
 // Notification posted when we're about to enter or leave fullscreen.
 extern NSString* const kWillEnterFullscreenNotification;
 extern NSString* const kWillLeaveFullscreenNotification;
 
 #endif  // CHROME_BROWSER_UI_COCOA_PRESENTATION_MODE_CONTROLLER_H_