mac, fullscreen: Several bug fixes after major refactor.

chrome/browser/ui/cocoa/browser_window_controller.h

Index: chrome/browser/ui/cocoa/browser_window_controller.h
diff --git a/chrome/browser/ui/cocoa/browser_window_controller.h b/chrome/browser/ui/cocoa/browser_window_controller.h
index 9e7a9a67ddaee752e8a9199f4b0a3c6e21a10939..5457874ade7a2b92c9b3907ae6f7bf28334c99e3 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller.h
+++ b/chrome/browser/ui/cocoa/browser_window_controller.h
@@ -57,14 +57,6 @@ 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,
@@ -142,6 +134,11 @@ enum SlidingStyle {
   // 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.
@@ -160,9 +157,6 @@ enum SlidingStyle {
   // 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
@@ -524,11 +518,6 @@ enum SlidingStyle {
 // 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