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

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

Issue 9403035: Refactor intra-strip panel drags by introducing PanelDragController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix trybot 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
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 2070651afd4cc0d5b0ba806114b11d95704809bd..e36d3e2755c33330255d782b178d5d61f7edaa86 100644
--- a/chrome/browser/ui/panels/panel_overflow_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_overflow_browsertest.cc
@@ -256,6 +256,8 @@ class PanelOverflowBrowserTest : public BasePanelBrowserTest {
#endif
IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_CheckPanelProperties) {
+ PanelManager* panel_manager = PanelManager::GetInstance();
+
// Create 3 panels that fit.
Panel* panel1 = CreatePanelWithBounds("1", gfx::Rect(0, 0, 250, 200));
Panel* panel2 = CreatePanelWithBounds("2", gfx::Rect(0, 0, 300, 200));
@@ -278,27 +280,27 @@ IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_CheckPanelProperties) {
EXPECT_FALSE(panel3->has_temporary_layout());
EXPECT_TRUE(panel4->has_temporary_layout());
- EXPECT_TRUE(panel1->draggable());
- EXPECT_TRUE(panel2->draggable());
- EXPECT_TRUE(panel3->draggable());
- EXPECT_FALSE(panel4->draggable());
+ EXPECT_TRUE(panel_manager->CanDrag(panel1));
+ EXPECT_TRUE(panel_manager->CanDrag(panel2));
+ EXPECT_TRUE(panel_manager->CanDrag(panel3));
+ EXPECT_FALSE(panel_manager->CanDrag(panel4));
// Make sure last panel really did overflow.
WaitForLayoutModeChanged(panel4, PanelStrip::IN_OVERFLOW);
EXPECT_FALSE(panel4->has_temporary_layout());
- EXPECT_FALSE(panel4->draggable());
+ EXPECT_FALSE(panel_manager->CanDrag(panel4));
- PanelManager::GetInstance()->CloseAll();
+ panel_manager->CloseAll();
}
IN_PROC_BROWSER_TEST_F(PanelOverflowBrowserTest, MAYBE_UpdateDraggableStatus) {
PanelManager* panel_manager = PanelManager::GetInstance();
Panel* panel = CreatePanel("panel");
- EXPECT_TRUE(panel->draggable());
+ EXPECT_TRUE(panel_manager->CanDrag(panel));
panel->MoveToStrip(panel_manager->overflow_strip());
- EXPECT_FALSE(panel->draggable());
+ EXPECT_FALSE(panel_manager->CanDrag(panel));
panel->MoveToStrip(panel_manager->docked_strip());
- EXPECT_TRUE(panel->draggable());
+ EXPECT_TRUE(panel_manager->CanDrag(panel));
panel->Close();
}

Powered by Google App Engine
This is Rietveld 408576698