Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5433)

Unified Diff: chrome/browser/ui/panels/panel_overflow_browsertest.cc

Issue 9353002: Created new PanelStrip base class and make DockedPanelStrip and OverflowPanelStrip its subclasses. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review feedback Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/panels/panel_manager.cc ('k') | chrome/browser/ui/panels/panel_strip.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel_overflow_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_overflow_browsertest.cc b/chrome/browser/ui/panels/panel_overflow_browsertest.cc
index e7b6b06f9052f488361039665bd995b0a6c64b86..e939926934ca7a2657835a96870e79398911c07a 100644
--- a/chrome/browser/ui/panels/panel_overflow_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_overflow_browsertest.cc
@@ -265,7 +265,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_CheckPanelProperties) {
EXPECT_FALSE(panel4->has_temporary_layout());
EXPECT_FALSE(panel4->draggable());
- PanelManager::GetInstance()->RemoveAll();
+ PanelManager::GetInstance()->CloseAll();
}
IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_UpdateDraggableStatus) {
@@ -327,7 +327,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_CreateOverflowPanels) {
EXPECT_FALSE(overflow_strip->overflow_indicator());
EXPECT_TRUE(IsPanelVisible(panel4));
- PanelManager::GetInstance()->RemoveAll();
+ PanelManager::GetInstance()->CloseAll();
}
IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
@@ -360,7 +360,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
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,
@@ -387,7 +387,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
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) {
@@ -480,7 +480,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_CloseOverflowPanels) {
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) {
@@ -608,7 +608,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_CloseDockedPanels) {
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,
@@ -646,7 +646,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
// 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());
@@ -785,7 +785,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_ActivateOverflowPanels) {
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(
@@ -887,7 +887,7 @@ IN_PROC_BROWSER_TEST_F(
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(
@@ -1083,7 +1083,7 @@ IN_PROC_BROWSER_TEST_F(
EXPECT_EQ(expected_overflow_list, GetAllOverflowPanelData());
}
- PanelManager::GetInstance()->RemoveAll();
+ PanelManager::GetInstance()->CloseAll();
}
IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
@@ -1154,7 +1154,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
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,
@@ -1260,7 +1260,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest,
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) {
@@ -1472,7 +1472,7 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_OverflowIndicatorCount) {
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) {
@@ -1585,5 +1585,5 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_DrawOverflowAttention) {
EXPECT_TRUE(panels[3]->IsDrawingAttention());
EXPECT_FALSE(overflow_indicator->IsDrawingAttention());
- panel_manager->RemoveAll();
+ panel_manager->CloseAll();
}
« no previous file with comments | « chrome/browser/ui/panels/panel_manager.cc ('k') | chrome/browser/ui/panels/panel_strip.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698