Change panel overflow to not close any open panels.

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 "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 62 matching lines @@
         web_app::GenerateApplicationNameFromExtensionId(extension1->id()),
         gfx::Rect(0, 0, 250, 200));
     Panel* panel2 = CreatePanelWithBounds(
         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());
 
-    // Test closing the leftmost panel that is from same extension.
-    ui_test_utils::WindowedNotificationObserver signal(
-        chrome::NOTIFICATION_BROWSER_CLOSED,
-        content::Source<Browser>(panel2->browser()));
+    // Open a panel that would overflow.
     Panel* panel4 = CreatePanelWithBounds(
         web_app::GenerateApplicationNameFromExtensionId(extension2->id()),
         gfx::Rect(0, 0, 280, 200));
-    signal.Wait();
-    ASSERT_EQ(3, panel_manager->num_panels());
+    ASSERT_EQ(4, panel_manager->num_panels());
     EXPECT_LT(panel4->GetBounds().right(), panel3->GetBounds().x());
-    EXPECT_LT(panel3->GetBounds().right(), panel1->GetBounds().x());
+    EXPECT_GT(0, panel4->GetBounds().x());
 
-    // Test closing the leftmost panel.
-    ui_test_utils::WindowedNotificationObserver signal2(
-        chrome::NOTIFICATION_BROWSER_CLOSED,
-        content::Source<Browser>(panel4->browser()));
+    // Open another panel that would overflow.
     Panel* panel5 = CreatePanelWithBounds(
         web_app::GenerateApplicationNameFromExtensionId(extension3->id()),
         gfx::Rect(0, 0, 300, 200));
-    signal2.Wait();
+    ASSERT_EQ(5, panel_manager->num_panels());
+    EXPECT_LT(panel5->GetBounds().right(), panel4->GetBounds().x());
+    EXPECT_GT(0, panel5->GetBounds().x());
+
+    // Close a visible panel. Expect an overflow panel to slide over.
+    CloseWindowAndWait(panel2->browser());
+    ASSERT_EQ(4, panel_manager->num_panels());
+    EXPECT_LT(panel4->GetBounds().right(), panel3->GetBounds().x());
+    EXPECT_LE(0, panel4->GetBounds().x());
+    EXPECT_GT(0, panel5->GetBounds().x());
+
+    // Close another visible panel. Remaining overflow panel should slide over
+    // but still not enough room to be fully visible.
+    CloseWindowAndWait(panel3->browser());
     ASSERT_EQ(3, panel_manager->num_panels());
-    EXPECT_LT(panel5->GetBounds().right(), panel3->GetBounds().x());
-    EXPECT_LT(panel3->GetBounds().right(), panel1->GetBounds().x());
+    EXPECT_LT(panel5->GetBounds().right(), panel4->GetBounds().x());
+    EXPECT_GT(0, panel5->GetBounds().x());
 
-    // Test closing 2 leftmost panels.
-    ui_test_utils::WindowedNotificationObserver signal3(
-        chrome::NOTIFICATION_BROWSER_CLOSED,
-        content::Source<Browser>(panel3->browser()));
-    ui_test_utils::WindowedNotificationObserver signal4(
-        chrome::NOTIFICATION_BROWSER_CLOSED,
-        content::Source<Browser>(panel5->browser()));
-    Panel* panel6 = CreatePanelWithBounds(
-        web_app::GenerateApplicationNameFromExtensionId(extension3->id()),
-        gfx::Rect(0, 0, 500, 200));
-    signal3.Wait();
-    signal4.Wait();
+    // Closing one more panel makes room for all panels to fit on screen.
+    CloseWindowAndWait(panel4->browser());
     ASSERT_EQ(2, panel_manager->num_panels());
-    EXPECT_LT(panel6->GetBounds().right(), panel1->GetBounds().x());
+    EXPECT_LT(panel5->GetBounds().right(), panel1->GetBounds().x());
+    EXPECT_LE(0, panel5->GetBounds().x());
 
     panel1->Close();
-    panel6->Close();
+    panel5->Close();
   }
 
   int horizontal_spacing() {
     return PanelManager::horizontal_spacing();
   }
 
   // Helper function for debugging.
   void PrintAllPanelBounds() {
     const std::vector<Panel*>& panels = PanelManager::GetInstance()->panels();
     DLOG(WARNING) << "PanelBounds:";
@@ skipping 1212 matching lines @@
   EXPECT_EQ(1, tabbed_browser->tab_count());
   ASSERT_TRUE(tabbed_browser->window()->IsDownloadShelfVisible());
   tabbed_browser->CloseWindow();
 #endif
 
   EXPECT_EQ(1, panel_browser->tab_count());
   ASSERT_FALSE(panel_browser->window()->IsDownloadShelfVisible());
 
   panel_browser->CloseWindow();
 }