Created new PanelStrip base class and make DockedPanelStrip and OverflowPanelStrip its subclasses.

chrome/browser/ui/panels/panel_overflow_browsertest.cc

 // Copyright (c) 2012 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 <vector>
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/docked_panel_strip.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/overflow_panel_strip.h"
@@ skipping 247 matching lines @@
   EXPECT_TRUE(panel1->draggable());
   EXPECT_TRUE(panel2->draggable());
   EXPECT_TRUE(panel3->draggable());
   EXPECT_FALSE(panel4->draggable());
 
   // Make sure last panel really did overflow.
   WaitForExpansionStateChanged(panel4, Panel::IN_OVERFLOW);
   EXPECT_FALSE(panel4->has_temporary_layout());
   EXPECT_FALSE(panel4->draggable());
 
-  PanelManager::GetInstance()->RemoveAll();
+  PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_UpdateDraggableStatus) {
   Panel* panel = CreatePanel("panel");
   EXPECT_TRUE(panel->draggable());
   panel->SetExpansionState(Panel::IN_OVERFLOW);
   EXPECT_FALSE(panel->draggable());
   panel->SetExpansionState(Panel::EXPANDED);
   EXPECT_TRUE(panel->draggable());
   panel->Close();
@@ skipping 41 matching lines @@
   params.name = "Panel4";
   Panel* panel4 = CreatePanelWithParams(params);
   WaitForExpansionStateChanged(panel4, Panel::IN_OVERFLOW);
 
   EXPECT_EQ(5, panel_manager->num_panels());
   EXPECT_EQ(3, docked_strip->num_panels());
   EXPECT_EQ(2, overflow_strip->num_panels());
   EXPECT_FALSE(overflow_strip->overflow_indicator());
   EXPECT_TRUE(IsPanelVisible(panel4));
 
-  PanelManager::GetInstance()->RemoveAll();
+  PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
                        MAYBE_CreateMoreOverflowPanels) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   OverflowPanelStrip* overflow_strip =
       panel_manager->overflow_strip();
 
   const int panel_widths[] = {
@@ skipping 12 matching lines @@
   EXPECT_TRUE(IsPanelVisible(panels[3]));
   EXPECT_EQ(Panel::IN_OVERFLOW, panels[4]->expansion_state());
   EXPECT_TRUE(IsPanelVisible(panels[4]));
   EXPECT_EQ(Panel::IN_OVERFLOW, panels[5]->expansion_state());
   EXPECT_TRUE(IsPanelVisible(panels[5]));
   EXPECT_EQ(Panel::IN_OVERFLOW, panels[6]->expansion_state());
   EXPECT_FALSE(IsPanelVisible(panels[6]));
   EXPECT_EQ(Panel::IN_OVERFLOW, panels[7]->expansion_state());
   EXPECT_FALSE(IsPanelVisible(panels[7]));
 
-  PanelManager::GetInstance()->RemoveAll();
+  PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
                        MAYBE_CreatePanelOnDelayedOverflow) {
   // Create 2 big panels.
   CreatePanelWithBounds("Panel0", gfx::Rect(0, 0, 260, 200));
   CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 260, 200));
 
   // Create an overflow panel without waiting for it to be moved to overflow.
   CreatePanelParams params(
       "Panel2", gfx::Rect(0, 0, 255, 200), SHOW_AS_INACTIVE);
   params.wait_for_fully_created = false;
   Panel* overflow_panel = CreatePanelWithParams(params);
   EXPECT_EQ(Panel::EXPANDED, overflow_panel->expansion_state());
   EXPECT_TRUE(overflow_panel->has_temporary_layout());
 
   // Create a small panel that could fit within the available space in the
   // panel strip.
   CreatePanelParams params2(
       "Panel3", gfx::Rect(0, 0, 110, 200), SHOW_AS_INACTIVE);
   Panel* panel3 = CreatePanelWithParams(params2);
   EXPECT_EQ(Panel::EXPANDED, panel3->expansion_state());
   EXPECT_FALSE(panel3->has_temporary_layout());
 
   WaitForExpansionStateChanged(overflow_panel, Panel::IN_OVERFLOW);
   EXPECT_FALSE(overflow_panel->has_temporary_layout());
-  PanelManager::GetInstance()->RemoveAll();
+  PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_CloseOverflowPanels) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   OverflowPanelStrip* overflow_strip =
       panel_manager->overflow_strip();
 
   // Create docked and overflow panels.
   //   docked:               P0, P1, P2
@@ skipping 72 matching lines @@
   EXPECT_EQ(num_docked_panales, docked_strip->num_panels());
   EXPECT_EQ(num_overflow_panels, overflow_strip->num_panels());
 
   EXPECT_EQ(expected_docked_list, GetAllDockedPanelData());
 
   expected_overflow_list.clear();
   expected_overflow_list.Add(panels[5], Panel::IN_OVERFLOW, true, false);
   expected_overflow_list.Add(panels[7], Panel::IN_OVERFLOW, true, false);
   EXPECT_EQ(expected_overflow_list, GetAllOverflowPanelData());
 
-  panel_manager->RemoveAll();
+  panel_manager->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_CloseDockedPanels) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   OverflowPanelStrip* overflow_strip =
       panel_manager->overflow_strip();
 
   // Create docked and overflow panels.
   //   docked:               P0, P1, P2
@@ skipping 107 matching lines @@
   expected_docked_list.Add(panels[4], Panel::EXPANDED, true, false);
   expected_docked_list.Add(panels[5], Panel::EXPANDED, true, false);
   expected_docked_list.Add(panels[6], Panel::EXPANDED, true, false);
   EXPECT_EQ(expected_docked_list, GetAllDockedPanelData());
 
   expected_overflow_list.clear();
   expected_overflow_list.Add(panels[7], Panel::IN_OVERFLOW, true, false);
   expected_overflow_list.Add(panels[8], Panel::IN_OVERFLOW, true, false);
   EXPECT_EQ(expected_overflow_list, GetAllOverflowPanelData());
 
-  panel_manager->RemoveAll();
+  panel_manager->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
                        MAYBE_CloseWithDelayedOverflow) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
 
   // Create 2 big panels.
   Panel* panel0 = CreatePanelWithBounds("Panel0", gfx::Rect(0, 0, 260, 200));
   Panel* panel1 = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 260, 200));
@@ skipping 17 matching lines @@
   overflow_panel = CreatePanelWithParams(params);
   EXPECT_EQ(2, docked_strip->num_panels());
   EXPECT_EQ(1, docked_strip->num_temporary_layout_panels());
   EXPECT_TRUE(overflow_panel->has_temporary_layout());
 
   // Close one of the non-overflow panels. Expect the delayed overflow
   // panel will not be affected by the close.
   // Hack. Pretend to close panel by removing it directly. Cannot use
   // CloseWindowAndWait() here because it will allow the delayed overflow
   // to complete.
-  docked_strip->Remove(panel1);
+  docked_strip->RemovePanel(panel1);
   EXPECT_EQ(1, docked_strip->num_panels());
   EXPECT_EQ(1, docked_strip->num_temporary_layout_panels());
   EXPECT_TRUE(overflow_panel->has_temporary_layout());
 
   // Make sure the overflow panel actually moves to overflow.
   WaitForExpansionStateChanged(overflow_panel, Panel::IN_OVERFLOW);
   EXPECT_EQ(0, docked_strip->num_temporary_layout_panels());
 
   // Hack. Put the "falsely closed" panel back into the panel strip
   // so we can properly close it to wrap up this test.
@@ skipping 118 matching lines @@
   EXPECT_EQ(expected_docked_list, GetAllDockedPanelData());
 
   expected_overflow_list.clear();
   expected_overflow_list.Add(panels[4], Panel::IN_OVERFLOW, true, false);
   expected_overflow_list.Add(panels[1], Panel::IN_OVERFLOW, true, false);
   expected_overflow_list.Add(panels[3], Panel::IN_OVERFLOW, true, false);
   expected_overflow_list.Add(panels[2], Panel::IN_OVERFLOW, false, false);
   expected_overflow_list.Add(panels[5], Panel::IN_OVERFLOW, false, false);
   EXPECT_EQ(expected_overflow_list, GetAllOverflowPanelData());
 
-  PanelManager::GetInstance()->RemoveAll();
+  PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(
     PanelOverflowBrowserTest,
     MAYBE_MoveMinimizedPanelToOverflowAndBringBackByActivate) {
   // Create docked and overflow panels.
   //   docked:               P0, P1, P2
   //   overflow:             P3, P4
   const int panel_widths[] = {
       250, 260, 200,  // docked
@@ skipping 81 matching lines @@
   expected_docked_list.Add(panels[0], Panel::EXPANDED, true, false);
   expected_docked_list.Add(panels[1], Panel::EXPANDED, true, false);
   expected_docked_list.Add(panels[2], Panel::EXPANDED, true, true);
   EXPECT_EQ(expected_docked_list, GetAllDockedPanelData());
 
   expected_overflow_list.clear();
   expected_overflow_list.Add(panels[3], Panel::IN_OVERFLOW, true, false);
   expected_overflow_list.Add(panels[4], Panel::IN_OVERFLOW, true, false);
   EXPECT_EQ(expected_overflow_list, GetAllOverflowPanelData());
 
-  PanelManager::GetInstance()->RemoveAll();
+  PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(
     PanelOverflowBrowserTest,
     MAYBE_MoveMinimizedPanelToOverflowAndBringBackByCloseOrResize) {
   PanelManager* panel_manager = PanelManager::GetInstance();
 
   // Create docked and overflow panels.
   //   docked:   P0, P1, P2
   //   overflow: P3, P4, P5
@@ skipping 175 matching lines @@
     expected_docked_list.Add(panels[0], Panel::MINIMIZED, true, false);
     expected_docked_list.Add(panels[1], Panel::EXPANDED, true, false);
     expected_docked_list.Add(panels[5], Panel::EXPANDED, true, true);
     expected_docked_list.Add(panels[2], Panel::MINIMIZED, true, false);
     EXPECT_EQ(expected_docked_list, GetAllDockedPanelData());
 
     expected_overflow_list.clear();
     EXPECT_EQ(expected_overflow_list, GetAllOverflowPanelData());
   }
 
-  PanelManager::GetInstance()->RemoveAll();
+  PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
                        MAYBE_HoverOverOverflowAreaWithoutOverflowOfOverflow) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   OverflowPanelStrip* overflow_strip =
       panel_manager->overflow_strip();
   int iconified_width = overflow_strip->current_display_width();
 
   // Create docked and overflow panels.
@@ skipping 50 matching lines @@
   EXPECT_EQ(hover_width, overflow_strip->current_display_width());
 
   // Move mouse beyond the right edge of the hover panel. Expect the overflow
   // area gets shrunk.
   MoveMouseAndWaitForOverflowAnimationEnded(gfx::Point(
       panels[4]->GetBounds().right() + 5, panels[4]->GetBounds().y()));
   EXPECT_EQ(iconified_width, overflow_strip->current_display_width());
   EXPECT_EQ(iconified_width, panels[3]->GetBounds().width());
   EXPECT_EQ(iconified_width, panels[4]->GetBounds().width());
 
-  panel_manager->RemoveAll();
+  panel_manager->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
                        MAYBE_HoverOverOverflowAreaWithOverflowOfOverflow) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   OverflowPanelStrip* overflow_strip =
       panel_manager->overflow_strip();
   int iconified_width = overflow_strip->current_display_width();
 
   // Create docked and overflow panels.
@@ skipping 85 matching lines @@
   // area gets shrunk.
   MoveMouseAndWaitForOverflowAnimationEnded(gfx::Point(
       panels[7]->GetBounds().x(), panels[7]->GetBounds().y() - 1));
   EXPECT_EQ(iconified_width, overflow_strip->current_display_width());
   EXPECT_EQ(iconified_width, panels[3]->GetBounds().width());
   EXPECT_EQ(iconified_width, panels[4]->GetBounds().width());
   EXPECT_EQ(iconified_width, panels[5]->GetBounds().width());
   EXPECT_EQ(0, panels[6]->GetBounds().width());
   EXPECT_EQ(0, panels[7]->GetBounds().width());
 
-  panel_manager->RemoveAll();
+  panel_manager->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_ResizePanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   panel_manager->enable_auto_sizing(true);
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   OverflowPanelStrip* overflow_strip = panel_manager->overflow_strip();
 
   // Create 4 panels that fit.
   // docked: P1 (250), P2 (200), P3 (100), P4 (100)
@@ skipping 191 matching lines @@
   panels[5]->Activate();
   WaitForPanelActiveState(panels[5], SHOW_AS_ACTIVE);
   WaitForExpansionStateChanged(panels[5], Panel::EXPANDED);
   EXPECT_TRUE(IsPanelVisible(panels[6]));
   EXPECT_FALSE(IsPanelVisible(panels[7]));
   EXPECT_FALSE(IsPanelVisible(panels[8]));
   EXPECT_FALSE(IsPanelVisible(panels[9]));
   EXPECT_FALSE(IsPanelVisible(panels[10]));
   EXPECT_EQ(4, overflow_strip->overflow_indicator()->GetCount());
 
-  panel_manager->RemoveAll();
+  panel_manager->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_DrawOverflowAttention) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
   OverflowPanelStrip* overflow_strip = panel_manager->overflow_strip();
 
   // Create docked and overflow panels.
   //   docked:               P0, P1, P2, P3
   //   overflow:             P4, P5, P6, (P7, P8, P9, P10, P11)
@@ skipping 92 matching lines @@
   // Close an overflow panel that would move the first oveflow-on-overflow panel
   // to become visible. Expect the overflow indicator is not showing attention.
   //   docked:               P0, P1, P5
   //   overflow:             P2, P10, P3, (P4, P6, P7, P9, P11)
   CloseWindowAndWait(panels[8]->browser());
   EXPECT_EQ(3, docked_strip->num_panels());
   EXPECT_EQ(8, overflow_strip->num_panels());
   EXPECT_TRUE(panels[3]->IsDrawingAttention());
   EXPECT_FALSE(overflow_indicator->IsDrawingAttention());
 
-  panel_manager->RemoveAll();
+  panel_manager->CloseAll();
 }