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 182 matching lines @@
     timer.Start(
         FROM_HERE,
         base::TimeDelta::FromMilliseconds(15),
         base::Bind(&CheckBookmarkBarAnimation,
                    [controller() bookmarkBarController],
                    runner->QuitClosure()));
     runner->Run();
   }
 
   NSInteger GetExpectedTopInfoBarTipHeight() {
-    InfoBarContainerController* info_bar_container_controller =
-        [controller() infoBarContainerController];
-    CGFloat overlapping_tip_height =
-        [info_bar_container_controller overlappingTipHeight];
+    // Bubble point in window coordinates.
     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;
+    // Toolbar's frame in window coordinates.
+    NSView* toolbar = [[controller() toolbarController] view];
+    NSRect toolbarFrame = [toolbar convertRect:toolbar.bounds toView:nil];
+
+    return icon_bottom.y - NSMinY(toolbarFrame);
   }
+
   // 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 109 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 127 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();
 }