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

Side by Side Diff: ash/wm/mru_window_tracker_unittest.cc

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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
OLDNEW
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"
(...skipping 18 matching lines...) Expand all
29 ash::MruWindowTracker* mru_window_tracker() { 29 ash::MruWindowTracker* mru_window_tracker() {
30 return Shell::GetInstance()->mru_window_tracker(); 30 return Shell::GetInstance()->mru_window_tracker();
31 } 31 }
32 32
33 private: 33 private:
34 DISALLOW_COPY_AND_ASSIGN(MruWindowTrackerTest); 34 DISALLOW_COPY_AND_ASSIGN(MruWindowTrackerTest);
35 }; 35 };
36 36
37 // Basic test that the activation order is tracked. 37 // Basic test that the activation order is tracked.
38 TEST_F(MruWindowTrackerTest, Basic) { 38 TEST_F(MruWindowTrackerTest, Basic) {
39 scoped_ptr<aura::Window> w1(CreateWindow()); 39 std::unique_ptr<aura::Window> w1(CreateWindow());
40 scoped_ptr<aura::Window> w2(CreateWindow()); 40 std::unique_ptr<aura::Window> w2(CreateWindow());
41 scoped_ptr<aura::Window> w3(CreateWindow()); 41 std::unique_ptr<aura::Window> w3(CreateWindow());
42 wm::ActivateWindow(w3.get()); 42 wm::ActivateWindow(w3.get());
43 wm::ActivateWindow(w2.get()); 43 wm::ActivateWindow(w2.get());
44 wm::ActivateWindow(w1.get()); 44 wm::ActivateWindow(w1.get());
45 45
46 MruWindowTracker::WindowList window_list = 46 MruWindowTracker::WindowList window_list =
47 mru_window_tracker()->BuildMruWindowList(); 47 mru_window_tracker()->BuildMruWindowList();
48 EXPECT_EQ(w1.get(), window_list[0]); 48 EXPECT_EQ(w1.get(), window_list[0]);
49 EXPECT_EQ(w2.get(), window_list[1]); 49 EXPECT_EQ(w2.get(), window_list[1]);
50 EXPECT_EQ(w3.get(), window_list[2]); 50 EXPECT_EQ(w3.get(), window_list[2]);
51 } 51 }
52 52
53 // Test that minimized windows are considered least recently used (but kept in 53 // Test that minimized windows are considered least recently used (but kept in
54 // correct relative order). 54 // correct relative order).
55 TEST_F(MruWindowTrackerTest, MinimizedWindowsAreLru) { 55 TEST_F(MruWindowTrackerTest, MinimizedWindowsAreLru) {
56 scoped_ptr<aura::Window> w1(CreateWindow()); 56 std::unique_ptr<aura::Window> w1(CreateWindow());
57 scoped_ptr<aura::Window> w2(CreateWindow()); 57 std::unique_ptr<aura::Window> w2(CreateWindow());
58 scoped_ptr<aura::Window> w3(CreateWindow()); 58 std::unique_ptr<aura::Window> w3(CreateWindow());
59 scoped_ptr<aura::Window> w4(CreateWindow()); 59 std::unique_ptr<aura::Window> w4(CreateWindow());
60 scoped_ptr<aura::Window> w5(CreateWindow()); 60 std::unique_ptr<aura::Window> w5(CreateWindow());
61 scoped_ptr<aura::Window> w6(CreateWindow()); 61 std::unique_ptr<aura::Window> w6(CreateWindow());
62 wm::ActivateWindow(w6.get()); 62 wm::ActivateWindow(w6.get());
63 wm::ActivateWindow(w5.get()); 63 wm::ActivateWindow(w5.get());
64 wm::ActivateWindow(w4.get()); 64 wm::ActivateWindow(w4.get());
65 wm::ActivateWindow(w3.get()); 65 wm::ActivateWindow(w3.get());
66 wm::ActivateWindow(w2.get()); 66 wm::ActivateWindow(w2.get());
67 wm::ActivateWindow(w1.get()); 67 wm::ActivateWindow(w1.get());
68 68
69 wm::GetWindowState(w1.get())->Minimize(); 69 wm::GetWindowState(w1.get())->Minimize();
70 wm::GetWindowState(w4.get())->Minimize(); 70 wm::GetWindowState(w4.get())->Minimize();
71 wm::GetWindowState(w5.get())->Minimize(); 71 wm::GetWindowState(w5.get())->Minimize();
72 72
73 // Expect the relative order of minimized windows to remain the same, but all 73 // Expect the relative order of minimized windows to remain the same, but all
74 // minimized windows to be at the end of the list. 74 // minimized windows to be at the end of the list.
75 MruWindowTracker::WindowList window_list = 75 MruWindowTracker::WindowList window_list =
76 mru_window_tracker()->BuildMruWindowList(); 76 mru_window_tracker()->BuildMruWindowList();
77 EXPECT_EQ(w2.get(), window_list[0]); 77 EXPECT_EQ(w2.get(), window_list[0]);
78 EXPECT_EQ(w3.get(), window_list[1]); 78 EXPECT_EQ(w3.get(), window_list[1]);
79 EXPECT_EQ(w6.get(), window_list[2]); 79 EXPECT_EQ(w6.get(), window_list[2]);
80 EXPECT_EQ(w1.get(), window_list[3]); 80 EXPECT_EQ(w1.get(), window_list[3]);
81 EXPECT_EQ(w4.get(), window_list[4]); 81 EXPECT_EQ(w4.get(), window_list[4]);
82 EXPECT_EQ(w5.get(), window_list[5]); 82 EXPECT_EQ(w5.get(), window_list[5]);
83 } 83 }
84 84
85 // Tests that windows being dragged are only in the WindowList once. 85 // Tests that windows being dragged are only in the WindowList once.
86 TEST_F(MruWindowTrackerTest, DraggedWindowsInListOnlyOnce) { 86 TEST_F(MruWindowTrackerTest, DraggedWindowsInListOnlyOnce) {
87 scoped_ptr<aura::Window> w1(CreateWindow()); 87 std::unique_ptr<aura::Window> w1(CreateWindow());
88 wm::ActivateWindow(w1.get()); 88 wm::ActivateWindow(w1.get());
89 89
90 // Start dragging the window. 90 // Start dragging the window.
91 wm::GetWindowState(w1.get())->CreateDragDetails( 91 wm::GetWindowState(w1.get())->CreateDragDetails(
92 w1.get(), gfx::Point(), HTRIGHT, aura::client::WINDOW_MOVE_SOURCE_TOUCH); 92 w1.get(), gfx::Point(), HTRIGHT, aura::client::WINDOW_MOVE_SOURCE_TOUCH);
93 93
94 // During a drag the window is reparented by the Docked container. 94 // During a drag the window is reparented by the Docked container.
95 aura::Window* drag_container = Shell::GetContainer( 95 aura::Window* drag_container = Shell::GetContainer(
96 Shell::GetTargetRootWindow(), kShellWindowId_DockedContainer); 96 Shell::GetTargetRootWindow(), kShellWindowId_DockedContainer);
97 drag_container->AddChild(w1.get()); 97 drag_container->AddChild(w1.get());
98 EXPECT_TRUE(wm::GetWindowState(w1.get())->is_dragged()); 98 EXPECT_TRUE(wm::GetWindowState(w1.get())->is_dragged());
99 99
100 // The dragged window should only be in the list once. 100 // The dragged window should only be in the list once.
101 MruWindowTracker::WindowList window_list = 101 MruWindowTracker::WindowList window_list =
102 mru_window_tracker()->BuildWindowListIgnoreModal(); 102 mru_window_tracker()->BuildWindowListIgnoreModal();
103 EXPECT_EQ(1, std::count(window_list.begin(), window_list.end(), w1.get())); 103 EXPECT_EQ(1, std::count(window_list.begin(), window_list.end(), w1.get()));
104 } 104 }
105 105
106 } // namespace ash 106 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698