| 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/wm/dock/docked_window_layout_manager.h" | 
| 6 | 6 | 
| 7 #include "ash/common/ash_switches.h" | 7 #include "ash/ash_switches.h" | 
| 8 #include "ash/common/shelf/wm_shelf.h" |  | 
| 9 #include "ash/common/test/test_shelf_delegate.h" |  | 
| 10 #include "ash/common/wm/panels/panel_layout_manager.h" |  | 
| 11 #include "ash/common/wm/window_resizer.h" |  | 
| 12 #include "ash/common/wm/window_state.h" |  | 
| 13 #include "ash/common/wm_shell.h" |  | 
| 14 #include "ash/common/wm_window.h" |  | 
| 15 #include "ash/public/cpp/shell_window_ids.h" | 8 #include "ash/public/cpp/shell_window_ids.h" | 
| 16 #include "ash/root_window_controller.h" | 9 #include "ash/root_window_controller.h" | 
|  | 10 #include "ash/shelf/wm_shelf.h" | 
| 17 #include "ash/shell.h" | 11 #include "ash/shell.h" | 
| 18 #include "ash/test/ash_test_base.h" | 12 #include "ash/test/ash_test_base.h" | 
| 19 #include "ash/test/shelf_view_test_api.h" | 13 #include "ash/test/shelf_view_test_api.h" | 
| 20 #include "ash/test/shell_test_api.h" | 14 #include "ash/test/shell_test_api.h" | 
|  | 15 #include "ash/test/test_shelf_delegate.h" | 
|  | 16 #include "ash/wm/panels/panel_layout_manager.h" | 
|  | 17 #include "ash/wm/window_resizer.h" | 
|  | 18 #include "ash/wm/window_state.h" | 
| 21 #include "ash/wm/window_state_aura.h" | 19 #include "ash/wm/window_state_aura.h" | 
| 22 #include "ash/wm/window_util.h" | 20 #include "ash/wm/window_util.h" | 
|  | 21 #include "ash/wm_shell.h" | 
|  | 22 #include "ash/wm_window.h" | 
| 23 #include "base/command_line.h" | 23 #include "base/command_line.h" | 
| 24 #include "base/strings/string_number_conversions.h" | 24 #include "base/strings/string_number_conversions.h" | 
| 25 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" | 25 #include "services/ui/public/interfaces/window_manager_constants.mojom.h" | 
| 26 #include "ui/aura/client/aura_constants.h" | 26 #include "ui/aura/client/aura_constants.h" | 
| 27 #include "ui/aura/test/test_window_delegate.h" | 27 #include "ui/aura/test/test_window_delegate.h" | 
| 28 #include "ui/aura/window.h" | 28 #include "ui/aura/window.h" | 
| 29 #include "ui/aura/window_event_dispatcher.h" | 29 #include "ui/aura/window_event_dispatcher.h" | 
| 30 #include "ui/base/hit_test.h" | 30 #include "ui/base/hit_test.h" | 
| 31 #include "ui/display/display_layout.h" | 31 #include "ui/display/display_layout.h" | 
| 32 #include "ui/display/manager/display_manager.h" | 32 #include "ui/display/manager/display_manager.h" | 
| (...skipping 774 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 807   EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height()); | 807   EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height()); | 
| 808 } | 808 } | 
| 809 | 809 | 
| 810 // Tests run twice - on both panels and normal windows | 810 // Tests run twice - on both panels and normal windows | 
| 811 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 811 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 
| 812                         DockedWindowLayoutManagerTest, | 812                         DockedWindowLayoutManagerTest, | 
| 813                         testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 813                         testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 
| 814                                         ui::wm::WINDOW_TYPE_PANEL)); | 814                                         ui::wm::WINDOW_TYPE_PANEL)); | 
| 815 | 815 | 
| 816 }  // namespace ash | 816 }  // namespace ash | 
| OLD | NEW | 
|---|