| 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/common/wm/mru_window_tracker.h" | 5 #include "ash/common/wm/mru_window_tracker.h" |
| 6 | 6 |
| 7 #include "ash/common/test/ash_test.h" | 7 #include "ash/common/test/ash_test.h" |
| 8 #include "ash/common/wm/window_state.h" | 8 #include "ash/common/wm/window_state.h" |
| 9 #include "ash/common/wm_shell.h" | 9 #include "ash/common/wm_shell.h" |
| 10 #include "ash/common/wm_window.h" | 10 #include "ash/common/wm_window.h" |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 WmWindow* w1 = w1_owner->window(); | 36 WmWindow* w1 = w1_owner->window(); |
| 37 std::unique_ptr<WindowOwner> w2_owner(CreateTestWindow()); | 37 std::unique_ptr<WindowOwner> w2_owner(CreateTestWindow()); |
| 38 WmWindow* w2 = w2_owner->window(); | 38 WmWindow* w2 = w2_owner->window(); |
| 39 std::unique_ptr<WindowOwner> w3_owner(CreateTestWindow()); | 39 std::unique_ptr<WindowOwner> w3_owner(CreateTestWindow()); |
| 40 WmWindow* w3 = w3_owner->window(); | 40 WmWindow* w3 = w3_owner->window(); |
| 41 w3->Activate(); | 41 w3->Activate(); |
| 42 w2->Activate(); | 42 w2->Activate(); |
| 43 w1->Activate(); | 43 w1->Activate(); |
| 44 | 44 |
| 45 WmWindow::Windows window_list = mru_window_tracker()->BuildMruWindowList(); | 45 WmWindow::Windows window_list = mru_window_tracker()->BuildMruWindowList(); |
| 46 ASSERT_EQ(3u, window_list.size()); |
| 46 EXPECT_EQ(w1, window_list[0]); | 47 EXPECT_EQ(w1, window_list[0]); |
| 47 EXPECT_EQ(w2, window_list[1]); | 48 EXPECT_EQ(w2, window_list[1]); |
| 48 EXPECT_EQ(w3, window_list[2]); | 49 EXPECT_EQ(w3, window_list[2]); |
| 49 } | 50 } |
| 50 | 51 |
| 51 // Test that minimized windows are not treated specially. | 52 // Test that minimized windows are not treated specially. |
| 52 TEST_F(MruWindowTrackerTest, MinimizedWindowsAreLru) { | 53 TEST_F(MruWindowTrackerTest, MinimizedWindowsAreLru) { |
| 53 // TODO(sky): fix me. Fails in mash because of http://crbug.com/654887. | 54 // TODO(sky): fix me. Fails in mash because of http://crbug.com/654887. |
| 54 if (WmShell::Get()->IsRunningInMash()) | 55 if (WmShell::Get()->IsRunningInMash()) |
| 55 return; | 56 return; |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 // Expect the windows with |kExcludeFromMruKey| property being true are not | 133 // Expect the windows with |kExcludeFromMruKey| property being true are not |
| 133 // in the list. | 134 // in the list. |
| 134 WmWindow::Windows window_list = mru_window_tracker()->BuildMruWindowList(); | 135 WmWindow::Windows window_list = mru_window_tracker()->BuildMruWindowList(); |
| 135 | 136 |
| 136 // As |w1| and |w3| are excluded from the list, only |w2| should be present. | 137 // As |w1| and |w3| are excluded from the list, only |w2| should be present. |
| 137 ASSERT_EQ(1u, window_list.size()); | 138 ASSERT_EQ(1u, window_list.size()); |
| 138 EXPECT_EQ(w2, window_list[0]); | 139 EXPECT_EQ(w2, window_list[0]); |
| 139 } | 140 } |
| 140 | 141 |
| 141 } // namespace ash | 142 } // namespace ash |
| OLD | NEW |