Mac: Find bar should be drawn on top of all other toolbars.

chrome/browser/cocoa/browser_window_controller_unittest.mm

 // Copyright (c) 2009 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.
 
 #include "base/scoped_nsobject.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/browser_window_controller.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/cocoa/find_bar_bridge.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 @interface BrowserWindowController (JustForTesting)
 // Already defined in BWC.
 - (void)saveWindowPositionToPrefs:(PrefService*)prefs;
 - (void)layoutSubviews;
@@ skipping 14 matching lines @@
 }
 
 - (NSView*)toolbarView {
   return [toolbarController_ view];
 }
 
 - (NSView*)bookmarkView {
   return [bookmarkBarController_ view];
 }
 
+- (NSView*)findBarView {
+  return [findBarCocoaController_ view];
+}
+
 - (BOOL)bookmarkBarVisible {
   return [bookmarkBarController_ isVisible];
 }
 
 - (NSView*)extensionShelfView {
   return [extensionShelfController_ view];
 }
 @end
 
 class BrowserWindowControllerTest : public testing::Test {
@@ skipping 373 matching lines @@
   [window setFrame:testFrame display:NO];
   zoomFrame = [controller_ windowWillUseStandardFrame:window
                                          defaultFrame:screenFrame];
   // Use the actual width of the window frame, since it's subject to rounding.
   EXPECT_EQ([window frame].size.width, zoomFrame.size.width);
   EXPECT_EQ(screenFrame.size.height, zoomFrame.size.height);
   EXPECT_EQ(testFrame.origin.x, zoomFrame.origin.x);
   EXPECT_EQ(screenFrame.origin.y, zoomFrame.origin.y);
 }
 
+TEST_F(BrowserWindowControllerTest, TestFindBarOnTop) {

[John Grabowski, 2009/10/07 04:56:50]

jrg <3 erg

+  FindBarBridge bridge;
+  [controller_.get() addFindBar:bridge.find_bar_cocoa_controller()];
+
+  // Test that the Z-order of the find bar is on top of everything.
+  NSArray* subviews = [[[controller_.get() window] contentView] subviews];
+  NSUInteger findBar_index =
+      [subviews indexOfObject:[controller_.get() findBarView]];
+  EXPECT_NE(NSNotFound, findBar_index);
+  NSUInteger toolbar_index =
+      [subviews indexOfObject:[controller_.get() toolbarView]];
+  EXPECT_NE(NSNotFound, toolbar_index);
+  NSUInteger bookmark_index =
+      [subviews indexOfObject:[controller_.get() bookmarkView]];
+  EXPECT_NE(NSNotFound, bookmark_index);
+
+  EXPECT_GT(findBar_index, toolbar_index);
+  EXPECT_GT(findBar_index, bookmark_index);
+}
+
 
 /* TODO(???): test other methods of BrowserWindowController */