| 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/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/focus_cycler.h" |
| 11 #include "ash/common/scoped_root_window_for_new_windows.h" | |
| 12 #include "ash/common/session/session_state_delegate.h" | |
| 13 #include "ash/common/shelf/shelf_widget.h" | |
| 14 #include "ash/common/shelf/wm_shelf.h" | |
| 15 #include "ash/common/test/test_shelf_delegate.h" | |
| 16 #include "ash/common/wm/window_cycle_list.h" | |
| 17 #include "ash/common/wm/window_state.h" | |
| 18 #include "ash/common/wm/wm_event.h" | |
| 19 #include "ash/common/wm_shell.h" | |
| 20 #include "ash/common/wm_window.h" | |
| 21 #include "ash/public/cpp/shell_window_ids.h" | 11 #include "ash/public/cpp/shell_window_ids.h" |
| 12 #include "ash/scoped_root_window_for_new_windows.h" |
| 13 #include "ash/session/session_state_delegate.h" |
| 14 #include "ash/shelf/shelf_widget.h" |
| 15 #include "ash/shelf/wm_shelf.h" |
| 22 #include "ash/shell.h" | 16 #include "ash/shell.h" |
| 23 #include "ash/test/ash_test_base.h" | 17 #include "ash/test/ash_test_base.h" |
| 24 #include "ash/test/shelf_view_test_api.h" | 18 #include "ash/test/shelf_view_test_api.h" |
| 25 #include "ash/test/test_app_list_view_presenter_impl.h" | 19 #include "ash/test/test_app_list_view_presenter_impl.h" |
| 20 #include "ash/test/test_shelf_delegate.h" |
| 26 #include "ash/test/test_shell_delegate.h" | 21 #include "ash/test/test_shell_delegate.h" |
| 22 #include "ash/wm/window_cycle_list.h" |
| 23 #include "ash/wm/window_state.h" |
| 27 #include "ash/wm/window_state_aura.h" | 24 #include "ash/wm/window_state_aura.h" |
| 28 #include "ash/wm/window_util.h" | 25 #include "ash/wm/window_util.h" |
| 26 #include "ash/wm/wm_event.h" |
| 27 #include "ash/wm_shell.h" |
| 28 #include "ash/wm_window.h" |
| 29 #include "ui/aura/client/aura_constants.h" | 29 #include "ui/aura/client/aura_constants.h" |
| 30 #include "ui/aura/client/screen_position_client.h" | 30 #include "ui/aura/client/screen_position_client.h" |
| 31 #include "ui/aura/env.h" | 31 #include "ui/aura/env.h" |
| 32 #include "ui/aura/test/test_windows.h" | 32 #include "ui/aura/test/test_windows.h" |
| 33 #include "ui/aura/window.h" | 33 #include "ui/aura/window.h" |
| 34 #include "ui/aura/window_event_dispatcher.h" | 34 #include "ui/aura/window_event_dispatcher.h" |
| 35 #include "ui/display/display_layout_builder.h" | 35 #include "ui/display/display_layout_builder.h" |
| 36 #include "ui/display/manager/display_layout_store.h" | 36 #include "ui/display/manager/display_layout_store.h" |
| 37 #include "ui/display/manager/display_manager.h" | 37 #include "ui/display/manager/display_manager.h" |
| 38 #include "ui/display/test/display_manager_test_api.h" | 38 #include "ui/display/test/display_manager_test_api.h" |
| (...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 746 // Base case sets the expectation for other cases. | 746 // Base case sets the expectation for other cases. |
| 747 if (expected_bounds.IsEmpty()) | 747 if (expected_bounds.IsEmpty()) |
| 748 expected_bounds = display_relative_bounds; | 748 expected_bounds = display_relative_bounds; |
| 749 else | 749 else |
| 750 EXPECT_EQ(expected_bounds, display_relative_bounds); | 750 EXPECT_EQ(expected_bounds, display_relative_bounds); |
| 751 controller->CompleteCycling(); | 751 controller->CompleteCycling(); |
| 752 } | 752 } |
| 753 } | 753 } |
| 754 | 754 |
| 755 } // namespace ash | 755 } // namespace ash |
| OLD | NEW |