| 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_resizer.h" | 5 #include "ash/wm/dock/docked_window_resizer.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_util.h" | 9 #include "ash/screen_util.h" |
| 10 #include "ash/shelf/shelf.h" | 10 #include "ash/shelf/shelf.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 #include "ash/wm/window_util.h" | 26 #include "ash/wm/window_util.h" |
| 27 #include "ash/wm/wm_event.h" | 27 #include "ash/wm/wm_event.h" |
| 28 #include "base/command_line.h" | 28 #include "base/command_line.h" |
| 29 #include "ui/aura/client/aura_constants.h" | 29 #include "ui/aura/client/aura_constants.h" |
| 30 #include "ui/aura/client/window_tree_client.h" | 30 #include "ui/aura/client/window_tree_client.h" |
| 31 #include "ui/aura/test/event_generator.h" | 31 #include "ui/aura/test/event_generator.h" |
| 32 #include "ui/aura/test/test_window_delegate.h" | 32 #include "ui/aura/test/test_window_delegate.h" |
| 33 #include "ui/aura/window_event_dispatcher.h" | 33 #include "ui/aura/window_event_dispatcher.h" |
| 34 #include "ui/base/hit_test.h" | 34 #include "ui/base/hit_test.h" |
| 35 #include "ui/base/ui_base_types.h" | 35 #include "ui/base/ui_base_types.h" |
| 36 #include "ui/views/corewm/window_util.h" | |
| 37 #include "ui/views/widget/widget.h" | 36 #include "ui/views/widget/widget.h" |
| 37 #include "ui/wm/core/window_util.h" |
| 38 | 38 |
| 39 namespace ash { | 39 namespace ash { |
| 40 namespace internal { | 40 namespace internal { |
| 41 | 41 |
| 42 class DockedWindowResizerTest | 42 class DockedWindowResizerTest |
| 43 : public test::AshTestBase, | 43 : public test::AshTestBase, |
| 44 public testing::WithParamInterface<ui::wm::WindowType> { | 44 public testing::WithParamInterface<ui::wm::WindowType> { |
| 45 public: | 45 public: |
| 46 DockedWindowResizerTest() : model_(NULL), window_type_(GetParam()) {} | 46 DockedWindowResizerTest() : model_(NULL), window_type_(GetParam()) {} |
| 47 virtual ~DockedWindowResizerTest() {} | 47 virtual ~DockedWindowResizerTest() {} |
| (...skipping 1569 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1617 EXPECT_TRUE(window_state->IsMaximized()); | 1617 EXPECT_TRUE(window_state->IsMaximized()); |
| 1618 } | 1618 } |
| 1619 | 1619 |
| 1620 // Tests run twice - on both panels and normal windows | 1620 // Tests run twice - on both panels and normal windows |
| 1621 INSTANTIATE_TEST_CASE_P(NormalOrPanel, | 1621 INSTANTIATE_TEST_CASE_P(NormalOrPanel, |
| 1622 DockedWindowResizerTest, | 1622 DockedWindowResizerTest, |
| 1623 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, | 1623 testing::Values(ui::wm::WINDOW_TYPE_NORMAL, |
| 1624 ui::wm::WINDOW_TYPE_PANEL)); | 1624 ui::wm::WINDOW_TYPE_PANEL)); |
| 1625 } // namespace internal | 1625 } // namespace internal |
| 1626 } // namespace ash | 1626 } // namespace ash |
| OLD | NEW |