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_resizer.h" | 5 #include "ash/common/wm/dock/docked_window_resizer.h" |
6 | 6 |
7 #include "ash/ash_switches.h" | |
8 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
| 8 #include "ash/common/ash_switches.h" |
9 #include "ash/common/shelf/shelf_model.h" | 9 #include "ash/common/shelf/shelf_model.h" |
10 #include "ash/common/shelf/shelf_types.h" | 10 #include "ash/common/shelf/shelf_types.h" |
11 #include "ash/common/shell_window_ids.h" | 11 #include "ash/common/shell_window_ids.h" |
12 #include "ash/common/wm/dock/docked_window_layout_manager.h" | 12 #include "ash/common/wm/dock/docked_window_layout_manager.h" |
13 #include "ash/common/wm/panels/panel_layout_manager.h" | 13 #include "ash/common/wm/panels/panel_layout_manager.h" |
14 #include "ash/common/wm/window_state.h" | 14 #include "ash/common/wm/window_state.h" |
15 #include "ash/common/wm/wm_event.h" | 15 #include "ash/common/wm/wm_event.h" |
16 #include "ash/display/window_tree_host_manager.h" | 16 #include "ash/display/window_tree_host_manager.h" |
17 #include "ash/root_window_controller.h" | 17 #include "ash/root_window_controller.h" |
18 #include "ash/screen_util.h" | 18 #include "ash/screen_util.h" |
(...skipping 1593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1612 EXPECT_TRUE(window_state->IsMaximized()); | 1612 EXPECT_TRUE(window_state->IsMaximized()); |
1613 } | 1613 } |
1614 | 1614 |
1615 // Tests run twice - on both panels and normal windows | 1615 // Tests run twice - on both panels and normal windows |
1616 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 1616 INSTANTIATE_TEST_CASE_P(NormalOrPanel, |
1617 DockedWindowResizerTest, | 1617 DockedWindowResizerTest, |
1618 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 1618 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, |
1619 ui::wm::WINDOW_TYPE_PANEL)); | 1619 ui::wm::WINDOW_TYPE_PANEL)); |
1620 | 1620 |
1621 } // namespace ash | 1621 } // namespace ash |
OLD | NEW |