| 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" | |
| 8 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
| 9 #include "ash/common/shelf/shelf_layout_manager.h" | 8 #include "ash/common/shelf/shelf_layout_manager.h" |
| 10 #include "ash/common/wm/window_positioning_utils.h" | 9 #include "ash/common/wm/window_positioning_utils.h" |
| 10 #include "ash/common/wm_window.h" |
| 11 #include "ash/display/mouse_cursor_event_filter.h" | 11 #include "ash/display/mouse_cursor_event_filter.h" |
| 12 #include "ash/public/cpp/shell_window_ids.h" | 12 #include "ash/public/cpp/shell_window_ids.h" |
| 13 #include "ash/root_window_controller.h" | 13 #include "ash/root_window_controller.h" |
| 14 #include "ash/shell.h" | 14 #include "ash/shell.h" |
| 15 #include "ash/test/ash_md_test_base.h" | 15 #include "ash/test/ash_md_test_base.h" |
| 16 #include "ash/test/cursor_manager_test_api.h" | 16 #include "ash/test/cursor_manager_test_api.h" |
| 17 #include "ash/wm/drag_window_controller.h" | 17 #include "ash/wm/drag_window_controller.h" |
| 18 #include "ash/wm/window_util.h" | 18 #include "ash/wm/window_util.h" |
| 19 #include "base/strings/string_number_conversions.h" | 19 #include "base/strings/string_number_conversions.h" |
| 20 #include "base/strings/stringprintf.h" | 20 #include "base/strings/stringprintf.h" |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 134 } | 134 } |
| 135 | 135 |
| 136 ShelfLayoutManager* shelf_layout_manager() { | 136 ShelfLayoutManager* shelf_layout_manager() { |
| 137 return Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager(); | 137 return Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager(); |
| 138 } | 138 } |
| 139 | 139 |
| 140 static WindowResizer* CreateDragWindowResizer( | 140 static WindowResizer* CreateDragWindowResizer( |
| 141 aura::Window* window, | 141 aura::Window* window, |
| 142 const gfx::Point& point_in_parent, | 142 const gfx::Point& point_in_parent, |
| 143 int window_component) { | 143 int window_component) { |
| 144 return CreateWindowResizer(WmWindowAura::Get(window), point_in_parent, | 144 return CreateWindowResizer(WmWindow::Get(window), point_in_parent, |
| 145 window_component, | 145 window_component, |
| 146 aura::client::WINDOW_MOVE_SOURCE_MOUSE) | 146 aura::client::WINDOW_MOVE_SOURCE_MOUSE) |
| 147 .release(); | 147 .release(); |
| 148 } | 148 } |
| 149 | 149 |
| 150 bool TestIfMouseWarpsAt(const gfx::Point& point_in_screen) { | 150 bool TestIfMouseWarpsAt(const gfx::Point& point_in_screen) { |
| 151 return test::AshTestBase::TestIfMouseWarpsAt(GetEventGenerator(), | 151 return test::AshTestBase::TestIfMouseWarpsAt(GetEventGenerator(), |
| 152 point_in_screen); | 152 point_in_screen); |
| 153 } | 153 } |
| 154 | 154 |
| (...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 775 ASSERT_TRUE(resizer.get()); | 775 ASSERT_TRUE(resizer.get()); |
| 776 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0); | 776 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0); |
| 777 EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(399, 200))); | 777 EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(399, 200))); |
| 778 EXPECT_EQ("401,200", | 778 EXPECT_EQ("401,200", |
| 779 aura::Env::GetInstance()->last_mouse_location().ToString()); | 779 aura::Env::GetInstance()->last_mouse_location().ToString()); |
| 780 resizer->CompleteDrag(); | 780 resizer->CompleteDrag(); |
| 781 } | 781 } |
| 782 } | 782 } |
| 783 | 783 |
| 784 } // namespace ash | 784 } // namespace ash |
| OLD | NEW |