Fix a couple panel overflow related bugs.

chrome/browser/ui/panels/panel_browsertest.cc

 // Copyright (c) 2011 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/bind.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
@@ skipping 97 matching lines @@
         web_app::GenerateApplicationNameFromExtensionId(extension2->id()),
         gfx::Rect(0, 0, 300, 200));
     Panel* panel3 = CreatePanelWithBounds(
         web_app::GenerateApplicationNameFromExtensionId(extension1->id()),
         gfx::Rect(0, 0, 200, 200));
     ASSERT_EQ(3, panel_manager->num_panels());
     EXPECT_EQ(3, panel_strip->num_panels());
     EXPECT_EQ(0, panel_overflow_strip->num_panels());
 
     // Open a panel that would overflow.
-    Panel* panel4 = CreatePanelWithBounds(
+    CreatePanelParams params4(
         web_app::GenerateApplicationNameFromExtensionId(extension2->id()),
-        gfx::Rect(0, 0, 280, 200));
+        gfx::Rect(0, 0, 280, 200),
+        SHOW_AS_INACTIVE);
+    Panel* panel4 = CreatePanelWithParams(params4);
+    WaitForExpansionStateChanged(panel4, Panel::IN_OVERFLOW);
     ASSERT_EQ(4, panel_manager->num_panels());
     EXPECT_EQ(3, panel_strip->num_panels());
     EXPECT_EQ(1, panel_overflow_strip->num_panels());
-    EXPECT_EQ(Panel::IN_OVERFLOW, panel4->expansion_state());

[jennb, 2011/12/05 21:20:10]

Probably ok to leave these lines in. especially line 133 to make sure that
panel5 going to overflow did not affect panel4's state.

 
     // Open another panel that would overflow.
-    Panel* panel5 = CreatePanelWithBounds(
+    CreatePanelParams params5(
         web_app::GenerateApplicationNameFromExtensionId(extension3->id()),
-        gfx::Rect(0, 0, 300, 200));
+        gfx::Rect(0, 0, 300, 200),
+        SHOW_AS_INACTIVE);
+    Panel* panel5 = CreatePanelWithParams(params5);
+    WaitForExpansionStateChanged(panel5, Panel::IN_OVERFLOW);
     ASSERT_EQ(5, panel_manager->num_panels());
     EXPECT_EQ(3, panel_strip->num_panels());
     EXPECT_EQ(2, panel_overflow_strip->num_panels());
-    EXPECT_EQ(Panel::IN_OVERFLOW, panel4->expansion_state());
-    EXPECT_EQ(Panel::IN_OVERFLOW, panel5->expansion_state());
 
     // Close a visible panel. Expect an overflow panel to move over.
     CloseWindowAndWait(panel2->browser());
     ASSERT_EQ(4, panel_manager->num_panels());
     EXPECT_EQ(3, panel_strip->num_panels());
     EXPECT_EQ(1, panel_overflow_strip->num_panels());
     EXPECT_NE(Panel::IN_OVERFLOW, panel4->expansion_state());
     EXPECT_EQ(Panel::IN_OVERFLOW, panel5->expansion_state());
 
     // Close another visible panel. Remaining overflow panel cannot move over
@@ skipping 394 matching lines @@
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, FindBar) {
   Panel* panel = CreatePanelWithBounds("PanelTest", gfx::Rect(0, 0, 400, 400));
   Browser* browser = panel->browser();
   // FindBar needs tab contents.
   CreateTestTabContents(browser);
   browser->ShowFindBar();
   ASSERT_TRUE(browser->GetFindBarController()->find_bar()->IsFindBarVisible());
   panel->Close();
 }
 
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DISABLED_CreatePanelOnOverflow) {
+#if defined(OS_WIN)

[jennb, 2011/12/05 21:20:10]

Can you put a comment here referencing the bug # that overflow is only enabled
for Win right now? 

+#define MAYBE_CreatePanelOnOverflow CreatePanelOnOverflow
+#else
+#define MAYBE_CreatePanelOnOverflow DISABLED_CreatePanelOnOverflow
+#endif
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_CreatePanelOnOverflow) {
   TestCreatePanelOnOverflow();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DragPanels) {
   static const int max_panels = 3;
   static const int zero_delta = 0;
   static const int small_delta = 10;
   static const int big_delta = 70;
   static const int bigger_delta = 120;
   static const int biggest_delta = 200;
@@ skipping 1387 matching lines @@
   // position when tall panel brings up its titlebar.
   CloseWindowAndWait(panel1->browser());
   EXPECT_EQ(balloon_bottom_after_tall_panel_titlebar_up,
             GetBalloonBottomPosition(balloon));
 
   // Closing the remaining tall panel should move the notification balloon back
   // to its original position.
   CloseWindowAndWait(panel2->browser());
   EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon));
 }