[Mac] Fullscreen layout issues

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 35 matching lines @@
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
+#include "ui/base/cocoa/appkit_utils.h"
 #import "ui/base/cocoa/focus_tracker.h"
 #import "ui/base/cocoa/nsview_additions.h"
 #include "ui/base/ui_base_types.h"
 
 using content::RenderWidgetHostView;
 using content::WebContents;
 
 namespace {
 
 // The screen on which the window was fullscreened, and whether the device had
@@ skipping 893 matching lines @@
   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]);
+
+  // 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 ([infoBarContainerController_ view])
+
+  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])
+    [subviews addObject:[infoBarContainerController_ view]];
+
   if ([findBarCocoaController_ view])
     [subviews addObject:[findBarCocoaController_ view]];
 
   [self setContentViewSubviews:subviews];
 }
 
 - (void)setContentViewSubviews:(NSArray*)subviews {
   // Subviews already match.
   if ([[self.chromeContentView subviews] isEqual:subviews])
     return;
@@ skipping 180 matching lines @@
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->SetHasActiveSheet(false);
 }
 
 - (void)childWindowsDidChange {
   if (fullscreenLowPowerCoordinator_)
     fullscreenLowPowerCoordinator_->ChildWindowsChanged();
 }
 
 @end  // @implementation BrowserWindowController(Private)