| 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_layout_manager.h" | 5 #include "ash/wm/dock/docked_window_layout_manager.h" |
| 6 | 6 |
| 7 #include "ash/ash_switches.h" | 7 #include "ash/ash_switches.h" |
| 8 #include "ash/root_window_controller.h" | 8 #include "ash/root_window_controller.h" |
| 9 #include "ash/screen_ash.h" | |
| 10 #include "ash/shelf/shelf.h" | 9 #include "ash/shelf/shelf.h" |
| 11 #include "ash/shelf/shelf_layout_manager.h" | 10 #include "ash/shelf/shelf_layout_manager.h" |
| 12 #include "ash/shelf/shelf_model.h" | 11 #include "ash/shelf/shelf_model.h" |
| 13 #include "ash/shelf/shelf_types.h" | 12 #include "ash/shelf/shelf_types.h" |
| 14 #include "ash/shelf/shelf_widget.h" | 13 #include "ash/shelf/shelf_widget.h" |
| 15 #include "ash/shell.h" | 14 #include "ash/shell.h" |
| 16 #include "ash/shell_window_ids.h" | 15 #include "ash/shell_window_ids.h" |
| 17 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
| 18 #include "ash/test/shelf_test_api.h" | 17 #include "ash/test/shelf_test_api.h" |
| 19 #include "ash/test/shelf_view_test_api.h" | 18 #include "ash/test/shelf_view_test_api.h" |
| (...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 804 EXPECT_LT(w2->GetBoundsInScreen().height(), work_area.height() / 2 - 10); | 803 EXPECT_LT(w2->GetBoundsInScreen().height(), work_area.height() / 2 - 10); |
| 805 } | 804 } |
| 806 | 805 |
| 807 // Tests run twice - on both panels and normal windows | 806 // Tests run twice - on both panels and normal windows |
| 808 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 807 INSTANTIATE_TEST_CASE_P(NormalOrPanel, |
| 809 DockedWindowLayoutManagerTest, | 808 DockedWindowLayoutManagerTest, |
| 810 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 809 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, |
| 811 ui::wm::WINDOW_TYPE_PANEL)); | 810 ui::wm::WINDOW_TYPE_PANEL)); |
| 812 } // namespace internal | 811 } // namespace internal |
| 813 } // namespace ash | 812 } // namespace ash |
| OLD | NEW |