OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/focus_cycler.h" | 5 #include "ash/common/focus_cycler.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
| 9 #include "ash/common/system/status_area_widget.h" |
9 #include "ash/common/system/status_area_widget_delegate.h" | 10 #include "ash/common/system/status_area_widget_delegate.h" |
| 11 #include "ash/common/system/tray/system_tray.h" |
10 #include "ash/common/wm_shell.h" | 12 #include "ash/common/wm_shell.h" |
11 #include "ash/shelf/shelf.h" | 13 #include "ash/shelf/shelf.h" |
12 #include "ash/shelf/shelf_widget.h" | 14 #include "ash/shelf/shelf_widget.h" |
13 #include "ash/system/status_area_widget.h" | |
14 #include "ash/system/tray/system_tray.h" | |
15 #include "ash/test/ash_test_base.h" | 15 #include "ash/test/ash_test_base.h" |
16 #include "ash/test/status_area_widget_test_helper.h" | 16 #include "ash/test/status_area_widget_test_helper.h" |
17 #include "ash/wm/window_util.h" | 17 #include "ash/wm/window_util.h" |
18 #include "ui/aura/test/test_windows.h" | 18 #include "ui/aura/test/test_windows.h" |
19 #include "ui/aura/window.h" | 19 #include "ui/aura/window.h" |
20 #include "ui/aura/window_event_dispatcher.h" | 20 #include "ui/aura/window_event_dispatcher.h" |
21 #include "ui/events/test/event_generator.h" | 21 #include "ui/events/test/event_generator.h" |
22 #include "ui/views/accessible_pane_view.h" | 22 #include "ui/views/accessible_pane_view.h" |
23 #include "ui/views/controls/button/menu_button.h" | 23 #include "ui/views/controls/button/menu_button.h" |
24 #include "ui/views/widget/widget.h" | 24 #include "ui/views/widget/widget.h" |
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
408 // Cycle focus to the shelf. | 408 // Cycle focus to the shelf. |
409 WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD); | 409 WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD); |
410 | 410 |
411 // Cycle focus should go back to the browser. | 411 // Cycle focus should go back to the browser. |
412 WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD); | 412 WmShell::Get()->focus_cycler()->RotateFocus(FocusCycler::FORWARD); |
413 EXPECT_TRUE(wm::IsActiveWindow(window.get())); | 413 EXPECT_TRUE(wm::IsActiveWindow(window.get())); |
414 } | 414 } |
415 | 415 |
416 } // namespace test | 416 } // namespace test |
417 } // namespace ash | 417 } // namespace ash |
OLD | NEW |