Refactor PanelManager to create PanelStrip.

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 10 matching lines @@
 #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_settings_menu_model.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"
 #include "content/public/common/show_desktop_notification_params.h"
@@ skipping 16 matching lines @@
     size_t browser_count = BrowserList::size();
     ui_test_utils::WindowedNotificationObserver signal(
         chrome::NOTIFICATION_BROWSER_CLOSED,
         content::Source<Browser>(browser));
     browser->CloseWindow();
     signal.Wait();
     // Now we have one less browser instance.
     EXPECT_EQ(browser_count - 1, BrowserList::size());
   }
 
   void MoveMouse(gfx::Point position) {

[jianli, 2011/11/30 19:27:01]

const gfx::Point&

[jennb, 2011/11/30 19:55:12]

Done.

-    PanelManager::GetInstance()->OnMouseMove(position);
+    PanelManager::GetInstance()->mouse_watcher()->NotifyMouseMovement(position);
     MessageLoopForUI::current()->RunAllPending();
   }
 
   void MoveMouseAndWaitForExpansionStateChange(Panel* panel,
                                                const gfx::Point& position) {
     ui_test_utils::WindowedNotificationObserver signal(
         chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
         content::Source<Panel>(panel));
     MoveMouse(position);
     signal.Wait();
@@ skipping 427 matching lines @@
   EXPECT_GT(bounds.height(), 0);
 
   EXPECT_EQ(bounds.right(), panel_manager->StartingRightPosition());
 
   CloseWindowAndWait(panel->browser());
 
   EXPECT_EQ(0, panel_manager->num_panels());
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CreateBigPanel) {
-  PanelManager* panel_manager = PanelManager::GetInstance();
   Panel* panel = CreatePanelWithBounds("BigPanel", testing_work_area());
   gfx::Rect bounds = panel->GetBounds();
-  EXPECT_EQ(panel_manager->GetMaxPanelWidth(), bounds.width());
+  EXPECT_EQ(panel->max_size().width(), bounds.width());

[jianli, 2011/11/30 19:27:01]

Why not:
  EXPECT_EQ(panel->min_size(), panel->GetBounds().size());

[jennb, 2011/11/30 19:55:12]

It didn't work. I tried that first. 

   EXPECT_LT(bounds.width(), testing_work_area().width());
-  EXPECT_EQ(panel_manager->GetMaxPanelHeight(), bounds.height());
+  EXPECT_EQ(panel->max_size().height(), bounds.height());
   EXPECT_LT(bounds.height(), testing_work_area().height());
   panel->Close();
 }
 
 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();
@@ skipping 346 matching lines @@
   EXPECT_LT(bounds_on_shrink.width(), bounds_on_grow.width());
   EXPECT_GT(bounds_on_shrink.width(), initial_bounds.width());
   EXPECT_EQ(bounds_on_shrink.height(), initial_bounds.height());
 
   panel->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, RestoredBounds) {
   // Disable mouse watcher. We don't care about mouse movements in this test.
   PanelManager* panel_manager = PanelManager::GetInstance();
-  panel_manager->disable_mouse_watching();
+  PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
+  panel_manager->set_mouse_watcher(mouse_watcher);
   Panel* panel = CreatePanelWithBounds("PanelTest", gfx::Rect(0, 0, 100, 100));
   EXPECT_EQ(Panel::EXPANDED, panel->expansion_state());
   EXPECT_EQ(panel->GetBounds(), panel->GetRestoredBounds());
   EXPECT_EQ(0, panel_manager->minimized_panel_count());
 
   panel->SetExpansionState(Panel::MINIMIZED);
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
   gfx::Rect bounds = panel->GetBounds();
   gfx::Rect restored = panel->GetRestoredBounds();
   EXPECT_EQ(bounds.x(), restored.x());
@@ skipping 44 matching lines @@
   panel->SetExpansionState(Panel::EXPANDED);
   bounds = gfx::Rect(40, 60, 300, 400);
   panel->SetPanelBounds(bounds);
   EXPECT_NE(saved_restored_height, panel->GetRestoredBounds().height());
   EXPECT_EQ(0, panel_manager->minimized_panel_count());
 
   panel->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeRestore) {
-  // Disable mouse watcher.  We'll simulate mouse movements for test.
-  PanelManager::GetInstance()->disable_mouse_watching();
+  // We'll simulate mouse movements for test.
+  PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
+  PanelManager::GetInstance()->set_mouse_watcher(mouse_watcher);
 
   // Test with one panel.
   CreatePanelWithBounds("PanelTest1", gfx::Rect(0, 0, 100, 100));
   TestMinimizeRestore();
 
+  PanelManager::GetInstance()->RemoveAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeRestore2) {

[jianli, 2011/11/30 19:27:01]

MinimizeRestore2 => MinimizeRestore2Panels

[jennb, 2011/11/30 19:55:12]

Done.

+  // We'll simulate mouse movements for test.
+  PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
+  PanelManager::GetInstance()->set_mouse_watcher(mouse_watcher);
+
   // Test with two panels.
+  CreatePanelWithBounds("PanelTest1", gfx::Rect(0, 0, 100, 100));
   CreatePanelWithBounds("PanelTest2", gfx::Rect(0, 0, 110, 110));
   TestMinimizeRestore();
 
+  PanelManager::GetInstance()->RemoveAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeRestore3) {

[jianli, 2011/11/30 19:27:01]

MinimizeRestore3 =>  MinimizeRestore3Panels

[jennb, 2011/11/30 19:55:12]

Done.

+  // We'll simulate mouse movements for test.
+  PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
+  PanelManager::GetInstance()->set_mouse_watcher(mouse_watcher);
+
   // Test with three panels.
+  CreatePanelWithBounds("PanelTest1", gfx::Rect(0, 0, 100, 100));
+  CreatePanelWithBounds("PanelTest2", gfx::Rect(0, 0, 110, 110));
   CreatePanelWithBounds("PanelTest3", gfx::Rect(0, 0, 120, 120));
   TestMinimizeRestore();
 
   PanelManager::GetInstance()->RemoveAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, ActivatePanelOrTabbedWindow) {
   CreatePanelParams params1("Panel1", gfx::Rect(), SHOW_AS_ACTIVE);
   Panel* panel1 = CreatePanelWithParams(params1);
   CreatePanelParams params2("Panel2", gfx::Rect(), SHOW_AS_ACTIVE);
@@ skipping 137 matching lines @@
   EXPECT_FALSE(panel->IsDrawingAttention());
   panel->FlashFrame();
   EXPECT_TRUE(panel->IsDrawingAttention());
   MessageLoop::current()->RunAllPending();
   EXPECT_TRUE(native_panel_testing->VerifyDrawingAttention());
 
   panel->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, DrawAttentionWhileMinimized) {
+  // We'll simulate mouse movements for test.
+  PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
+  PanelManager::GetInstance()->set_mouse_watcher(mouse_watcher);
+
   CreatePanelParams params("Initially Active", gfx::Rect(), SHOW_AS_ACTIVE);
   Panel* panel = CreatePanelWithParams(params);
   NativePanel* native_panel = panel->native_panel();
   scoped_ptr<NativePanelTesting> native_panel_testing(
       NativePanelTesting::Create(native_panel));
 
   // Test that the attention is drawn and the title-bar is brought up when the
   // minimized panel is drawing attention.
   panel->SetExpansionState(Panel::MINIMIZED);
   WaitForPanelActiveState(panel, SHOW_AS_INACTIVE);
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
   panel->FlashFrame();
   EXPECT_TRUE(panel->IsDrawingAttention());
   EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
   MessageLoop::current()->RunAllPending();
   EXPECT_TRUE(native_panel_testing->VerifyDrawingAttention());
 
   // Test that we cannot bring up other minimized panel if the mouse is over
   // the panel that draws attension.
-  EXPECT_FALSE(PanelManager::GetInstance()->
-      ShouldBringUpTitlebars(panel->GetBounds().x(), panel->GetBounds().y()));
+  gfx::Point hover_point(panel->GetBounds().origin());
+  MoveMouse(hover_point);
+  EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
 
   // Test that we cannot bring down the panel that is drawing the attention.
-  PanelManager::GetInstance()->BringUpOrDownTitlebars(false);
+  hover_point.set_y(hover_point.y() - 200);
+  MoveMouse(hover_point);
   EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
 
   // Test that the attention is cleared when activated.
   panel->Activate();
   MessageLoop::current()->RunAllPending();
   WaitForPanelActiveState(panel, SHOW_AS_ACTIVE);
   EXPECT_FALSE(panel->IsDrawingAttention());
   EXPECT_EQ(Panel::EXPANDED, panel->expansion_state());
   EXPECT_FALSE(native_panel_testing->VerifyDrawingAttention());
 
@@ skipping 342 matching lines @@
   Browser* tabbed_browser = BrowserList::FindTabbedBrowser(profile, false);
   EXPECT_EQ(contents, tabbed_browser->GetSelectedTabContentsWrapper());
   tabbed_browser->window()->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, SizeClamping) {
   // Using '0' sizes is equivalent of not providing sizes in API and causes
   // minimum sizes to be applied to facilitate auto-sizing.
   CreatePanelParams params("Panel", gfx::Rect(), SHOW_AS_ACTIVE);
   Panel* panel = CreatePanelWithParams(params);
-  EXPECT_EQ(PanelManager::kPanelMinWidth, panel->GetBounds().width());
-  EXPECT_EQ(PanelManager::kPanelMinHeight, panel->GetBounds().height());
+  EXPECT_EQ(panel->min_size().width(), panel->GetBounds().width());

[jianli, 2011/11/30 19:27:01]

ditto.

+  EXPECT_EQ(panel->min_size().height(), panel->GetBounds().height());
+  int reasonable_width = panel->min_size().width() + 10;
+  int reasonable_height = panel->min_size().height() + 20;
+
   panel->Close();
 
   // Using reasonable actual sizes should avoid clamping.
-  int reasonable_width = PanelManager::kPanelMinWidth + 10;
-  int reasonable_height = PanelManager::kPanelMinHeight + 20;
   CreatePanelParams params1("Panel1",
                             gfx::Rect(0, 0,
                                       reasonable_width, reasonable_height),
                             SHOW_AS_ACTIVE);
   panel = CreatePanelWithParams(params1);
   EXPECT_EQ(reasonable_width, panel->GetBounds().width());
   EXPECT_EQ(reasonable_height, panel->GetBounds().height());
   panel->Close();
 
   // Using just one size should auto-compute some reasonable other size.
@@ skipping 363 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));
 }