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

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

Issue 9546001: Support detaching/attaching panels via inter-strip drags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix per feedback Created 8 years, 9 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/detached_panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/detached_panel_browsertest.cc b/chrome/browser/ui/panels/detached_panel_browsertest.cc
index 885cc1dce8c2e53c508ad8bb617b9825b76ba102..1ed5c173574475e604619e8de428615bebec7924 100644
--- a/chrome/browser/ui/panels/detached_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/detached_panel_browsertest.cc
@@ -17,17 +17,9 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, CheckDetachedPanelProperties) {
DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
// Create 2 panels.
- Panel* panel1 = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 250, 200));
- Panel* panel2 = CreatePanelWithBounds("Panel2", gfx::Rect(0, 0, 300, 200));
+ Panel* panel1 = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
+ Panel* panel2 = CreateDetachedPanel("2", gfx::Rect(350, 180, 300, 200));
- EXPECT_TRUE(panel1->draggable());
- EXPECT_TRUE(panel2->draggable());
-
- // Move panels to detached strip.
- EXPECT_EQ(2, panel_manager->num_panels());
- EXPECT_EQ(0, detached_strip->num_panels());
- panel_manager->MovePanelToStrip(panel1, PanelStrip::DETACHED);
- panel_manager->MovePanelToStrip(panel2, PanelStrip::DETACHED);
EXPECT_EQ(2, panel_manager->num_panels());
EXPECT_EQ(2, detached_strip->num_panels());
@@ -44,10 +36,10 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, DragDetachedPanel) {
PanelManager* panel_manager = PanelManager::GetInstance();
// Create one detached panel.
jennb 2012/03/12 22:43:00 nit: Comment not needed anymore.
jianli 2012/03/13 00:21:40 Done.
- Panel* panel = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 250, 200));
- panel_manager->MovePanelToStrip(panel, PanelStrip::DETACHED);
+ Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
- // Test that the detached panel can be dragged anywhere.
+ // Test that the detached panel can be dragged almost anywhere except getting
+ // close to the bottom of the docked area to trigger the attach.
scoped_ptr<NativePanelTesting> panel_testing(
NativePanelTesting::Create(panel->native_panel()));
gfx::Point origin = panel->GetBounds().origin();
@@ -95,14 +87,10 @@ IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, CloseDetachedPanelOnDrag) {
DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
// Create 4 detached panels.
- Panel* panel1 = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 100, 100));
- Panel* panel2 = CreatePanelWithBounds("Panel2", gfx::Rect(0, 0, 110, 110));
- Panel* panel3 = CreatePanelWithBounds("Panel3", gfx::Rect(0, 0, 120, 120));
- Panel* panel4 = CreatePanelWithBounds("Panel4", gfx::Rect(0, 0, 130, 130));
- panel_manager->MovePanelToStrip(panel1, PanelStrip::DETACHED);
- panel_manager->MovePanelToStrip(panel2, PanelStrip::DETACHED);
- panel_manager->MovePanelToStrip(panel3, PanelStrip::DETACHED);
- panel_manager->MovePanelToStrip(panel4, PanelStrip::DETACHED);
+ Panel* panel1 = CreateDetachedPanel("1", gfx::Rect(100, 200, 100, 100));
+ Panel* panel2 = CreateDetachedPanel("2", gfx::Rect(200, 210, 110, 110));
+ Panel* panel3 = CreateDetachedPanel("3", gfx::Rect(300, 220, 120, 120));
+ Panel* panel4 = CreateDetachedPanel("4", gfx::Rect(400, 230, 130, 130));
ASSERT_EQ(4, detached_strip->num_panels());
scoped_ptr<NativePanelTesting> panel1_testing(

Powered by Google App Engine
This is Rietveld 408576698