| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/shell.h" | 5 #include "ash/shell.h" |
| 6 #include "ash/shell_window_ids.h" | 6 #include "ash/shell_window_ids.h" |
| 7 #include "ash/test/ash_test_base.h" | 7 #include "ash/test/ash_test_base.h" |
| 8 #include "ash/test/test_shelf_delegate.h" | 8 #include "ash/test/test_shelf_delegate.h" |
| 9 #include "ash/wm/mru_window_tracker.h" | 9 #include "ash/wm/mru_window_tracker.h" |
| 10 #include "ash/wm/window_state.h" | 10 #include "ash/wm/window_state.h" |
| 11 #include "ash/wm/window_state_aura.h" |
| 11 #include "ash/wm/window_util.h" | 12 #include "ash/wm/window_util.h" |
| 12 #include "base/compiler_specific.h" | 13 #include "base/compiler_specific.h" |
| 13 #include "ui/aura/test/test_window_delegate.h" | 14 #include "ui/aura/test/test_window_delegate.h" |
| 14 #include "ui/aura/window.h" | 15 #include "ui/aura/window.h" |
| 15 #include "ui/base/hit_test.h" | 16 #include "ui/base/hit_test.h" |
| 16 #include "ui/views/widget/widget.h" | 17 #include "ui/views/widget/widget.h" |
| 17 | 18 |
| 18 namespace ash { | 19 namespace ash { |
| 19 | 20 |
| 20 class MruWindowTrackerTest : public test::AshTestBase { | 21 class MruWindowTrackerTest : public test::AshTestBase { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 EXPECT_EQ(w5.get(), window_list[5]); | 83 EXPECT_EQ(w5.get(), window_list[5]); |
| 83 } | 84 } |
| 84 | 85 |
| 85 // Tests that windows being dragged are only in the WindowList once. | 86 // Tests that windows being dragged are only in the WindowList once. |
| 86 TEST_F(MruWindowTrackerTest, DraggedWindowsInListOnlyOnce) { | 87 TEST_F(MruWindowTrackerTest, DraggedWindowsInListOnlyOnce) { |
| 87 std::unique_ptr<aura::Window> w1(CreateWindow()); | 88 std::unique_ptr<aura::Window> w1(CreateWindow()); |
| 88 wm::ActivateWindow(w1.get()); | 89 wm::ActivateWindow(w1.get()); |
| 89 | 90 |
| 90 // Start dragging the window. | 91 // Start dragging the window. |
| 91 wm::GetWindowState(w1.get())->CreateDragDetails( | 92 wm::GetWindowState(w1.get())->CreateDragDetails( |
| 92 w1.get(), gfx::Point(), HTRIGHT, aura::client::WINDOW_MOVE_SOURCE_TOUCH); | 93 gfx::Point(), HTRIGHT, aura::client::WINDOW_MOVE_SOURCE_TOUCH); |
| 93 | 94 |
| 94 // During a drag the window is reparented by the Docked container. | 95 // During a drag the window is reparented by the Docked container. |
| 95 aura::Window* drag_container = Shell::GetContainer( | 96 aura::Window* drag_container = Shell::GetContainer( |
| 96 Shell::GetTargetRootWindow(), kShellWindowId_DockedContainer); | 97 Shell::GetTargetRootWindow(), kShellWindowId_DockedContainer); |
| 97 drag_container->AddChild(w1.get()); | 98 drag_container->AddChild(w1.get()); |
| 98 EXPECT_TRUE(wm::GetWindowState(w1.get())->is_dragged()); | 99 EXPECT_TRUE(wm::GetWindowState(w1.get())->is_dragged()); |
| 99 | 100 |
| 100 // The dragged window should only be in the list once. | 101 // The dragged window should only be in the list once. |
| 101 MruWindowTracker::WindowList window_list = | 102 MruWindowTracker::WindowList window_list = |
| 102 mru_window_tracker()->BuildWindowListIgnoreModal(); | 103 mru_window_tracker()->BuildWindowListIgnoreModal(); |
| 103 EXPECT_EQ(1, std::count(window_list.begin(), window_list.end(), w1.get())); | 104 EXPECT_EQ(1, std::count(window_list.begin(), window_list.end(), w1.get())); |
| 104 } | 105 } |
| 105 | 106 |
| 106 } // namespace ash | 107 } // namespace ash |
| OLD | NEW |