Add PanelOverflowStrip to handle panel overflow.

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"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/notifications/balloon_collection_impl.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h"
 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
+#include "chrome/browser/ui/panels/panel_overflow_strip.h"
 #include "chrome/browser/ui/panels/panel_settings_menu_model.h"
+#include "chrome/browser/ui/panels/panel_strip.h"
 #include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/download/download_manager.h"
 #include "content/browser/net/url_request_mock_http_job.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_service.h"
@@ skipping 33 matching lines @@
                                                const gfx::Point& position) {
     ui_test_utils::WindowedNotificationObserver signal(
         chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
         content::Source<Panel>(panel));
     MoveMouse(position);
     signal.Wait();
   }
 
   void TestCreatePanelOnOverflow() {
     PanelManager* panel_manager = PanelManager::GetInstance();
+    PanelStrip* panel_strip = panel_manager->panel_strip();
+    PanelOverflowStrip* panel_overflow_strip =
+        panel_manager->panel_overflow_strip();
     EXPECT_EQ(0, panel_manager->num_panels()); // No panels initially.
 
     // Create testing extensions.
     DictionaryValue empty_value;
     scoped_refptr<Extension> extension1 =
         CreateExtension(FILE_PATH_LITERAL("extension1"),
         Extension::INVALID, empty_value);
     scoped_refptr<Extension> extension2 =
         CreateExtension(FILE_PATH_LITERAL("extension2"),
         Extension::INVALID, empty_value);
     scoped_refptr<Extension> extension3 =
         CreateExtension(FILE_PATH_LITERAL("extension3"),
         Extension::INVALID, empty_value);
 
     // First, create 3 panels.
     Panel* panel1 = CreatePanelWithBounds(
         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());
+    EXPECT_EQ(3, panel_strip->num_panels());
+    EXPECT_EQ(0, panel_overflow_strip->num_panels());
 
     // Open a panel that would overflow.
     Panel* panel4 = CreatePanelWithBounds(

[jennb, 2011/12/02 22:28:57]

Looks like we shouldn't watch for remove_delays_for_testing in AddPanel.
Instead, test code should watch for state_changed notification to wait to be
notified that panel is in overflow state.

[jianli, 2011/12/02 23:23:46]

Will fix in another patch.

         web_app::GenerateApplicationNameFromExtensionId(extension2->id()),
         gfx::Rect(0, 0, 280, 200));
     ASSERT_EQ(4, panel_manager->num_panels());
-    EXPECT_LT(panel4->GetBounds().right(), panel3->GetBounds().x());
-    EXPECT_GT(0, panel4->GetBounds().x());
+    EXPECT_EQ(3, panel_strip->num_panels());
+    EXPECT_EQ(1, panel_overflow_strip->num_panels());
+    EXPECT_EQ(Panel::IN_OVERFLOW, panel4->expansion_state());
 
     // Open another panel that would overflow.
     Panel* panel5 = CreatePanelWithBounds(
         web_app::GenerateApplicationNameFromExtensionId(extension3->id()),
         gfx::Rect(0, 0, 300, 200));
     ASSERT_EQ(5, panel_manager->num_panels());
-    EXPECT_LT(panel5->GetBounds().right(), panel4->GetBounds().x());
-    EXPECT_GT(0, panel5->GetBounds().x());
+    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 slide over.
+    // Close a visible panel. Expect an overflow panel to move 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());
+    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 should slide over
-    // but still not enough room to be fully visible.
+    // Close another visible panel. Remaining overflow panel cannot move over
+    // due to not enough room.
     CloseWindowAndWait(panel3->browser());
     ASSERT_EQ(3, panel_manager->num_panels());
-    EXPECT_LT(panel5->GetBounds().right(), panel4->GetBounds().x());
-    EXPECT_GT(0, panel5->GetBounds().x());
+    EXPECT_EQ(2, panel_strip->num_panels());
+    EXPECT_EQ(1, panel_overflow_strip->num_panels());
+    EXPECT_EQ(Panel::IN_OVERFLOW, panel5->expansion_state());
 
     // 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(panel5->GetBounds().right(), panel1->GetBounds().x());
-    EXPECT_LE(0, panel5->GetBounds().x());
+    EXPECT_EQ(2, panel_strip->num_panels());
+    EXPECT_EQ(0, panel_overflow_strip->num_panels());
+    EXPECT_NE(Panel::IN_OVERFLOW, panel5->expansion_state());
 
     panel1->Close();
     panel5->Close();
   }
 
   int horizontal_spacing() {
     return PanelManager::horizontal_spacing();
   }
 
   // Helper function for debugging.
@@ skipping 371 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) && !defined(USE_AURA)
+#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 1300 matching lines @@
   const BalloonCollection::Balloons& balloons() const {
     return balloons_->GetActiveBalloons();
   }
 
  private:
   BalloonCollectionImpl* balloons_;  // Owned by NotificationUIManager.
   scoped_ptr<NotificationUIManager> ui_manager_;
   scoped_ptr<DesktopNotificationService> service_;
 };
 
-IN_PROC_BROWSER_TEST_F(PanelAndNotificationTest, DISABLED_NoOverlapping) {
+IN_PROC_BROWSER_TEST_F(PanelAndNotificationTest, NoOverlapping) {
   const int kPanelWidth = 200;
   const int kShortPanelHeight = 150;
   const int kTallPanelHeight = 200;
 
   content::ShowDesktopNotificationHostMsgParams params =
       StandardTestNotification();
   EXPECT_TRUE(service()->ShowDesktopNotification(
         params, 0, 0, DesktopNotificationService::PageNotification));
   MessageLoopForUI::current()->RunAllPending();
   Balloon* balloon = balloons().front();
@@ skipping 70 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));
 }