| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/drag_window_resizer.h" | 5 #include "ash/wm/drag_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/material_design/material_design_controller.h" | 8 #include "ash/common/material_design/material_design_controller.h" |
| 9 #include "ash/common/shelf/shelf_layout_manager.h" | 9 #include "ash/common/shelf/shelf_layout_manager.h" |
| 10 #include "ash/common/shell_window_ids.h" | 10 #include "ash/common/shell_window_ids.h" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 aura::Window* window, | 145 aura::Window* window, |
| 146 const gfx::Point& point_in_parent, | 146 const gfx::Point& point_in_parent, |
| 147 int window_component) { | 147 int window_component) { |
| 148 return CreateWindowResizer(WmWindowAura::Get(window), point_in_parent, | 148 return CreateWindowResizer(WmWindowAura::Get(window), point_in_parent, |
| 149 window_component, | 149 window_component, |
| 150 aura::client::WINDOW_MOVE_SOURCE_MOUSE) | 150 aura::client::WINDOW_MOVE_SOURCE_MOUSE) |
| 151 .release(); | 151 .release(); |
| 152 } | 152 } |
| 153 | 153 |
| 154 bool TestIfMouseWarpsAt(const gfx::Point& point_in_screen) { | 154 bool TestIfMouseWarpsAt(const gfx::Point& point_in_screen) { |
| 155 return test::DisplayManagerTestApi::TestIfMouseWarpsAt(GetEventGenerator(), | 155 return test::AshTestBase::TestIfMouseWarpsAt(GetEventGenerator(), |
| 156 point_in_screen); | 156 point_in_screen); |
| 157 } | 157 } |
| 158 | 158 |
| 159 aura::test::TestWindowDelegate delegate_; | 159 aura::test::TestWindowDelegate delegate_; |
| 160 aura::test::TestWindowDelegate delegate2_; | 160 aura::test::TestWindowDelegate delegate2_; |
| 161 aura::test::TestWindowDelegate delegate3_; | 161 aura::test::TestWindowDelegate delegate3_; |
| 162 aura::test::TestWindowDelegate delegate4_; | 162 aura::test::TestWindowDelegate delegate4_; |
| 163 aura::test::TestWindowDelegate delegate5_; | 163 aura::test::TestWindowDelegate delegate5_; |
| 164 aura::test::TestWindowDelegate delegate6_; | 164 aura::test::TestWindowDelegate delegate6_; |
| 165 | 165 |
| 166 std::unique_ptr<aura::Window> window_; | 166 std::unique_ptr<aura::Window> window_; |
| (...skipping 613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 780 ASSERT_TRUE(resizer.get()); | 780 ASSERT_TRUE(resizer.get()); |
| 781 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0); | 781 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0); |
| 782 EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(399, 200))); | 782 EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(399, 200))); |
| 783 EXPECT_EQ("401,200", | 783 EXPECT_EQ("401,200", |
| 784 aura::Env::GetInstance()->last_mouse_location().ToString()); | 784 aura::Env::GetInstance()->last_mouse_location().ToString()); |
| 785 resizer->CompleteDrag(); | 785 resizer->CompleteDrag(); |
| 786 } | 786 } |
| 787 } | 787 } |
| 788 | 788 |
| 789 } // namespace ash | 789 } // namespace ash |
| OLD | NEW |