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

Side by Side Diff: chrome/browser/ui/panels/detached_panel_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 per 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
6 #include "chrome/browser/ui/panels/detached_panel_strip.h"
7 #include "chrome/browser/ui/panels/native_panel.h"
8 #include "chrome/browser/ui/panels/panel.h"
9 #include "chrome/browser/ui/panels/panel_manager.h"
10
11 class DetachedPanelBrowserTest : public BasePanelBrowserTest {
12 };
13
14 IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, CheckDetachedPanelProperties) {
15 PanelManager* panel_manager = PanelManager::GetInstance();
16 DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
17
18 // Create 2 panels.
19 Panel* panel1 = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 250, 200));
20 Panel* panel2 = CreatePanelWithBounds("Panel2", gfx::Rect(0, 0, 300, 200));
21
22 EXPECT_TRUE(panel_manager->CanDrag(panel1));
23 EXPECT_TRUE(panel_manager->CanDrag(panel2));
24
25 // Move panels to detached strip.
26 EXPECT_EQ(2, panel_manager->num_panels());
27 EXPECT_EQ(0, detached_strip->num_panels());
28 panel1->MoveToStrip(detached_strip);
29 panel2->MoveToStrip(detached_strip);
30 EXPECT_EQ(2, panel_manager->num_panels());
31 EXPECT_EQ(2, detached_strip->num_panels());
jennb 2012/02/17 21:28:45 Also check panel_manager->panels() includes the de
jianli 2012/02/17 23:52:56 Done.
32
33 EXPECT_TRUE(panel_manager->CanDrag(panel1));
34 EXPECT_TRUE(panel_manager->CanDrag(panel2));
35
36 panel_manager->CloseAll();
37 }
38
39 IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, DragDetachedPanel) {
40 PanelManager* panel_manager = PanelManager::GetInstance();
41 DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
42
43 // Create one detached panel.
44 Panel* panel = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 250, 200));
45 panel->MoveToStrip(detached_strip);
46
47 // Test that the detached panel can be dragged anywhere.
48 scoped_ptr<NativePanelTesting> panel_testing(
49 NativePanelTesting::Create(panel->native_panel()));
50 gfx::Point origin = panel->GetBounds().origin();
51
52 panel_testing->PressLeftMouseButtonTitlebar(origin);
53 EXPECT_EQ(origin, panel->GetBounds().origin());
54
55 panel_testing->DragTitlebar(-51, 102);
56 origin.Offset(-51, 102);
57 EXPECT_EQ(origin, panel->GetBounds().origin());
58
59 panel_testing->DragTitlebar(37, -42);
60 origin.Offset(37, -42);
61 EXPECT_EQ(origin, panel->GetBounds().origin());
62
63 panel_testing->FinishDragTitlebar();
64 EXPECT_EQ(origin, panel->GetBounds().origin());
65
66 // Test that cancelling the drag will return the panel the the original
67 // position.
68 gfx::Point original_position = panel->GetBounds().origin();
69 origin = original_position;
70
71 panel_testing->PressLeftMouseButtonTitlebar(origin);
72 EXPECT_EQ(origin, panel->GetBounds().origin());
73
74 panel_testing->DragTitlebar(-51, 102);
75 origin.Offset(-51, 102);
76 EXPECT_EQ(origin, panel->GetBounds().origin());
77
78 panel_testing->DragTitlebar(37, -42);
79 origin.Offset(37, -42);
80 EXPECT_EQ(origin, panel->GetBounds().origin());
81
82 panel_testing->CancelDragTitlebar();
83 EXPECT_EQ(original_position, panel->GetBounds().origin());
84
85 panel_manager->CloseAll();
86 }
87
88 IN_PROC_BROWSER_TEST_F(DetachedPanelBrowserTest, CloseDraggingDetachedPanel) {
89 PanelManager* panel_manager = PanelManager::GetInstance();
90 DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
91
92 // Create one detached panel.
93 Panel* panel = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 250, 200));
94 panel->MoveToStrip(detached_strip);
95
96 // Start dragging the panel.
97 scoped_ptr<NativePanelTesting> panel_testing(
98 NativePanelTesting::Create(panel->native_panel()));
99 panel_testing->PressLeftMouseButtonTitlebar(panel->GetBounds().origin());
100 panel_testing->DragTitlebar(-51, 102);
101
102 // Closing the panel while drag in progress will keep the panel intact.
103 panel->Close();
jennb 2012/02/17 21:28:45 Close() is async and will not have immediate effec
jianli 2012/02/17 23:52:56 Removed. Will include in future patch.
104 EXPECT_EQ(1, detached_strip->num_panels());
105
106 // It should be closed right after the drag ends.
107 panel_testing->FinishDragTitlebar();
108 EXPECT_EQ(0, detached_strip->num_panels());
109 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/panels/detached_panel_strip.h » ('j') | chrome/browser/ui/panels/detached_panel_strip.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698