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/shelf/shelf.h" | 9 #include "ash/shelf/shelf.h" |
10 #include "ash/shelf/shelf_layout_manager.h" | 10 #include "ash/shelf/shelf_layout_manager.h" |
11 #include "ash/shelf/shelf_model.h" | 11 #include "ash/shelf/shelf_model.h" |
12 #include "ash/shelf/shelf_types.h" | 12 #include "ash/shelf/shelf_types.h" |
13 #include "ash/shelf/shelf_widget.h" | 13 #include "ash/shelf/shelf_widget.h" |
14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
15 #include "ash/shell_window_ids.h" | 15 #include "ash/shell_window_ids.h" |
16 #include "ash/test/ash_test_base.h" | 16 #include "ash/test/ash_test_base.h" |
17 #include "ash/test/shelf_test_api.h" | 17 #include "ash/test/shelf_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/coordinate_conversion.h" | 21 #include "ash/wm/coordinate_conversion.h" |
22 #include "ash/wm/panels/panel_layout_manager.h" | 22 #include "ash/wm/panels/panel_layout_manager.h" |
23 #include "ash/wm/window_resizer.h" | 23 #include "ash/wm/window_resizer.h" |
24 #include "ash/wm/window_state.h" | 24 #include "ash/wm/window_state.h" |
25 #include "ash/wm/window_util.h" | 25 #include "ash/wm/window_util.h" |
26 #include "base/basictypes.h" | 26 #include "base/basictypes.h" |
27 #include "base/command_line.h" | 27 #include "base/command_line.h" |
28 #include "base/strings/string_number_conversions.h" | 28 #include "base/strings/string_number_conversions.h" |
29 #include "ui/aura/client/aura_constants.h" | 29 #include "ui/aura/client/aura_constants.h" |
30 #include "ui/aura/root_window.h" | |
31 #include "ui/aura/test/test_window_delegate.h" | 30 #include "ui/aura/test/test_window_delegate.h" |
32 #include "ui/aura/window.h" | 31 #include "ui/aura/window.h" |
| 32 #include "ui/aura/window_event_dispatcher.h" |
33 #include "ui/base/hit_test.h" | 33 #include "ui/base/hit_test.h" |
34 #include "ui/gfx/screen.h" | 34 #include "ui/gfx/screen.h" |
35 #include "ui/views/widget/widget.h" | 35 #include "ui/views/widget/widget.h" |
36 | 36 |
37 namespace ash { | 37 namespace ash { |
38 namespace internal { | 38 namespace internal { |
39 | 39 |
40 class DockedWindowLayoutManagerTest | 40 class DockedWindowLayoutManagerTest |
41 : public test::AshTestBase, | 41 : public test::AshTestBase, |
42 public testing::WithParamInterface<ui::wm::WindowType> { | 42 public testing::WithParamInterface<ui::wm::WindowType> { |
(...skipping 788 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
831 EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height()); | 831 EXPECT_EQ(work_area.height(), window->GetBoundsInScreen().height()); |
832 } | 832 } |
833 | 833 |
834 // Tests run twice - on both panels and normal windows | 834 // Tests run twice - on both panels and normal windows |
835 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 835 INSTANTIATE_TEST_CASE_P(NormalOrPanel, |
836 DockedWindowLayoutManagerTest, | 836 DockedWindowLayoutManagerTest, |
837 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 837 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, |
838 ui::wm::WINDOW_TYPE_PANEL)); | 838 ui::wm::WINDOW_TYPE_PANEL)); |
839 } // namespace internal | 839 } // namespace internal |
840 } // namespace ash | 840 } // namespace ash |
OLD | NEW |