OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/window_cycle_controller.h" | 5 #include "ash/common/wm/window_cycle_controller.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <memory> | 8 #include <memory> |
9 | 9 |
10 #include "ash/common/focus_cycler.h" | 10 #include "ash/common/focus_cycler.h" |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
485 if (WmShell::Get()->IsRunningInMash()) | 485 if (WmShell::Get()->IsRunningInMash()) |
486 return; | 486 return; |
487 | 487 |
488 // The tested behavior relies on the app list presenter implementation. | 488 // The tested behavior relies on the app list presenter implementation. |
489 test::TestAppListViewPresenterImpl app_list_presenter_impl; | 489 test::TestAppListViewPresenterImpl app_list_presenter_impl; |
490 | 490 |
491 WindowCycleController* controller = Shell::Get()->window_cycle_controller(); | 491 WindowCycleController* controller = Shell::Get()->window_cycle_controller(); |
492 | 492 |
493 std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0)); | 493 std::unique_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0)); |
494 std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1)); | 494 std::unique_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1)); |
495 app_list_presenter_impl.Show(display_manager()->first_display_id()); | 495 app_list_presenter_impl.Show( |
| 496 display::Screen::GetScreen()->GetPrimaryDisplay().id()); |
496 EXPECT_TRUE(app_list_presenter_impl.IsVisible()); | 497 EXPECT_TRUE(app_list_presenter_impl.IsVisible()); |
497 controller->HandleCycleWindow(WindowCycleController::FORWARD); | 498 controller->HandleCycleWindow(WindowCycleController::FORWARD); |
498 EXPECT_FALSE(app_list_presenter_impl.IsVisible()); | 499 EXPECT_FALSE(app_list_presenter_impl.IsVisible()); |
499 | 500 |
500 // Make sure that dismissing the app list this way doesn't pass activation | 501 // Make sure that dismissing the app list this way doesn't pass activation |
501 // to a different window. | 502 // to a different window. |
502 EXPECT_FALSE(wm::IsActiveWindow(window0.get())); | 503 EXPECT_FALSE(wm::IsActiveWindow(window0.get())); |
503 EXPECT_FALSE(wm::IsActiveWindow(window1.get())); | 504 EXPECT_FALSE(wm::IsActiveWindow(window1.get())); |
504 | 505 |
505 controller->CompleteCycling(); | 506 controller->CompleteCycling(); |
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
762 // Base case sets the expectation for other cases. | 763 // Base case sets the expectation for other cases. |
763 if (expected_bounds.IsEmpty()) | 764 if (expected_bounds.IsEmpty()) |
764 expected_bounds = display_relative_bounds; | 765 expected_bounds = display_relative_bounds; |
765 else | 766 else |
766 EXPECT_EQ(expected_bounds, display_relative_bounds); | 767 EXPECT_EQ(expected_bounds, display_relative_bounds); |
767 controller->CompleteCycling(); | 768 controller->CompleteCycling(); |
768 } | 769 } |
769 } | 770 } |
770 | 771 |
771 } // namespace ash | 772 } // namespace ash |
OLD | NEW |