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/common/wm/dock/docked_window_layout_manager.h" | 5 #include "ash/common/wm/dock/docked_window_layout_manager.h" |
6 | 6 |
7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
8 #include "ash/common/shelf/wm_shelf.h" | 8 #include "ash/common/shelf/wm_shelf.h" |
9 #include "ash/common/shell_window_ids.h" | |
10 #include "ash/common/wm/panels/panel_layout_manager.h" | 9 #include "ash/common/wm/panels/panel_layout_manager.h" |
11 #include "ash/common/wm/window_resizer.h" | 10 #include "ash/common/wm/window_resizer.h" |
12 #include "ash/common/wm/window_state.h" | 11 #include "ash/common/wm/window_state.h" |
13 #include "ash/display/display_manager.h" | 12 #include "ash/display/display_manager.h" |
| 13 #include "ash/public/cpp/shell_window_ids.h" |
14 #include "ash/root_window_controller.h" | 14 #include "ash/root_window_controller.h" |
15 #include "ash/shell.h" | 15 #include "ash/shell.h" |
16 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
17 #include "ash/test/display_manager_test_api.h" | 17 #include "ash/test/display_manager_test_api.h" |
18 #include "ash/test/shelf_view_test_api.h" | 18 #include "ash/test/shelf_view_test_api.h" |
19 #include "ash/test/shell_test_api.h" | 19 #include "ash/test/shell_test_api.h" |
20 #include "ash/test/test_shelf_delegate.h" | 20 #include "ash/test/test_shelf_delegate.h" |
21 #include "ash/wm/window_state_aura.h" | 21 #include "ash/wm/window_state_aura.h" |
22 #include "ash/wm/window_util.h" | 22 #include "ash/wm/window_util.h" |
23 #include "base/strings/string_number_conversions.h" | 23 #include "base/strings/string_number_conversions.h" |
(...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
809 EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height()); | 809 EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height()); |
810 } | 810 } |
811 | 811 |
812 // Tests run twice - on both panels and normal windows | 812 // Tests run twice - on both panels and normal windows |
813 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 813 INSTANTIATE_TEST_CASE_P(NormalOrPanel, |
814 DockedWindowLayoutManagerTest, | 814 DockedWindowLayoutManagerTest, |
815 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 815 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, |
816 ui::wm::WINDOW_TYPE_PANEL)); | 816 ui::wm::WINDOW_TYPE_PANEL)); |
817 | 817 |
818 } // namespace ash | 818 } // namespace ash |
OLD | NEW |