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/panels/panel_window_resizer.h" | 5 #include "ash/wm/panels/panel_window_resizer.h" |
6 | 6 |
7 #include "ash/root_window_controller.h" | 7 #include "ash/root_window_controller.h" |
8 #include "ash/shelf/shelf.h" | 8 #include "ash/shelf/shelf.h" |
9 #include "ash/shelf/shelf_layout_manager.h" | 9 #include "ash/shelf/shelf_layout_manager.h" |
10 #include "ash/shelf/shelf_model.h" | 10 #include "ash/shelf/shelf_model.h" |
11 #include "ash/shelf/shelf_types.h" | 11 #include "ash/shelf/shelf_types.h" |
12 #include "ash/shelf/shelf_util.h" | 12 #include "ash/shelf/shelf_util.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/cursor_manager_test_api.h" | 17 #include "ash/test/cursor_manager_test_api.h" |
18 #include "ash/test/shell_test_api.h" | 18 #include "ash/test/shell_test_api.h" |
19 #include "ash/test/test_shelf_delegate.h" | 19 #include "ash/test/test_shelf_delegate.h" |
20 #include "ash/wm/drag_window_resizer.h" | 20 #include "ash/wm/drag_window_resizer.h" |
21 #include "ash/wm/panels/panel_layout_manager.h" | 21 #include "ash/wm/panels/panel_layout_manager.h" |
22 #include "ash/wm/window_state.h" | 22 #include "ash/wm/window_state.h" |
23 #include "ash/wm/wm_event.h" | 23 #include "ash/wm/wm_event.h" |
24 #include "base/win/windows_version.h" | 24 #include "base/win/windows_version.h" |
25 #include "ui/aura/client/aura_constants.h" | 25 #include "ui/aura/client/aura_constants.h" |
26 #include "ui/aura/window_event_dispatcher.h" | 26 #include "ui/aura/window_event_dispatcher.h" |
27 #include "ui/base/hit_test.h" | 27 #include "ui/base/hit_test.h" |
28 #include "ui/base/l10n/l10n_util.h" | 28 #include "ui/base/l10n/l10n_util.h" |
29 #include "ui/base/ui_base_types.h" | 29 #include "ui/base/ui_base_types.h" |
30 #include "ui/views/corewm/window_util.h" | |
31 #include "ui/views/widget/widget.h" | 30 #include "ui/views/widget/widget.h" |
| 31 #include "ui/wm/core/window_util.h" |
32 | 32 |
33 namespace ash { | 33 namespace ash { |
34 namespace internal { | 34 namespace internal { |
35 | 35 |
36 class PanelWindowResizerTest : public test::AshTestBase { | 36 class PanelWindowResizerTest : public test::AshTestBase { |
37 public: | 37 public: |
38 PanelWindowResizerTest() {} | 38 PanelWindowResizerTest() {} |
39 virtual ~PanelWindowResizerTest() {} | 39 virtual ~PanelWindowResizerTest() {} |
40 | 40 |
41 virtual void SetUp() OVERRIDE { | 41 virtual void SetUp() OVERRIDE { |
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
564 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest, | 564 INSTANTIATE_TEST_CASE_P(LtrRtl, PanelWindowResizerTextDirectionTest, |
565 testing::Bool()); | 565 testing::Bool()); |
566 INSTANTIATE_TEST_CASE_P(NormalPanelPopup, | 566 INSTANTIATE_TEST_CASE_P(NormalPanelPopup, |
567 PanelWindowResizerTransientTest, | 567 PanelWindowResizerTransientTest, |
568 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 568 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, |
569 ui::wm::WINDOW_TYPE_PANEL, | 569 ui::wm::WINDOW_TYPE_PANEL, |
570 ui::wm::WINDOW_TYPE_POPUP)); | 570 ui::wm::WINDOW_TYPE_POPUP)); |
571 | 571 |
572 } // namespace internal | 572 } // namespace internal |
573 } // namespace ash | 573 } // namespace ash |
OLD | NEW |