OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/wm/dock/docked_window_resizer.h" | 5 #include "ash/wm/dock/docked_window_resizer.h" |
6 | 6 |
7 #include "ash/common/ash_switches.h" | 7 #include "ash/ash_switches.h" |
8 #include "ash/common/wm_shell.h" | |
9 #include "ash/common/wm_window.h" | |
10 #include "ash/display/window_tree_host_manager.h" | 8 #include "ash/display/window_tree_host_manager.h" |
11 #include "ash/public/cpp/shelf_types.h" | 9 #include "ash/public/cpp/shelf_types.h" |
12 #include "ash/public/cpp/shell_window_ids.h" | 10 #include "ash/public/cpp/shell_window_ids.h" |
13 #include "ash/public/cpp/window_properties.h" | 11 #include "ash/public/cpp/window_properties.h" |
14 #include "ash/root_window_controller.h" | 12 #include "ash/root_window_controller.h" |
15 #include "ash/screen_util.h" | 13 #include "ash/screen_util.h" |
16 #include "ash/shelf/shelf_widget.h" | 14 #include "ash/shelf/shelf_widget.h" |
17 #include "ash/shelf/wm_shelf.h" | 15 #include "ash/shelf/wm_shelf.h" |
18 #include "ash/shell.h" | 16 #include "ash/shell.h" |
19 #include "ash/test/ash_test_base.h" | 17 #include "ash/test/ash_test_base.h" |
20 #include "ash/test/cursor_manager_test_api.h" | 18 #include "ash/test/cursor_manager_test_api.h" |
21 #include "ash/test/test_shelf_delegate.h" | 19 #include "ash/test/test_shelf_delegate.h" |
22 #include "ash/wm/dock/docked_window_layout_manager.h" | 20 #include "ash/wm/dock/docked_window_layout_manager.h" |
23 #include "ash/wm/drag_window_resizer.h" | 21 #include "ash/wm/drag_window_resizer.h" |
24 #include "ash/wm/panels/panel_layout_manager.h" | 22 #include "ash/wm/panels/panel_layout_manager.h" |
25 #include "ash/wm/window_state.h" | 23 #include "ash/wm/window_state.h" |
26 #include "ash/wm/window_state_aura.h" | 24 #include "ash/wm/window_state_aura.h" |
27 #include "ash/wm/window_util.h" | 25 #include "ash/wm/window_util.h" |
28 #include "ash/wm/wm_event.h" | 26 #include "ash/wm/wm_event.h" |
| 27 #include "ash/wm_shell.h" |
| 28 #include "ash/wm_window.h" |
29 #include "base/command_line.h" | 29 #include "base/command_line.h" |
30 #include "ui/aura/client/aura_constants.h" | 30 #include "ui/aura/client/aura_constants.h" |
31 #include "ui/aura/client/window_parenting_client.h" | 31 #include "ui/aura/client/window_parenting_client.h" |
32 #include "ui/aura/test/test_window_delegate.h" | 32 #include "ui/aura/test/test_window_delegate.h" |
33 #include "ui/aura/window_event_dispatcher.h" | 33 #include "ui/aura/window_event_dispatcher.h" |
34 #include "ui/base/hit_test.h" | 34 #include "ui/base/hit_test.h" |
35 #include "ui/base/ui_base_types.h" | 35 #include "ui/base/ui_base_types.h" |
36 #include "ui/events/test/event_generator.h" | 36 #include "ui/events/test/event_generator.h" |
37 #include "ui/views/widget/widget.h" | 37 #include "ui/views/widget/widget.h" |
38 #include "ui/wm/core/coordinate_conversion.h" | 38 #include "ui/wm/core/coordinate_conversion.h" |
(...skipping 1460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1499 EXPECT_TRUE(window_state->IsMaximized()); | 1499 EXPECT_TRUE(window_state->IsMaximized()); |
1500 } | 1500 } |
1501 | 1501 |
1502 // Tests run twice - on both panels and normal windows | 1502 // Tests run twice - on both panels and normal windows |
1503 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 1503 INSTANTIATE_TEST_CASE_P(NormalOrPanel, |
1504 DockedWindowResizerTest, | 1504 DockedWindowResizerTest, |
1505 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 1505 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, |
1506 ui::wm::WINDOW_TYPE_PANEL)); | 1506 ui::wm::WINDOW_TYPE_PANEL)); |
1507 | 1507 |
1508 } // namespace ash | 1508 } // namespace ash |
OLD | NEW |