| 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/panels/panel_window_resizer.h" | 5 #include "ash/common/wm/panels/panel_window_resizer.h" |
| 6 | 6 |
| 7 #include "ash/aura/wm_window_aura.h" | 7 #include "ash/aura/wm_window_aura.h" |
| 8 #include "ash/common/shelf/shelf_layout_manager.h" | 8 #include "ash/common/shelf/shelf_layout_manager.h" |
| 9 #include "ash/common/shelf/shelf_model.h" | 9 #include "ash/common/shelf/shelf_model.h" |
| 10 #include "ash/common/shelf/shelf_widget.h" | 10 #include "ash/common/shelf/shelf_widget.h" |
| 11 #include "ash/common/shelf/wm_shelf.h" | 11 #include "ash/common/shelf/wm_shelf.h" |
| 12 #include "ash/common/test/test_shelf_delegate.h" | 12 #include "ash/common/test/test_shelf_delegate.h" |
| 13 #include "ash/common/wm/window_state.h" | 13 #include "ash/common/wm/window_state.h" |
| 14 #include "ash/common/wm/wm_event.h" | 14 #include "ash/common/wm/wm_event.h" |
| 15 #include "ash/common/wm_shell.h" | 15 #include "ash/common/wm_shell.h" |
| 16 #include "ash/common/wm_window_property.h" | 16 #include "ash/common/wm_window_property.h" |
| 17 #include "ash/public/cpp/shelf_types.h" | 17 #include "ash/public/cpp/shelf_types.h" |
| 18 #include "ash/public/cpp/shell_window_ids.h" | 18 #include "ash/public/cpp/shell_window_ids.h" |
| 19 #include "ash/root_window_controller.h" | 19 #include "ash/root_window_controller.h" |
| 20 #include "ash/shell.h" | 20 #include "ash/shell.h" |
| 21 #include "ash/test/ash_test_base.h" | 21 #include "ash/test/ash_test_base.h" |
| 22 #include "ash/test/cursor_manager_test_api.h" | 22 #include "ash/test/cursor_manager_test_api.h" |
| 23 #include "ash/wm/drag_window_resizer.h" | 23 #include "ash/wm/drag_window_resizer.h" |
| 24 #include "ash/wm/window_properties.h" | 24 #include "ash/wm/window_properties.h" |
| 25 #include "ash/wm/window_state_aura.h" | 25 #include "ash/wm/window_state_aura.h" |
| 26 #include "base/i18n/rtl.h" | 26 #include "base/i18n/rtl.h" |
| 27 #include "base/win/windows_version.h" | |
| 28 #include "ui/aura/client/aura_constants.h" | 27 #include "ui/aura/client/aura_constants.h" |
| 29 #include "ui/aura/window_event_dispatcher.h" | 28 #include "ui/aura/window_event_dispatcher.h" |
| 30 #include "ui/base/hit_test.h" | 29 #include "ui/base/hit_test.h" |
| 31 #include "ui/base/ui_base_types.h" | 30 #include "ui/base/ui_base_types.h" |
| 32 #include "ui/views/widget/widget.h" | 31 #include "ui/views/widget/widget.h" |
| 33 #include "ui/wm/core/window_util.h" | 32 #include "ui/wm/core/window_util.h" |
| 34 | 33 |
| 34 #if defined(OS_WIN) |
| 35 #include "base/win/windows_version.h" |
| 36 #endif |
| 37 |
| 35 namespace ash { | 38 namespace ash { |
| 36 | 39 |
| 37 class PanelWindowResizerTest : public test::AshTestBase { | 40 class PanelWindowResizerTest : public test::AshTestBase { |
| 38 public: | 41 public: |
| 39 PanelWindowResizerTest() {} | 42 PanelWindowResizerTest() {} |
| 40 ~PanelWindowResizerTest() override {} | 43 ~PanelWindowResizerTest() override {} |
| 41 | 44 |
| 42 void SetUp() override { | 45 void SetUp() override { |
| 43 AshTestBase::SetUp(); | 46 AshTestBase::SetUp(); |
| 44 UpdateDisplay("600x400"); | 47 UpdateDisplay("600x400"); |
| (...skipping 491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 536 INSTANTIATE_TEST_CASE_P(LtrRtl, | 539 INSTANTIATE_TEST_CASE_P(LtrRtl, |
| 537 PanelWindowResizerTextDirectionTest, | 540 PanelWindowResizerTextDirectionTest, |
| 538 testing::Bool()); | 541 testing::Bool()); |
| 539 INSTANTIATE_TEST_CASE_P(NormalPanelPopup, | 542 INSTANTIATE_TEST_CASE_P(NormalPanelPopup, |
| 540 PanelWindowResizerTransientTest, | 543 PanelWindowResizerTransientTest, |
| 541 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 544 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, |
| 542 ui::wm::WINDOW_TYPE_PANEL, | 545 ui::wm::WINDOW_TYPE_PANEL, |
| 543 ui::wm::WINDOW_TYPE_POPUP)); | 546 ui::wm::WINDOW_TYPE_POPUP)); |
| 544 | 547 |
| 545 } // namespace ash | 548 } // namespace ash |
| OLD | NEW |