mac, fullscreen: Several bug fixes after major refactor.

chrome/browser/ui/cocoa/browser_window_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_BROWSER_WINDOW_CONTROLLER_H_
 #define CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_
 
 // A class acting as the Objective-C controller for the Browser
 // object. Handles interactions between Cocoa and the cross-platform
 // code. Each window has a single toolbar and, by virtue of being a
@@ skipping 39 matching lines @@
 @class TranslateBubbleController;
 
 namespace content {
 class WebContents;
 }
 
 namespace extensions {
 class Command;
 }
 
-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
-
 @interface BrowserWindowController :
   TabWindowController<NSUserInterfaceValidations,
                       BookmarkBarControllerDelegate,
                       BrowserCommandExecutor,
                       ViewResizer,
                       TabStripControllerDelegate> {
  @private
   // The ordering of these members is important as it determines the order in
   // which they are destroyed. |browser_| needs to be destroyed last as most of
   // the other objects hold weak references to it or things it owns
@@ skipping 57 matching lines @@
   base::scoped_nsobject<NSWindow> fullscreenWindow_;
 
   // The Cocoa implementation of the PermissionBubbleView.
   scoped_ptr<PermissionBubbleCocoa> permissionBubbleCocoa_;
 
   // True between |-windowWillEnterFullScreen:| and |-windowDidEnterFullScreen:|
   // to indicate that the window is in the process of transitioning into
   // AppKit fullscreen mode.
   BOOL enteringAppKitFullscreen_;
 
+  // Only adjust the tab strip once while entering fullscreen. See the
+  // implementation of -[BrowserWindowController updateSubviewZOrder:] for more
+  // details.
+  BOOL hasAdjustedTabStripWhileEnteringAppKitFullscreen_;
+
   // True between |enterImmersiveFullscreen| and |-windowDidEnterFullScreen:|
   // to indicate that the window is in the process of transitioning into
   // AppKit fullscreen mode.
   BOOL enteringImmersiveFullscreen_;
 
   // True between |-setPresentationMode:url:bubbleType:| and
   // |-windowDidEnterFullScreen:| to indicate that the window is in the process
   // of transitioning into fullscreen presentation mode.
   BOOL enteringPresentationMode_;
 
   // The size of the original (non-fullscreen) window.  This is saved just
   // before entering fullscreen mode and is only valid when |-isFullscreen|
   // returns YES.
   NSRect savedRegularWindowFrame_;
 
   // The proportion of the floating bar which is shown (in presentation mode).
   CGFloat floatingBarShownFraction_;
 
-  // Whether the omnibox is hidden in fullscreen.
-  fullscreen_mac::SlidingStyle fullscreenStyle_;
-
   // Various UI elements/events may want to ensure that the floating bar is
   // visible (in presentation mode), e.g., because of where the mouse is or
   // where keyboard focus is. Whenever an object requires bar visibility, it has
   // itself added to |barVisibilityLocks_|. When it no longer requires bar
   // visibility, it has itself removed.
   base::scoped_nsobject<NSMutableSet> barVisibilityLocks_;
 
   // Bar visibility locks and releases only result (when appropriate) in changes
   // in visible state when the following is |YES|.
   BOOL barVisibilityUpdatesEnabled_;
@@ skipping 341 matching lines @@
 
 // Whether the system is in the very specific fullscreen mode: Presentation
 // Mode.
 - (BOOL)inPresentationMode;
 
 // Resizes the fullscreen window to fit the screen it's currently on.  Called by
 // the PresentationModeController when there is a change in monitor placement or
 // resolution.
 - (void)resizeFullscreenWindow;
 
-// Gets or sets the fraction of the floating bar (presentation mode overlay)
-// that is shown.  0 is completely hidden, 1 is fully shown.
-- (CGFloat)floatingBarShownFraction;
-- (void)setFloatingBarShownFraction:(CGFloat)fraction;
-
 // Query/lock/release the requirement that the tab strip/toolbar/attached
 // bookmark bar bar cluster is visible (e.g., when one of its elements has
 // focus). This is required for the floating bar in presentation mode, but
 // should also be called when not in presentation mode; see the comments for
 // |barVisibilityLocks_| for more details. Double locks/releases by the same
 // owner are ignored. If |animate:| is YES, then an animation may be performed,
 // possibly after a small delay if |delay:| is YES. If |animate:| is NO,
 // |delay:| will be ignored. In the case of multiple calls, later calls have
 // precedence with the rule that |animate:NO| has precedence over |animate:YES|,
 // and |delay:NO| has precedence over |delay:YES|.
@@ skipping 51 matching lines @@
 // positioned relative to.
 - (NSRect)omniboxPopupAnchorRect;
 
 // Force a layout of info bars.
 - (void)layoutInfoBars;
 
 @end  // @interface BrowserWindowController (TestingAPI)
 
 
 #endif  // CHROME_BROWSER_UI_COCOA_BROWSER_WINDOW_CONTROLLER_H_