Mac: Minor fullscreen adjustments.

chrome/browser/ui/cocoa/browser_window_controller_private.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/browser_window_controller_private.h"
 
 #include <cmath>
 
 #include "base/command_line.h"
 #include "base/mac/mac_util.h"
@@ skipping 813 matching lines @@
   if (FramedBrowserWindow* framedBrowserWindow =
           base::mac::ObjCCast<FramedBrowserWindow>([self window])) {
     [framedBrowserWindow toggleSystemFullScreen];
   }
 }
 
 - (void)updateLayoutParameters:(BrowserWindowLayout*)layout {
   [layout setContentViewSize:[[[self window] contentView] bounds].size];
   [layout setWindowSize:[[self window] frame].size];
 
-  [layout setInAnyFullscreen:[self isInFullscreenWithOmniboxSliding]];
+  [layout setInAnyFullscreen:[self isInAnyFullscreenMode]];
   [layout setFullscreenSlidingStyle:
       presentationModeController_.get().slidingStyle];
   [layout setFullscreenMenubarOffset:
       [presentationModeController_ menubarOffset]];
   [layout setFullscreenToolbarFraction:
       [presentationModeController_ toolbarFraction]];
 
   [layout setHasTabStrip:[self hasTabStrip]];
 
   [layout setHasToolbar:[self hasToolbar]];
@@ skipping 59 matching lines @@
   [findBarCocoaController_
       positionFindBarViewAtMaxY:output.findBarMaxY
                        maxWidth:NSWidth(output.contentAreaFrame)];
 
   [fullscreenExitBubbleController_
       positionInWindowAtTop:output.fullscreenExitButtonMaxY
                       width:NSWidth(output.contentAreaFrame)];
 }
 
 - (void)updateSubviewZOrder {
-  if ([self isInFullscreenWithOmniboxSliding])
+  if ([self isInAnyFullscreenMode])
     [self updateSubviewZOrderFullscreen];
   else
     [self updateSubviewZOrderNormal];
 
   [self updateSubviewZOrderHack];
 }
 
 - (void)updateSubviewZOrderNormal {
   base::scoped_nsobject<NSMutableArray> subviews([[NSMutableArray alloc] init]);
   if ([downloadShelfController_ view])
     [subviews addObject:[downloadShelfController_ view]];
   if ([bookmarkBarController_ view])
     [subviews addObject:[bookmarkBarController_ view]];
   if ([toolbarController_ view])
     [subviews addObject:[toolbarController_ view]];
   if ([infoBarContainerController_ view])
     [subviews addObject:[infoBarContainerController_ view]];
   if ([self tabContentArea])
     [subviews addObject:[self tabContentArea]];
   if ([findBarCocoaController_ view])
     [subviews addObject:[findBarCocoaController_ view]];
 
   [self setContentViewSubviews:subviews];
 }
 
 - (void)updateSubviewZOrderFullscreen {
   base::scoped_nsobject<NSMutableArray> subviews([[NSMutableArray alloc] init]);
   if ([downloadShelfController_ view])
     [subviews addObject:[downloadShelfController_ view]];
-  if ([infoBarContainerController_ view])
-    [subviews addObject:[infoBarContainerController_ view]];
   if ([self tabContentArea])
     [subviews addObject:[self tabContentArea]];
   if ([self placeBookmarkBarBelowInfoBar]) {
     if ([bookmarkBarController_ view])
       [subviews addObject:[bookmarkBarController_ view]];
     if (floatingBarBackingView_)
       [subviews addObject:floatingBarBackingView_];
   } else {
     if (floatingBarBackingView_)
       [subviews addObject:floatingBarBackingView_];
     if ([bookmarkBarController_ view])
       [subviews addObject:[bookmarkBarController_ view]];
   }
-
   if ([toolbarController_ view])
     [subviews addObject:[toolbarController_ view]];
+  if ([infoBarContainerController_ view])
+    [subviews addObject:[infoBarContainerController_ view]];
   if ([findBarCocoaController_ view])
     [subviews addObject:[findBarCocoaController_ view]];
 
   [self setContentViewSubviews:subviews];
 }
 
 - (void)setContentViewSubviews:(NSArray*)subviews {
   // Subviews already match.
   if ([[self.window.contentView subviews] isEqual:subviews])
     return;
@@ skipping 53 matching lines @@
 
       [CATransaction commit];
       hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = YES;
     }
   } else {
     hasAdjustedTabStripWhileEnteringAppKitFullscreen_ = NO;
   }
 }
 
 @end  // @implementation BrowserWindowController(Private)