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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 10545126: Made copies of existing Panel test files. No edits in any of the files. New files not added to .gyp… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 6 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/old_panel_browsertest.cc ('k') | chrome/browser/ui/panels/old_panel_resize_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/old_panel_drag_browsertest.cc
diff --git a/chrome/browser/ui/panels/old_panel_drag_browsertest.cc b/chrome/browser/ui/panels/old_panel_drag_browsertest.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a9b551e15a79cd2c34570caf8d2522c36f8ff8cb
--- /dev/null
+++ b/chrome/browser/ui/panels/old_panel_drag_browsertest.cc
@@ -0,0 +1,1343 @@
+// 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 "base/message_loop.h"
+#include "chrome/browser/ui/panels/base_panel_browser_test.h"
+#include "chrome/browser/ui/panels/detached_panel_strip.h"
+#include "chrome/browser/ui/panels/docked_panel_strip.h"
+#include "chrome/browser/ui/panels/native_panel.h"
+#include "chrome/browser/ui/panels/panel.h"
+#include "chrome/browser/ui/panels/panel_drag_controller.h"
+#include "chrome/browser/ui/panels/panel_manager.h"
+#include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"
+
+class PanelDragBrowserTest : public BasePanelBrowserTest {
+ public:
+ PanelDragBrowserTest() : BasePanelBrowserTest() {
+ }
+
+ virtual ~PanelDragBrowserTest() {
+ }
+
+ virtual void SetUpOnMainThread() OVERRIDE {
+ BasePanelBrowserTest::SetUpOnMainThread();
+
+ // All the tests here assume using mocked 800x600 screen area for the
+ // primary monitor. Do the check now.
+ gfx::Rect primary_screen_area = PanelManager::GetInstance()->
+ display_settings_provider()->GetPrimaryScreenArea();
+ DCHECK(primary_screen_area.width() == 800);
+ DCHECK(primary_screen_area.height() == 600);
+ }
+
+ // Drag |panel| from its origin by the offset |delta|.
+ void DragPanelByDelta(Panel* panel, const gfx::Point& delta) {
+ scoped_ptr<NativePanelTesting> panel_testing(
+ NativePanelTesting::Create(panel->native_panel()));
+ gfx::Point mouse_location(panel->GetBounds().origin());
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ panel_testing->DragTitlebar(mouse_location.Add(delta));
+ panel_testing->FinishDragTitlebar();
+ }
+
+ // Drag |panel| from its origin to |new_mouse_location|.
+ void DragPanelToMouseLocation(Panel* panel,
+ const gfx::Point& new_mouse_location) {
+ scoped_ptr<NativePanelTesting> panel_testing(
+ NativePanelTesting::Create(panel->native_panel()));
+ gfx::Point mouse_location(panel->GetBounds().origin());
+ panel_testing->PressLeftMouseButtonTitlebar(panel->GetBounds().origin());
+ panel_testing->DragTitlebar(new_mouse_location);
+ panel_testing->FinishDragTitlebar();
+ }
+
+ static gfx::Point GetDragDeltaToRemainDocked() {
+ return gfx::Point(
+ -5,
+ -(PanelDragController::GetDetachDockedPanelThreshold() / 2));
+ }
+
+ static gfx::Point GetDragDeltaToDetach() {
+ return gfx::Point(
+ -20,
+ -(PanelDragController::GetDetachDockedPanelThreshold() + 20));
+ }
+
+ static gfx::Point GetDragDeltaToRemainDetached(Panel* panel) {
+ int distance = panel->manager()->docked_strip()->display_area().bottom() -
+ panel->GetBounds().bottom();
+ return gfx::Point(
+ -5,
+ distance - PanelDragController::GetDockDetachedPanelThreshold() * 2);
+ }
+
+ static gfx::Point GetDragDeltaToAttach(Panel* panel) {
+ int distance = panel->manager()->docked_strip()->display_area().bottom() -
+ panel->GetBounds().bottom();
+ return gfx::Point(
+ -20,
+ distance - PanelDragController::GetDockDetachedPanelThreshold() / 2);
+ }
+};
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragOneDockedPanel) {
+ static const int big_delta_x = 70;
+ static const int big_delta_y = 30; // Do not exceed the threshold to detach.
+
+ Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
+ scoped_ptr<NativePanelTesting> panel_testing(
+ NativePanelTesting::Create(panel->native_panel()));
+ gfx::Rect panel_old_bounds = panel->GetBounds();
+
+ // Drag left.
+ gfx::Point mouse_location = panel_old_bounds.origin();
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ mouse_location.Offset(-big_delta_x, 0);
+ panel_testing->DragTitlebar(mouse_location);
+ gfx::Rect panel_new_bounds = panel_old_bounds;
+ panel_new_bounds.Offset(-big_delta_x, 0);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ panel_testing->FinishDragTitlebar();
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ // Drag left and cancel.
+ mouse_location = panel_old_bounds.origin();
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ mouse_location.Offset(-big_delta_x, 0);
+ panel_testing->DragTitlebar(mouse_location);
+ panel_new_bounds = panel_old_bounds;
+ panel_new_bounds.Offset(-big_delta_x, 0);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ panel_testing->CancelDragTitlebar();
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ // Drag right.
+ mouse_location = panel_old_bounds.origin();
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ mouse_location.Offset(big_delta_x, 0);
+ panel_testing->DragTitlebar(mouse_location);
+ panel_new_bounds = panel_old_bounds;
+ panel_new_bounds.Offset(big_delta_x, 0);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ panel_testing->FinishDragTitlebar();
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ // Drag right and up. Expect no vertical movement.
+ mouse_location = panel_old_bounds.origin();
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ mouse_location.Offset(big_delta_x, big_delta_y);
+ panel_testing->DragTitlebar(mouse_location);
+ panel_new_bounds = panel_old_bounds;
+ panel_new_bounds.Offset(big_delta_x, 0);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ panel_testing->FinishDragTitlebar();
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ // Drag up. Expect no movement on drag.
+ mouse_location = panel_old_bounds.origin();
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ mouse_location.Offset(0, -big_delta_y);
+ panel_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ panel_testing->FinishDragTitlebar();
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ // Drag down. Expect no movement on drag.
+ mouse_location = panel_old_bounds.origin();
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ mouse_location.Offset(0, big_delta_y);
+ panel_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ panel_testing->FinishDragTitlebar();
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ PanelManager::GetInstance()->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragTwoDockedPanels) {
+ static const gfx::Point small_delta(10, 0);
+
+ Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
+ Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 100, 100));
+ scoped_ptr<NativePanelTesting> panel1_testing(
+ NativePanelTesting::Create(panel1->native_panel()));
+ scoped_ptr<NativePanelTesting> panel2_testing(
+ NativePanelTesting::Create(panel2->native_panel()));
+ gfx::Point position1 = panel1->GetBounds().origin();
+ gfx::Point position2 = panel2->GetBounds().origin();
+
+ // Drag right panel towards left with small delta.
+ // Expect no shuffle: P1 P2
+ gfx::Point mouse_location = position1;
+ panel1_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel2->GetBounds().origin());
+
+ mouse_location = mouse_location.Subtract(small_delta);
+ panel1_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(mouse_location, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel2->GetBounds().origin());
+
+ panel1_testing->FinishDragTitlebar();
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel2->GetBounds().origin());
+
+ // Drag right panel towards left with big delta.
+ // Expect shuffle: P2 P1
+ mouse_location = position1;
+ panel1_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel2->GetBounds().origin());
+
+ mouse_location = position2.Add(gfx::Point(1, 0));
+ panel1_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(mouse_location, panel1->GetBounds().origin());
+ EXPECT_EQ(position1, panel2->GetBounds().origin());
+
+ panel1_testing->FinishDragTitlebar();
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position1, panel2->GetBounds().origin());
+
+ // Drag left panel towards right with small delta.
+ // Expect no shuffle: P2 P1
+ mouse_location = position2;
+ panel1_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position1, panel2->GetBounds().origin());
+
+ mouse_location = mouse_location.Add(small_delta);
+ panel1_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(mouse_location, panel1->GetBounds().origin());
+ EXPECT_EQ(position1, panel2->GetBounds().origin());
+
+ panel1_testing->FinishDragTitlebar();
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position1, panel2->GetBounds().origin());
+
+ // Drag left panel towards right with big delta.
+ // Expect shuffle: P1 P2
+ mouse_location = position2;
+ panel1_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position1, panel2->GetBounds().origin());
+
+ mouse_location = position1.Add(gfx::Point(1, 0));
+ panel1_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(mouse_location, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel2->GetBounds().origin());
+
+ panel1_testing->FinishDragTitlebar();
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel2->GetBounds().origin());
+
+ // Drag right panel towards left with big delta and then cancel the drag.
+ // Expect shuffle after drag: P2 P1
+ // Expect shuffle after cancel: P1 P2
+ mouse_location = position1;
+ panel1_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel2->GetBounds().origin());
+
+ mouse_location = position2.Add(gfx::Point(1, 0));
+ panel1_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(mouse_location, panel1->GetBounds().origin());
+ EXPECT_EQ(position1, panel2->GetBounds().origin());
+
+ panel1_testing->CancelDragTitlebar();
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel2->GetBounds().origin());
+
+ PanelManager::GetInstance()->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragThreeDockedPanels) {
+ Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
+ Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 100, 100));
+ Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 100, 100));
+ scoped_ptr<NativePanelTesting> panel2_testing(
+ NativePanelTesting::Create(panel2->native_panel()));
+ scoped_ptr<NativePanelTesting> panel3_testing(
+ NativePanelTesting::Create(panel3->native_panel()));
+ gfx::Point position1 = panel1->GetBounds().origin();
+ gfx::Point position2 = panel2->GetBounds().origin();
+ gfx::Point position3 = panel3->GetBounds().origin();
+
+ // Drag leftmost panel to become the rightmost in 2 drags. Each drag will
+ // shuffle one panel.
+ // Expect shuffle after 1st drag: P1 P3 P2
+ // Expect shuffle after 2nd drag: P3 P1 P2
+ gfx::Point mouse_location = position3;
+ panel3_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel2->GetBounds().origin());
+ EXPECT_EQ(position3, panel3->GetBounds().origin());
+
+ mouse_location = position2.Add(gfx::Point(1, 0));
+ panel3_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position3, panel2->GetBounds().origin());
+ EXPECT_EQ(mouse_location, panel3->GetBounds().origin());
+
+ mouse_location = position1.Add(gfx::Point(1, 0));
+ panel3_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position3, panel2->GetBounds().origin());
+ EXPECT_EQ(mouse_location, panel3->GetBounds().origin());
+
+ panel3_testing->FinishDragTitlebar();
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position3, panel2->GetBounds().origin());
+ EXPECT_EQ(position1, panel3->GetBounds().origin());
+
+ // Drag rightmost panel to become the leftmost in 2 drags and then cancel the
+ // drag. Each drag will shuffle one panel and the cancellation will restore
+ // all panels.
+ // Expect shuffle after 1st drag: P1 P3 P2
+ // Expect shuffle after 2nd drag: P1 P2 P3
+ // Expect shuffle after cancel: P3 P1 P2
+ mouse_location = position1;
+ panel3_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position3, panel2->GetBounds().origin());
+ EXPECT_EQ(position1, panel3->GetBounds().origin());
+
+ mouse_location = position2.Add(gfx::Point(1, 0));
+ panel3_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position3, panel2->GetBounds().origin());
+ EXPECT_EQ(mouse_location, panel3->GetBounds().origin());
+
+ mouse_location = position3.Add(gfx::Point(1, 0));
+ panel3_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel2->GetBounds().origin());
+ EXPECT_EQ(mouse_location, panel3->GetBounds().origin());
+
+ panel3_testing->CancelDragTitlebar();
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position3, panel2->GetBounds().origin());
+ EXPECT_EQ(position1, panel3->GetBounds().origin());
+
+ // Drag leftmost panel to become the rightmost in a single drag. The drag will
+ // shuffle 2 panels at a time.
+ // Expect shuffle: P2 P3 P1
+ mouse_location = position3;
+ panel2_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position3, panel2->GetBounds().origin());
+ EXPECT_EQ(position1, panel3->GetBounds().origin());
+
+ mouse_location = position1.Add(gfx::Point(1, 0));
+ panel2_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(position3, panel1->GetBounds().origin());
+ EXPECT_EQ(mouse_location, panel2->GetBounds().origin());
+ EXPECT_EQ(position2, panel3->GetBounds().origin());
+
+ panel2_testing->FinishDragTitlebar();
+ EXPECT_EQ(position3, panel1->GetBounds().origin());
+ EXPECT_EQ(position1, panel2->GetBounds().origin());
+ EXPECT_EQ(position2, panel3->GetBounds().origin());
+
+ // Drag rightmost panel to become the leftmost in a single drag. The drag will
+ // shuffle 2 panels at a time.
+ // Expect shuffle: P3 P1 P2
+ mouse_location = position1;
+ panel2_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(position3, panel1->GetBounds().origin());
+ EXPECT_EQ(position1, panel2->GetBounds().origin());
+ EXPECT_EQ(position2, panel3->GetBounds().origin());
+
+ mouse_location = position3.Add(gfx::Point(1, 0));
+ panel2_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(mouse_location, panel2->GetBounds().origin());
+ EXPECT_EQ(position1, panel3->GetBounds().origin());
+
+ panel2_testing->FinishDragTitlebar();
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position3, panel2->GetBounds().origin());
+ EXPECT_EQ(position1, panel3->GetBounds().origin());
+
+ // Drag rightmost panel to become the leftmost in a single drag and then
+ // cancel the drag. The drag will shuffle 2 panels and the cancellation will
+ // restore all panels.
+ // Expect shuffle after drag: P1 P2 P3
+ // Expect shuffle after cancel: P3 P1 P2
+ mouse_location = position1;
+ panel3_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position3, panel2->GetBounds().origin());
+ EXPECT_EQ(position1, panel3->GetBounds().origin());
+
+ mouse_location = position3.Add(gfx::Point(1, 0));
+ panel3_testing->DragTitlebar(mouse_location);
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel2->GetBounds().origin());
+ EXPECT_EQ(mouse_location, panel3->GetBounds().origin());
+
+ panel3_testing->CancelDragTitlebar();
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ EXPECT_EQ(position3, panel2->GetBounds().origin());
+ EXPECT_EQ(position1, panel3->GetBounds().origin());
+
+ PanelManager::GetInstance()->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragMinimizedPanel) {
+ // We'll simulate mouse movements for test.
+ PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
+ PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
+
+ Panel* panel = CreatePanel("panel1");
+ scoped_ptr<NativePanelTesting> panel_testing(
+ NativePanelTesting::Create(panel->native_panel()));
+
+ panel->Minimize();
+ EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
+
+ // Hover over minimized panel to bring up titlebar.
+ gfx::Point hover_point(panel->GetBounds().origin());
+ MoveMouseAndWaitForExpansionStateChange(panel, hover_point);
+ EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
+
+ // Verify we can drag a minimized panel.
+ gfx::Rect panel_old_bounds = panel->GetBounds();
+ gfx::Point mouse_location = panel_old_bounds.origin();
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+ EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
+
+ mouse_location.Offset(-70, 0);
+ panel_testing->DragTitlebar(mouse_location);
+ gfx::Rect panel_new_bounds = panel_old_bounds;
+ panel_new_bounds.Offset(-70, 0);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+ EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
+
+ // Verify panel returns to fully minimized state after dragging ends once
+ // mouse moves away from panel.
+ panel_testing->FinishDragTitlebar();
+ EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
+
+ MoveMouseAndWaitForExpansionStateChange(panel, mouse_location);
+ EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
+
+ panel->Close();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest,
+ DragMinimizedPanelWhileDrawingAttention) {
+ // We'll simulate mouse movements for test.
+ PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
+ PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
+
+ Panel* panel = CreatePanel("panel1");
+ scoped_ptr<NativePanelTesting> panel_testing(
+ NativePanelTesting::Create(panel->native_panel()));
+ CreatePanel("panel2");
+
+ panel->Minimize();
+ EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
+
+ panel->FlashFrame(true);
+ EXPECT_TRUE(panel->IsDrawingAttention());
+ EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
+
+ // Drag the panel. Verify panel stays in title-only state after attention is
+ // cleared because it is being dragged.
+ gfx::Rect panel_old_bounds = panel->GetBounds();
+ gfx::Point mouse_location = panel_old_bounds.origin();
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+ EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
+
+ mouse_location.Offset(-70, 0);
+ panel_testing->DragTitlebar(mouse_location);
+ gfx::Rect panel_new_bounds = panel_old_bounds;
+ panel_new_bounds.Offset(-70, 0);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ panel->FlashFrame(false);
+ EXPECT_FALSE(panel->IsDrawingAttention());
+ EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
+
+ // Verify panel returns to fully minimized state after dragging ends once
+ // mouse moves away from the panel.
+ panel_testing->FinishDragTitlebar();
+ EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
+
+ mouse_location.Offset(0, -50);
+ MoveMouseAndWaitForExpansionStateChange(panel, mouse_location);
+ EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
+
+ PanelManager::GetInstance()->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, CloseDockedPanelOnDrag) {
+ PanelManager* panel_manager = PanelManager::GetInstance();
+ PanelDragController* drag_controller = panel_manager->drag_controller();
+ DockedPanelStrip* docked_strip = panel_manager->docked_strip();
+
+ // Create 4 docked panels.
+ // We have: P4 P3 P2 P1
+ Panel* panel1 = CreatePanelWithBounds("Panel1", gfx::Rect(0, 0, 100, 100));
+ Panel* panel2 = CreatePanelWithBounds("Panel2", gfx::Rect(0, 0, 100, 100));
+ Panel* panel3 = CreatePanelWithBounds("Panel3", gfx::Rect(0, 0, 100, 100));
+ Panel* panel4 = CreatePanelWithBounds("Panel4", gfx::Rect(0, 0, 100, 100));
+ ASSERT_EQ(4, docked_strip->num_panels());
+
+ scoped_ptr<NativePanelTesting> panel1_testing(
+ NativePanelTesting::Create(panel1->native_panel()));
+ gfx::Point position1 = panel1->GetBounds().origin();
+ gfx::Point position2 = panel2->GetBounds().origin();
+ gfx::Point position3 = panel3->GetBounds().origin();
+ gfx::Point position4 = panel4->GetBounds().origin();
+
+ // Test the scenario: drag a panel, close another panel, cancel the drag.
+ {
+ std::vector<Panel*> panels;
+ gfx::Point panel1_new_position = position1;
+ panel1_new_position.Offset(-500, 0);
+
+ // Start dragging a panel.
+ // We have: P1* P4 P3 P2
+ gfx::Point mouse_location = panel1->GetBounds().origin();
+ panel1_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ mouse_location.Offset(-500, -5);
+ panel1_testing->DragTitlebar(mouse_location);
+ EXPECT_TRUE(drag_controller->IsDragging());
+ EXPECT_EQ(panel1, drag_controller->dragging_panel());
+
+ ASSERT_EQ(4, docked_strip->num_panels());
+ panels = PanelManager::GetInstance()->panels();
+ EXPECT_EQ(panel2, panels[0]);
+ EXPECT_EQ(panel3, panels[1]);
+ EXPECT_EQ(panel4, panels[2]);
+ EXPECT_EQ(panel1, panels[3]);
+ EXPECT_EQ(position1, panel2->GetBounds().origin());
+ EXPECT_EQ(position2, panel3->GetBounds().origin());
+ EXPECT_EQ(position3, panel4->GetBounds().origin());
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+
+ // Closing another panel while dragging in progress will keep the dragging
+ // panel intact.
+ // We have: P1* P4 P3
+ CloseWindowAndWait(panel2);
+ EXPECT_TRUE(drag_controller->IsDragging());
+ EXPECT_EQ(panel1, drag_controller->dragging_panel());
+
+ ASSERT_EQ(3, docked_strip->num_panels());
+ panels = PanelManager::GetInstance()->panels();
+ EXPECT_EQ(panel3, panels[0]);
+ EXPECT_EQ(panel4, panels[1]);
+ EXPECT_EQ(panel1, panels[2]);
+ EXPECT_EQ(position1, panel3->GetBounds().origin());
+ EXPECT_EQ(position2, panel4->GetBounds().origin());
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+
+ // Cancel the drag.
+ // We have: P4 P3 P1
+ panel1_testing->CancelDragTitlebar();
+ EXPECT_FALSE(drag_controller->IsDragging());
+
+ ASSERT_EQ(3, docked_strip->num_panels());
+ panels = PanelManager::GetInstance()->panels();
+ EXPECT_EQ(panel1, panels[0]);
+ EXPECT_EQ(panel3, panels[1]);
+ EXPECT_EQ(panel4, panels[2]);
+ EXPECT_EQ(position1, panel1->GetBounds().origin());
+ EXPECT_EQ(position2, panel3->GetBounds().origin());
+ EXPECT_EQ(position3, panel4->GetBounds().origin());
+ }
+
+ // Test the scenario: drag a panel, close another panel, end the drag.
+ {
+ std::vector<Panel*> panels;
+ gfx::Point panel1_new_position = position1;
+ panel1_new_position.Offset(-500, 0);
+
+ // Start dragging a panel.
+ // We have: P1* P4 P3
+ gfx::Point mouse_location = panel1->GetBounds().origin();
+ panel1_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ mouse_location.Offset(-500, -5);
+ panel1_testing->DragTitlebar(mouse_location);
+ EXPECT_TRUE(drag_controller->IsDragging());
+ EXPECT_EQ(panel1, drag_controller->dragging_panel());
+
+ ASSERT_EQ(3, docked_strip->num_panels());
+ panels = PanelManager::GetInstance()->panels();
+ EXPECT_EQ(panel3, panels[0]);
+ EXPECT_EQ(panel4, panels[1]);
+ EXPECT_EQ(panel1, panels[2]);
+ EXPECT_EQ(position1, panel3->GetBounds().origin());
+ EXPECT_EQ(position2, panel4->GetBounds().origin());
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+
+ // Closing another panel while dragging in progress will keep the dragging
+ // panel intact.
+ // We have: P1* P4
+ CloseWindowAndWait(panel3);
+ EXPECT_TRUE(drag_controller->IsDragging());
+ EXPECT_EQ(panel1, drag_controller->dragging_panel());
+
+ ASSERT_EQ(2, docked_strip->num_panels());
+ panels = PanelManager::GetInstance()->panels();
+ EXPECT_EQ(panel4, panels[0]);
+ EXPECT_EQ(panel1, panels[1]);
+ EXPECT_EQ(position1, panel4->GetBounds().origin());
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+
+ // Finish the drag.
+ // We have: P1 P4
+ panel1_testing->FinishDragTitlebar();
+ EXPECT_FALSE(drag_controller->IsDragging());
+
+ ASSERT_EQ(2, docked_strip->num_panels());
+ panels = PanelManager::GetInstance()->panels();
+ EXPECT_EQ(panel4, panels[0]);
+ EXPECT_EQ(panel1, panels[1]);
+ EXPECT_EQ(position1, panel4->GetBounds().origin());
+ EXPECT_EQ(position2, panel1->GetBounds().origin());
+ }
+
+ // Test the scenario: drag a panel and close the dragging panel.
+ {
+ std::vector<Panel*> panels;
+ gfx::Point panel1_new_position = position2;
+ panel1_new_position.Offset(-500, 0);
+
+ // Start dragging a panel again.
+ // We have: P1* P4
+ gfx::Point mouse_location = panel1->GetBounds().origin();
+ panel1_testing->PressLeftMouseButtonTitlebar(mouse_location);
+ mouse_location.Offset(-500, -5);
+ panel1_testing->DragTitlebar(mouse_location);
+ EXPECT_TRUE(drag_controller->IsDragging());
+ EXPECT_EQ(panel1, drag_controller->dragging_panel());
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+
+ ASSERT_EQ(2, docked_strip->num_panels());
+ panels = PanelManager::GetInstance()->panels();
+ EXPECT_EQ(panel4, panels[0]);
+ EXPECT_EQ(panel1, panels[1]);
+ EXPECT_EQ(position1, panel4->GetBounds().origin());
+
+ // Closing the dragging panel should end the drag.
+ // We have: P4
+ CloseWindowAndWait(panel1);
+ EXPECT_FALSE(drag_controller->IsDragging());
+
+ ASSERT_EQ(1, docked_strip->num_panels());
+ panels = PanelManager::GetInstance()->panels();
+ EXPECT_EQ(panel4, panels[0]);
+ EXPECT_EQ(position1, panel4->GetBounds().origin());
+ }
+
+ panel_manager->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragOneDetachedPanel) {
+ Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
+
+ // 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();
+
+ panel_testing->PressLeftMouseButtonTitlebar(origin);
+ EXPECT_EQ(origin, panel->GetBounds().origin());
+
+ origin.Offset(-51, -102);
+ panel_testing->DragTitlebar(origin);
+ EXPECT_EQ(origin, panel->GetBounds().origin());
+
+ origin.Offset(37, 45);
+ panel_testing->DragTitlebar(origin);
+ EXPECT_EQ(origin, panel->GetBounds().origin());
+
+ panel_testing->FinishDragTitlebar();
+ EXPECT_EQ(origin, panel->GetBounds().origin());
+
+ // Test that cancelling the drag will return the panel the the original
+ // position.
+ gfx::Point original_position = panel->GetBounds().origin();
+ origin = original_position;
+
+ panel_testing->PressLeftMouseButtonTitlebar(origin);
+ EXPECT_EQ(origin, panel->GetBounds().origin());
+
+ origin.Offset(-51, -102);
+ panel_testing->DragTitlebar(origin);
+ EXPECT_EQ(origin, panel->GetBounds().origin());
+
+ origin.Offset(37, 45);
+ panel_testing->DragTitlebar(origin);
+ EXPECT_EQ(origin, panel->GetBounds().origin());
+
+ panel_testing->CancelDragTitlebar();
+ WaitForBoundsAnimationFinished(panel);
+ EXPECT_EQ(original_position, panel->GetBounds().origin());
+
+ PanelManager::GetInstance()->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, CloseDetachedPanelOnDrag) {
+ PanelManager* panel_manager = PanelManager::GetInstance();
+ PanelDragController* drag_controller = panel_manager->drag_controller();
+ DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
+
+ // Create 4 detached panels.
+ 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(
+ NativePanelTesting::Create(panel1->native_panel()));
+ gfx::Point panel1_old_position = panel1->GetBounds().origin();
+ gfx::Point panel2_position = panel2->GetBounds().origin();
+ gfx::Point panel3_position = panel3->GetBounds().origin();
+ gfx::Point panel4_position = panel4->GetBounds().origin();
+
+ // Test the scenario: drag a panel, close another panel, cancel the drag.
+ {
+ gfx::Point panel1_new_position = panel1_old_position;
+ panel1_new_position.Offset(-51, -102);
+
+ // Start dragging a panel.
+ panel1_testing->PressLeftMouseButtonTitlebar(panel1->GetBounds().origin());
+ panel1_testing->DragTitlebar(panel1_new_position);
+ EXPECT_TRUE(drag_controller->IsDragging());
+ EXPECT_EQ(panel1, drag_controller->dragging_panel());
+
+ ASSERT_EQ(4, detached_strip->num_panels());
+ EXPECT_TRUE(detached_strip->HasPanel(panel1));
+ EXPECT_TRUE(detached_strip->HasPanel(panel2));
+ EXPECT_TRUE(detached_strip->HasPanel(panel3));
+ EXPECT_TRUE(detached_strip->HasPanel(panel4));
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+ EXPECT_EQ(panel2_position, panel2->GetBounds().origin());
+ EXPECT_EQ(panel3_position, panel3->GetBounds().origin());
+ EXPECT_EQ(panel4_position, panel4->GetBounds().origin());
+
+ // Closing another panel while dragging in progress will keep the dragging
+ // panel intact.
+ CloseWindowAndWait(panel2);
+ EXPECT_TRUE(drag_controller->IsDragging());
+ EXPECT_EQ(panel1, drag_controller->dragging_panel());
+
+ ASSERT_EQ(3, detached_strip->num_panels());
+ EXPECT_TRUE(detached_strip->HasPanel(panel1));
+ EXPECT_TRUE(detached_strip->HasPanel(panel3));
+ EXPECT_TRUE(detached_strip->HasPanel(panel4));
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+ EXPECT_EQ(panel3_position, panel3->GetBounds().origin());
+ EXPECT_EQ(panel4_position, panel4->GetBounds().origin());
+
+ // Cancel the drag.
+ panel1_testing->CancelDragTitlebar();
+ WaitForBoundsAnimationFinished(panel1);
+ EXPECT_FALSE(drag_controller->IsDragging());
+
+ ASSERT_EQ(3, detached_strip->num_panels());
+ EXPECT_TRUE(detached_strip->HasPanel(panel1));
+ EXPECT_TRUE(detached_strip->HasPanel(panel3));
+ EXPECT_TRUE(detached_strip->HasPanel(panel4));
+ EXPECT_EQ(panel1_old_position, panel1->GetBounds().origin());
+ EXPECT_EQ(panel3_position, panel3->GetBounds().origin());
+ EXPECT_EQ(panel4_position, panel4->GetBounds().origin());
+ }
+
+ // Test the scenario: drag a panel, close another panel, end the drag.
+ {
+ gfx::Point panel1_new_position = panel1_old_position;
+ panel1_new_position.Offset(-51, -102);
+
+ // Start dragging a panel.
+ panel1_testing->PressLeftMouseButtonTitlebar(panel1->GetBounds().origin());
+ panel1_testing->DragTitlebar(panel1_new_position);
+ EXPECT_TRUE(drag_controller->IsDragging());
+ EXPECT_EQ(panel1, drag_controller->dragging_panel());
+
+ ASSERT_EQ(3, detached_strip->num_panels());
+ EXPECT_TRUE(detached_strip->HasPanel(panel1));
+ EXPECT_TRUE(detached_strip->HasPanel(panel3));
+ EXPECT_TRUE(detached_strip->HasPanel(panel4));
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+ EXPECT_EQ(panel3_position, panel3->GetBounds().origin());
+ EXPECT_EQ(panel4_position, panel4->GetBounds().origin());
+
+ // Closing another panel while dragging in progress will keep the dragging
+ // panel intact.
+ CloseWindowAndWait(panel3);
+ EXPECT_TRUE(drag_controller->IsDragging());
+ EXPECT_EQ(panel1, drag_controller->dragging_panel());
+
+ ASSERT_EQ(2, detached_strip->num_panels());
+ EXPECT_TRUE(detached_strip->HasPanel(panel1));
+ EXPECT_TRUE(detached_strip->HasPanel(panel4));
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+ EXPECT_EQ(panel4_position, panel4->GetBounds().origin());
+
+ // Finish the drag.
+ panel1_testing->FinishDragTitlebar();
+ EXPECT_FALSE(drag_controller->IsDragging());
+
+ ASSERT_EQ(2, detached_strip->num_panels());
+ EXPECT_TRUE(detached_strip->HasPanel(panel1));
+ EXPECT_TRUE(detached_strip->HasPanel(panel4));
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+ EXPECT_EQ(panel4_position, panel4->GetBounds().origin());
+ }
+
+ // Test the scenario: drag a panel and close the dragging panel.
+ {
+ gfx::Point panel1_new_position = panel1->GetBounds().origin();
+ panel1_new_position.Offset(-51, -102);
+
+ // Start dragging a panel again.
+ panel1_testing->PressLeftMouseButtonTitlebar(panel1->GetBounds().origin());
+ panel1_testing->DragTitlebar(panel1_new_position);
+ EXPECT_TRUE(drag_controller->IsDragging());
+ EXPECT_EQ(panel1, drag_controller->dragging_panel());
+
+ ASSERT_EQ(2, detached_strip->num_panels());
+ EXPECT_TRUE(detached_strip->HasPanel(panel1));
+ EXPECT_TRUE(detached_strip->HasPanel(panel4));
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+ EXPECT_EQ(panel4_position, panel4->GetBounds().origin());
+
+ // Closing the dragging panel should end the drag.
+ CloseWindowAndWait(panel1);
+ EXPECT_FALSE(drag_controller->IsDragging());
+
+ ASSERT_EQ(1, detached_strip->num_panels());
+ EXPECT_TRUE(detached_strip->HasPanel(panel4));
+ EXPECT_EQ(panel4_position, panel4->GetBounds().origin());
+ }
+
+ panel_manager->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Detach) {
+ PanelManager* panel_manager = PanelManager::GetInstance();
+ DockedPanelStrip* docked_strip = panel_manager->docked_strip();
+ DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
+
+ // Create one docked panel.
+ Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
+ ASSERT_EQ(1, docked_strip->num_panels());
+ ASSERT_EQ(0, detached_strip->num_panels());
+
+ gfx::Rect panel_old_bounds = panel->GetBounds();
+
+ // Press on title-bar.
+ scoped_ptr<NativePanelTesting> panel_testing(
+ NativePanelTesting::Create(panel->native_panel()));
+ gfx::Point mouse_location(panel->GetBounds().origin());
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+
+ // Drag up the panel in a small offset that does not trigger the detach.
+ // Expect that the panel is still docked and only x coordinate of its position
+ // is changed.
+ gfx::Point drag_delta_to_remain_docked = GetDragDeltaToRemainDocked();
+ mouse_location = mouse_location.Add(drag_delta_to_remain_docked);
+ panel_testing->DragTitlebar(mouse_location);
+ ASSERT_EQ(1, docked_strip->num_panels());
+ ASSERT_EQ(0, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
+ gfx::Rect panel_new_bounds = panel_old_bounds;
+ panel_new_bounds.Offset(drag_delta_to_remain_docked.x(), 0);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ // Continue dragging up the panel in big offset that triggers the detach.
+ // Expect that the panel is previewed as detached.
+ gfx::Point drag_delta_to_detach = GetDragDeltaToDetach();
+ mouse_location = mouse_location.Add(drag_delta_to_detach);
+ panel_testing->DragTitlebar(mouse_location);
+ ASSERT_EQ(0, docked_strip->num_panels());
+ ASSERT_EQ(1, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+ panel_new_bounds.Offset(
+ drag_delta_to_detach.x(),
+ drag_delta_to_detach.y() + drag_delta_to_remain_docked.y());
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ // Finish the drag.
+ // Expect that the panel stays as detached.
+ panel_testing->FinishDragTitlebar();
+ ASSERT_EQ(0, docked_strip->num_panels());
+ ASSERT_EQ(1, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ panel_manager->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAndCancel) {
+ PanelManager* panel_manager = PanelManager::GetInstance();
+ DockedPanelStrip* docked_strip = panel_manager->docked_strip();
+ DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
+
+ // Create one docked panel.
+ Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
+ ASSERT_EQ(1, docked_strip->num_panels());
+ ASSERT_EQ(0, detached_strip->num_panels());
+
+ gfx::Rect panel_old_bounds = panel->GetBounds();
+
+ // Press on title-bar.
+ scoped_ptr<NativePanelTesting> panel_testing(
+ NativePanelTesting::Create(panel->native_panel()));
+ gfx::Point mouse_location(panel->GetBounds().origin());
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+
+ // Drag up the panel in a small offset that does not trigger the detach.
+ // Expect that the panel is still docked and only x coordinate of its position
+ // is changed.
+ gfx::Point drag_delta_to_remain_docked = GetDragDeltaToRemainDocked();
+ mouse_location = mouse_location.Add(drag_delta_to_remain_docked);
+ panel_testing->DragTitlebar(mouse_location);
+ ASSERT_EQ(1, docked_strip->num_panels());
+ ASSERT_EQ(0, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
+ gfx::Rect panel_new_bounds = panel_old_bounds;
+ panel_new_bounds.Offset(drag_delta_to_remain_docked.x(), 0);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ // Continue dragging up the panel in big offset that triggers the detach.
+ // Expect that the panel is previewed as detached.
+ gfx::Point drag_delta_to_detach = GetDragDeltaToDetach();
+ mouse_location = mouse_location.Add(drag_delta_to_detach);
+ panel_testing->DragTitlebar(mouse_location);
+ ASSERT_EQ(0, docked_strip->num_panels());
+ ASSERT_EQ(1, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+ panel_new_bounds.Offset(
+ drag_delta_to_detach.x(),
+ drag_delta_to_detach.y() + drag_delta_to_remain_docked.y());
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ // Cancel the drag.
+ // Expect that the panel is back as docked.
+ panel_testing->CancelDragTitlebar();
+ ASSERT_EQ(1, docked_strip->num_panels());
+ ASSERT_EQ(0, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ panel_manager->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, Attach) {
+ PanelManager* panel_manager = PanelManager::GetInstance();
+ DockedPanelStrip* docked_strip = panel_manager->docked_strip();
+ DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
+
+ // Create one detached panel.
+ Panel* panel = CreateDetachedPanel("1", gfx::Rect(400, 300, 100, 100));
+ ASSERT_EQ(0, docked_strip->num_panels());
+ ASSERT_EQ(1, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+
+ gfx::Rect panel_old_bounds = panel->GetBounds();
+
+ // Press on title-bar.
+ scoped_ptr<NativePanelTesting> panel_testing(
+ NativePanelTesting::Create(panel->native_panel()));
+ gfx::Point mouse_location(panel->GetBounds().origin());
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+
+ // Drag down the panel but not close enough to the bottom of work area.
+ // Expect that the panel is still detached.
+ gfx::Point drag_delta_to_remain_detached =
+ GetDragDeltaToRemainDetached(panel);
+ mouse_location = mouse_location.Add(drag_delta_to_remain_detached);
+ panel_testing->DragTitlebar(mouse_location);
+ ASSERT_EQ(0, docked_strip->num_panels());
+ ASSERT_EQ(1, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+ gfx::Rect panel_new_bounds = panel_old_bounds;
+ panel_new_bounds.Offset(drag_delta_to_remain_detached);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ // Continue dragging down the panel to make it close enough to the bottom of
+ // work area.
+ // Expect that the panel is previewed as docked.
+ gfx::Point drag_delta_to_attach = GetDragDeltaToAttach(panel);
+ mouse_location = mouse_location.Add(drag_delta_to_attach);
+ panel_testing->DragTitlebar(mouse_location);
+ ASSERT_EQ(1, docked_strip->num_panels());
+ ASSERT_EQ(0, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
+ panel_new_bounds.Offset(drag_delta_to_attach);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ // Finish the drag.
+ // Expect that the panel stays as docked and moves to the final position.
+ panel_testing->FinishDragTitlebar();
+ ASSERT_EQ(1, docked_strip->num_panels());
+ ASSERT_EQ(0, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
+ panel_new_bounds.set_x(
+ docked_strip->StartingRightPosition() - panel_new_bounds.width());
+ panel_new_bounds.set_y(
+ docked_strip->display_area().bottom() - panel_new_bounds.height());
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ panel_manager->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachAndCancel) {
+ PanelManager* panel_manager = PanelManager::GetInstance();
+ DockedPanelStrip* docked_strip = panel_manager->docked_strip();
+ DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
+
+ // Create one detached panel.
+ Panel* panel = CreateDetachedPanel("1", gfx::Rect(400, 300, 100, 100));
+ ASSERT_EQ(0, docked_strip->num_panels());
+ ASSERT_EQ(1, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+
+ gfx::Rect panel_old_bounds = panel->GetBounds();
+
+ // Press on title-bar.
+ scoped_ptr<NativePanelTesting> panel_testing(
+ NativePanelTesting::Create(panel->native_panel()));
+ gfx::Point mouse_location(panel->GetBounds().origin());
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+
+ // Drag down the panel but not close enough to the bottom of work area.
+ // Expect that the panel is still detached.
+ gfx::Point drag_delta_to_remain_detached =
+ GetDragDeltaToRemainDetached(panel);
+ mouse_location = mouse_location.Add(drag_delta_to_remain_detached);
+ panel_testing->DragTitlebar(mouse_location);
+ ASSERT_EQ(0, docked_strip->num_panels());
+ ASSERT_EQ(1, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+ gfx::Rect panel_new_bounds = panel_old_bounds;
+ panel_new_bounds.Offset(drag_delta_to_remain_detached);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ // Continue dragging down the panel to make it close enough to the bottom of
+ // work area.
+ // Expect that the panel is previewed as docked.
+ gfx::Point drag_delta_to_attach = GetDragDeltaToAttach(panel);
+ mouse_location = mouse_location.Add(drag_delta_to_attach);
+ panel_testing->DragTitlebar(mouse_location);
+ ASSERT_EQ(1, docked_strip->num_panels());
+ ASSERT_EQ(0, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
+ panel_new_bounds.Offset(drag_delta_to_attach);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ // Cancel the drag.
+ // Expect that the panel is back as detached.
+ panel_testing->CancelDragTitlebar();
+ ASSERT_EQ(0, docked_strip->num_panels());
+ ASSERT_EQ(1, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ panel_manager->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachAttachAndCancel) {
+ PanelManager* panel_manager = PanelManager::GetInstance();
+ DockedPanelStrip* docked_strip = panel_manager->docked_strip();
+ DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
+
+ // Create one docked panel.
+ Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 100, 100));
+ ASSERT_EQ(1, docked_strip->num_panels());
+ ASSERT_EQ(0, detached_strip->num_panels());
+
+ gfx::Rect panel_old_bounds = panel->GetBounds();
+
+ // Press on title-bar.
+ scoped_ptr<NativePanelTesting> panel_testing(
+ NativePanelTesting::Create(panel->native_panel()));
+ gfx::Point mouse_location(panel->GetBounds().origin());
+ panel_testing->PressLeftMouseButtonTitlebar(mouse_location);
+
+ // Drag up the panel to trigger the detach.
+ // Expect that the panel is previewed as detached.
+ gfx::Point drag_delta_to_detach = GetDragDeltaToDetach();
+ mouse_location = mouse_location.Add(drag_delta_to_detach);
+ panel_testing->DragTitlebar(mouse_location);
+ ASSERT_EQ(0, docked_strip->num_panels());
+ ASSERT_EQ(1, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+ gfx::Rect panel_new_bounds = panel_old_bounds;
+ panel_new_bounds.Offset(drag_delta_to_detach);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ // Continue dragging down the panel to trigger the re-attach.
+ gfx::Point drag_delta_to_reattach = GetDragDeltaToAttach(panel);
+ mouse_location = mouse_location.Add(drag_delta_to_reattach);
+ panel_testing->DragTitlebar(mouse_location);
+ ASSERT_EQ(1, docked_strip->num_panels());
+ ASSERT_EQ(0, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
+ panel_new_bounds.Offset(drag_delta_to_reattach);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ // Continue dragging up the panel to trigger the detach again.
+ gfx::Point drag_delta_to_detach_again = GetDragDeltaToDetach();
+ mouse_location = mouse_location.Add(drag_delta_to_detach_again);
+ panel_testing->DragTitlebar(mouse_location);
+ ASSERT_EQ(0, docked_strip->num_panels());
+ ASSERT_EQ(1, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+ panel_new_bounds.Offset(drag_delta_to_detach_again);
+ EXPECT_EQ(panel_new_bounds, panel->GetBounds());
+
+ // Cancel the drag.
+ // Expect that the panel stays as docked.
+ panel_testing->CancelDragTitlebar();
+ ASSERT_EQ(1, docked_strip->num_panels());
+ ASSERT_EQ(0, detached_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DOCKED, panel->panel_strip()->type());
+ EXPECT_EQ(panel_old_bounds, panel->GetBounds());
+
+ panel_manager->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DetachWithSqueeze) {
+ PanelManager* panel_manager = PanelManager::GetInstance();
+ DockedPanelStrip* docked_strip = panel_manager->docked_strip();
+ DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
+
+ gfx::Point drag_delta_to_detach = GetDragDeltaToDetach();
+
+ // Create some docked panels.
+ // docked: P1 P2 P3 P4 P5
+ Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 100));
+ Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 200, 100));
+ Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 200, 100));
+ Panel* panel4 = CreateDockedPanel("4", gfx::Rect(0, 0, 200, 100));
+ Panel* panel5 = CreateDockedPanel("5", gfx::Rect(0, 0, 200, 100));
+ ASSERT_EQ(0, detached_strip->num_panels());
+ ASSERT_EQ(5, docked_strip->num_panels());
+
+ // Drag to detach the middle docked panel.
+ // Expect to have:
+ // detached: P2
+ // docked: P1 P3 P4 P5
+ gfx::Point panel2_docked_position = panel2->GetBounds().origin();
+ DragPanelByDelta(panel2, drag_delta_to_detach);
+ ASSERT_EQ(1, detached_strip->num_panels());
+ ASSERT_EQ(4, docked_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DOCKED, panel1->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DETACHED, panel2->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel3->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel4->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel5->panel_strip()->type());
+ gfx::Point panel2_new_position =
+ panel2_docked_position.Add(drag_delta_to_detach);
+ EXPECT_EQ(panel2_new_position, panel2->GetBounds().origin());
+
+ // Drag to detach the left-most docked panel.
+ // Expect to have:
+ // detached: P2 P4
+ // docked: P1 P3 P5
+ gfx::Point panel4_docked_position = panel4->GetBounds().origin();
+ DragPanelByDelta(panel4, drag_delta_to_detach);
+ ASSERT_EQ(2, detached_strip->num_panels());
+ ASSERT_EQ(3, docked_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DOCKED, panel1->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DETACHED, panel2->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel3->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DETACHED, panel4->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel5->panel_strip()->type());
+ EXPECT_EQ(panel2_new_position, panel2->GetBounds().origin());
+ gfx::Point panel4_new_position =
+ panel4_docked_position.Add(drag_delta_to_detach);
+ EXPECT_EQ(panel4_new_position, panel4->GetBounds().origin());
+
+ // Drag to detach the right-most docked panel.
+ // Expect to have:
+ // detached: P1 P2 P4
+ // docked: P3 P5
+ gfx::Point docked_position1 = panel1->GetBounds().origin();
+ gfx::Point docked_position2 = panel3->GetBounds().origin();
+
+ DragPanelByDelta(panel1, drag_delta_to_detach);
+ ASSERT_EQ(3, detached_strip->num_panels());
+ ASSERT_EQ(2, docked_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel1->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DETACHED, panel2->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel3->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DETACHED, panel4->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel5->panel_strip()->type());
+ gfx::Point panel1_new_position = docked_position1.Add(drag_delta_to_detach);
+ EXPECT_EQ(panel1_new_position, panel1->GetBounds().origin());
+ EXPECT_EQ(panel2_new_position, panel2->GetBounds().origin());
+ EXPECT_EQ(panel4_new_position, panel4->GetBounds().origin());
+
+ // No more squeeze, docked panels should stay put.
+ EXPECT_EQ(docked_position1, panel3->GetBounds().origin());
+ EXPECT_EQ(panel1->GetBounds().width(), panel1->GetRestoredBounds().width());
+ EXPECT_EQ(docked_position2, panel5->GetBounds().origin());
+ EXPECT_EQ(panel2->GetBounds().width(), panel2->GetRestoredBounds().width());
+
+ panel_manager->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, AttachWithSqueeze) {
+ PanelManager* panel_manager = PanelManager::GetInstance();
+ DockedPanelStrip* docked_strip = panel_manager->docked_strip();
+ DetachedPanelStrip* detached_strip = panel_manager->detached_strip();
+
+ // Create some detached, docked panels.
+ // detached: P1 P2 P3
+ // docked: P4 P5 P6 P7
+ Panel* panel1 = CreateDetachedPanel("1", gfx::Rect(100, 300, 200, 100));
+ Panel* panel2 = CreateDetachedPanel("2", gfx::Rect(200, 300, 200, 100));
+ Panel* panel3 = CreateDetachedPanel("3", gfx::Rect(400, 300, 200, 100));
+ Panel* panel4 = CreateDockedPanel("4", gfx::Rect(0, 0, 200, 100));
+ Panel* panel5 = CreateDockedPanel("5", gfx::Rect(0, 0, 200, 100));
+ Panel* panel6 = CreateDockedPanel("6", gfx::Rect(0, 0, 200, 100));
+ Panel* panel7 = CreateDockedPanel("7", gfx::Rect(0, 0, 200, 100));
+ ASSERT_EQ(3, detached_strip->num_panels());
+ ASSERT_EQ(4, docked_strip->num_panels());
+
+ gfx::Point detached_position1 = panel1->GetBounds().origin();
+ gfx::Point detached_position2 = panel2->GetBounds().origin();
+ gfx::Point detached_position3 = panel3->GetBounds().origin();
+ gfx::Point docked_position4 = panel4->GetBounds().origin();
+ gfx::Point docked_position5 = panel5->GetBounds().origin();
+ gfx::Point docked_position6 = panel6->GetBounds().origin();
+ gfx::Point docked_position7 = panel7->GetBounds().origin();
+
+ // Drag to attach a detached panel between 2 docked panels.
+ // Expect to have:
+ // detached: P1 P2
+ // docked: P4 P3 P5 P6 P7
+ gfx::Point drag_to_location(panel5->GetBounds().x() + 10,
+ panel5->GetBounds().y());
+ DragPanelToMouseLocation(panel3, drag_to_location);
+ ASSERT_EQ(2, detached_strip->num_panels());
+ ASSERT_EQ(5, docked_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel1->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DETACHED, panel2->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel3->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel4->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel5->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel6->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel7->panel_strip()->type());
+ EXPECT_EQ(detached_position1, panel1->GetBounds().origin());
+ EXPECT_EQ(detached_position2, panel2->GetBounds().origin());
+
+ // Wait for active states to settle.
+ MessageLoopForUI::current()->RunAllPending();
+
+ // Panel positions should have shifted because of the "squeeze" mode.
+ EXPECT_NE(docked_position4, panel4->GetBounds().origin());
+ EXPECT_LT(panel4->GetBounds().width(), panel4->GetRestoredBounds().width());
+ EXPECT_NE(docked_position5, panel5->GetBounds().origin());
+ EXPECT_LT(panel5->GetBounds().width(), panel5->GetRestoredBounds().width());
+
+#if defined(OS_WIN)
+ // The panel we dragged becomes the active one.
+ EXPECT_EQ(true, panel3->IsActive());
+ EXPECT_EQ(panel3->GetBounds().width(), panel3->GetRestoredBounds().width());
+
+ EXPECT_NE(docked_position6, panel6->GetBounds().origin());
+#else
+ // The last panel is active so these positions do not change.
+ // TODO (ABurago) this is wrong behavior, a panel should activate
+ // when it is dragged. Change the test when the behavior is fixed.
+ EXPECT_EQ(true, panel7->IsActive());
+ EXPECT_EQ(panel7->GetBounds().width(), panel7->GetRestoredBounds().width());
+
+ EXPECT_EQ(docked_position6, panel6->GetBounds().origin());
+#endif
+ EXPECT_EQ(docked_position7, panel7->GetBounds().origin());
+
+ // Drag to attach a detached panel to most-right.
+ // Expect to have:
+ // detached: P1
+ // docked: P2 P4 P3 P5 P6 P7
+ gfx::Point drag_to_location2(panel4->GetBounds().right() + 10,
+ panel4->GetBounds().y());
+ DragPanelToMouseLocation(panel2, drag_to_location2);
+ ASSERT_EQ(1, detached_strip->num_panels());
+ ASSERT_EQ(6, docked_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DETACHED, panel1->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel2->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel3->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel4->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel5->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel6->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel7->panel_strip()->type());
+ EXPECT_EQ(detached_position1, panel1->GetBounds().origin());
+
+ // Drag to attach a detached panel to most-left.
+ // Expect to have:
+ // docked: P2 P4 P1 P3 P5 P6 P7
+ gfx::Point drag_to_location3(panel3->GetBounds().x() - 10,
+ panel3->GetBounds().y());
+ DragPanelToMouseLocation(panel1, drag_to_location3);
+ ASSERT_EQ(0, detached_strip->num_panels());
+ ASSERT_EQ(7, docked_strip->num_panels());
+ EXPECT_EQ(PanelStrip::DOCKED, panel1->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel2->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel3->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel4->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel5->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel6->panel_strip()->type());
+ EXPECT_EQ(PanelStrip::DOCKED, panel7->panel_strip()->type());
+
+ panel_manager->CloseAll();
+}
+
+IN_PROC_BROWSER_TEST_F(PanelDragBrowserTest, DragDetachedPanelToTop) {
+ // Setup the test areas to have top-aligned bar excluded from work area.
+ const gfx::Rect primary_screen_area(0, 0, 800, 600);
+ const gfx::Rect work_area(0, 10, 800, 590);
+ SetTestingAreas(primary_screen_area, work_area);
+
+ PanelManager* panel_manager = PanelManager::GetInstance();
+ Panel* panel = CreateDetachedPanel("1", gfx::Rect(300, 200, 250, 200));
+
+ // Drag up the panel. Expect that the panel should not go outside the top of
+ // the work area.
+ gfx::Point drag_to_location(250, 0);
+ DragPanelToMouseLocation(panel, drag_to_location);
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+ EXPECT_EQ(drag_to_location.x(), panel->GetBounds().origin().x());
+ EXPECT_EQ(work_area.y(), panel->GetBounds().origin().y());
+
+ // Drag down the panel. Expect that the panel can be dragged without
+ // constraint.
+ drag_to_location = gfx::Point(280, 150);
+ DragPanelToMouseLocation(panel, drag_to_location);
+ EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
+ EXPECT_EQ(drag_to_location, panel->GetBounds().origin());
+
+ panel_manager->CloseAll();
+}
« no previous file with comments | « chrome/browser/ui/panels/old_panel_browsertest.cc ('k') | chrome/browser/ui/panels/old_panel_resize_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698