mac: Refactor browser_window_controller layout logic.

chrome/browser/ui/cocoa/browser_window_controller_browsertest.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.h"
 
 #import "base/mac/mac_util.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 114 matching lines @@
         return [[controller() downloadShelf] view];
       case VIEW_ID_TAB_CONTENT_AREA:
         return [controller() tabContentArea];
       default:
         NOTREACHED();
         return nil;
     }
   }
 
   void VerifyZOrder(const std::vector<ViewID>& view_list) const {
-    for (size_t i = 0; i < view_list.size() - 1; ++i) {
-      NSView* bottom_view = GetViewWithID(view_list[i]);
-      NSView* top_view = GetViewWithID(view_list[i + 1]);
+    std::vector<NSView*> visible_views;
+    for (size_t i = 0; i < view_list.size(); ++i) {
+      NSView* view = GetViewWithID(view_list[i]);
+      if ([view superview])
+        visible_views.push_back(view);
+    }
+
+    for (size_t i = 0; i < visible_views.size() - 1; ++i) {
+      NSView* bottom_view = visible_views[i];
+      NSView* top_view = visible_views[i + 1];
+
       EXPECT_NSEQ([bottom_view superview], [top_view superview]);
       EXPECT_TRUE([bottom_view cr_isBelowView:top_view]);
     }
 
     // Views not in |view_list| must either be nil or not parented.
     for (size_t i = 0; i < VIEW_ID_COUNT; ++i) {
       if (std::find(view_list.begin(), view_list.end(), i) == view_list.end()) {
         NSView* view = GetViewWithID(static_cast<ViewID>(i));
         EXPECT_TRUE(!view || ![view superview]);
       }
@@ skipping 59 matching lines @@
     LocationBarViewMac* location_bar_view = [controller() locationBarBridge];
     NSPoint icon_bottom = location_bar_view->GetPageInfoBubblePoint();
 
     NSPoint info_bar_top = NSMakePoint(0,
         NSHeight([info_bar_container_controller view].frame) -
         overlapping_tip_height);
     info_bar_top = [[info_bar_container_controller view]
         convertPoint:info_bar_top toView:nil];
     return icon_bottom.y - info_bar_top.y;
   }
+
   // The traffic lights should always be in front of the content view and the
   // tab strip view. Since the traffic lights change across OSX versions, this
   // test verifies that the contentView is in the back, and if the tab strip
   // view is a sibling, it is directly in front of the content view.
   void VerifyTrafficLightZOrder() const {
     NSView* contentView = [[controller() window] contentView];
     NSView* rootView = [contentView superview];
     EXPECT_EQ(contentView, [[rootView subviews] objectAtIndex:0]);
 
     NSView* tabStripView = [controller() tabStripView];
@@ skipping 65 matching lines @@
   EXPECT_LT(NSMinX(fullscreen_frame), NSMinX(avatar_frame));
   EXPECT_LT(NSMaxX(fullscreen_frame), NSMinX(avatar_frame));
 }
 
 // Verify that in non-Instant normal mode that the find bar and download shelf
 // are above the content area. Everything else should be below it.
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest, ZOrderNormal) {
   browser()->GetFindBarController();  // add find bar
 
   std::vector<ViewID> view_list;
+  view_list.push_back(VIEW_ID_DOWNLOAD_SHELF);
   view_list.push_back(VIEW_ID_BOOKMARK_BAR);
   view_list.push_back(VIEW_ID_TOOLBAR);
   view_list.push_back(VIEW_ID_INFO_BAR);
   view_list.push_back(VIEW_ID_TAB_CONTENT_AREA);
   view_list.push_back(VIEW_ID_FIND_BAR);
-  view_list.push_back(VIEW_ID_DOWNLOAD_SHELF);
+  VerifyZOrder(view_list);
+
+  [controller() showOverlay];
+  [controller() removeOverlay];
+  VerifyZOrder(view_list);
+
+  [controller() enterImmersiveFullscreen];
+  [controller() exitImmersiveFullscreen];
   VerifyZOrder(view_list);
 }
 
 // Verify that in non-Instant presentation mode that the info bar is below the
 // content are and everything else is above it.
 // DISABLED due to flaky failures on trybots. http://crbug.com/178778
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
                        DISABLED_ZOrderPresentationMode) {
   chrome::ToggleFullscreenMode(browser());
   browser()->GetFindBarController();  // add find bar
@@ skipping 18 matching lines @@
     return;
 
   chrome::ToggleFullscreenMode(browser());
 
   NSView* fullscreen_floating_bar =
       GetViewWithID(VIEW_ID_FULLSCREEN_FLOATING_BAR);
   [fullscreen_floating_bar removeFromSuperview];
   [[[controller() window] contentView] addSubview:fullscreen_floating_bar
                                        positioned:NSWindowBelow
                                        relativeTo:nil];
-  [controller() updateSubviewZOrder:[controller() inPresentationMode]];
+  [controller() updateSubviewZOrder];
 
   std::vector<ViewID> view_list;
   view_list.push_back(VIEW_ID_INFO_BAR);
   view_list.push_back(VIEW_ID_TAB_CONTENT_AREA);
   view_list.push_back(VIEW_ID_FULLSCREEN_FLOATING_BAR);
   view_list.push_back(VIEW_ID_BOOKMARK_BAR);
   view_list.push_back(VIEW_ID_TOOLBAR);
   view_list.push_back(VIEW_ID_DOWNLOAD_SHELF);
   VerifyZOrder(view_list);
 }
@@ skipping 87 matching lines @@
       gfx::Rect(10, 10, 100, 100));
 
   NSPoint originWithDevTools = [controller() statusBubbleBaseFrame].origin;
   EXPECT_FALSE(NSEqualPoints(origin, originWithDevTools));
 
   DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window);
 }
 
 // Tests that top infobar tip is streched when bookmark bar becomes SHOWN/HIDDEN
 IN_PROC_BROWSER_TEST_F(BrowserWindowControllerTest,
-                       InfoBarTipStrechedWhenBookmarkBarStatusChanged) {
+                       InfoBarTipStretchedWhenBookmarkBarStatusChanged) {
   EXPECT_FALSE([controller() isBookmarkBarVisible]);
   ShowInfoBar(browser());
   // The infobar tip is animated during the infobar is being added, wait until
   // it completes.
   WaitForTopInfoBarAnimationToFinish();
 
   EXPECT_FALSE([[controller() infoBarContainerController]
       shouldSuppressTopInfoBarTip]);
 
   NSInteger max_tip_height = infobars::InfoBar::kMaximumArrowTargetHeight +
@@ skipping 19 matching lines @@
   // Toggle overlay, then verify z order.
   [controller() showOverlay];
   [controller() removeOverlay];
   VerifyTrafficLightZOrder();
 
   // Toggle immersive fullscreen, then verify z order.
   [controller() enterImmersiveFullscreen];
   [controller() exitImmersiveFullscreen];
   VerifyTrafficLightZOrder();
 }