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/aura/wm_window_aura.h" | 10 #include "ash/aura/wm_window_aura.h" |
11 #include "ash/common/focus_cycler.h" | 11 #include "ash/common/focus_cycler.h" |
12 #include "ash/common/scoped_root_window_for_new_windows.h" | 12 #include "ash/common/scoped_root_window_for_new_windows.h" |
13 #include "ash/common/session/session_state_delegate.h" | 13 #include "ash/common/session/session_state_delegate.h" |
14 #include "ash/common/shelf/shelf_widget.h" | 14 #include "ash/common/shelf/shelf_widget.h" |
15 #include "ash/common/shelf/wm_shelf.h" | 15 #include "ash/common/shelf/wm_shelf.h" |
16 #include "ash/common/shell_window_ids.h" | |
17 #include "ash/common/wm/window_cycle_list.h" | 16 #include "ash/common/wm/window_cycle_list.h" |
18 #include "ash/common/wm/window_state.h" | 17 #include "ash/common/wm/window_state.h" |
19 #include "ash/common/wm/wm_event.h" | 18 #include "ash/common/wm/wm_event.h" |
20 #include "ash/common/wm_shell.h" | 19 #include "ash/common/wm_shell.h" |
| 20 #include "ash/public/cpp/shell_window_ids.h" |
21 #include "ash/shell.h" | 21 #include "ash/shell.h" |
22 #include "ash/test/ash_test_base.h" | 22 #include "ash/test/ash_test_base.h" |
23 #include "ash/test/shelf_view_test_api.h" | 23 #include "ash/test/shelf_view_test_api.h" |
24 #include "ash/test/test_shelf_delegate.h" | 24 #include "ash/test/test_shelf_delegate.h" |
25 #include "ash/test/test_shell_delegate.h" | 25 #include "ash/test/test_shell_delegate.h" |
26 #include "ash/wm/window_state_aura.h" | 26 #include "ash/wm/window_state_aura.h" |
27 #include "ash/wm/window_util.h" | 27 #include "ash/wm/window_util.h" |
28 #include "ui/aura/client/aura_constants.h" | 28 #include "ui/aura/client/aura_constants.h" |
29 #include "ui/aura/client/screen_position_client.h" | 29 #include "ui/aura/client/screen_position_client.h" |
30 #include "ui/aura/env.h" | 30 #include "ui/aura/env.h" |
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
692 // without the new alt+tab selector we check for the event on either | 692 // without the new alt+tab selector we check for the event on either |
693 // fullscreen window. | 693 // fullscreen window. |
694 EventCounter event_count; | 694 EventCounter event_count; |
695 w0->AddPreTargetHandler(&event_count); | 695 w0->AddPreTargetHandler(&event_count); |
696 w1->AddPreTargetHandler(&event_count); | 696 w1->AddPreTargetHandler(&event_count); |
697 generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN); | 697 generator.PressKey(ui::VKEY_TAB, ui::EF_ALT_DOWN); |
698 EXPECT_EQ(1, event_count.GetKeyEventCountAndReset()); | 698 EXPECT_EQ(1, event_count.GetKeyEventCountAndReset()); |
699 } | 699 } |
700 | 700 |
701 } // namespace ash | 701 } // namespace ash |
OLD | NEW |