[Mac] Fullscreen Toolbar Fixes

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>
 
 #import "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 952 matching lines @@
     [subviews addObject:[self tabContentArea]];
   if ([findBarCocoaController_ view])
     [subviews addObject:[findBarCocoaController_ view]];
 
   [self setContentViewSubviews:subviews];
 }
 
 - (void)updateSubviewZOrderFullscreen {
   base::scoped_nsobject<NSMutableArray> subviews([[NSMutableArray alloc] init]);
 
-  // The infobar should overlay the toolbar if the toolbar is fully shown.
-  FullscreenToolbarLayout layout = [fullscreenToolbarController_ computeLayout];
-  BOOL shouldInfoBarOverlayToolbar =
-      ui::IsCGFloatEqual(layout.toolbarFraction, 1.0);
-
   if ([downloadShelfController_ view])
     [subviews addObject:[downloadShelfController_ view]];
   if ([self tabContentArea])
     [subviews addObject:[self tabContentArea]];
 
-  if (!shouldInfoBarOverlayToolbar && [infoBarContainerController_ view])
-    [subviews addObject:[infoBarContainerController_ view]];
-
   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 (shouldInfoBarOverlayToolbar && [infoBarContainerController_ 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.
@@ skipping 182 matching lines @@
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->SetHasActiveSheet(false);
 }
 
 - (void)childWindowsDidChange {
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->ChildWindowsChanged();
 }
 
 @end  // @implementation BrowserWindowController(Private)