Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(98)

Side by Side Diff: ash/wm/drag_window_resizer_unittest.cc

Issue 1913473002: Makes WorkspaceWindowResizer use ash/wm/common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@root_controller_observer
Patch Set: fix exo again Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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/display/display_manager.h" 7 #include "ash/display/display_manager.h"
8 #include "ash/display/mouse_cursor_event_filter.h" 8 #include "ash/display/mouse_cursor_event_filter.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/shelf/shelf_layout_manager.h" 10 #include "ash/shelf/shelf_layout_manager.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "ash/shell_window_ids.h" 12 #include "ash/shell_window_ids.h"
13 #include "ash/test/ash_test_base.h" 13 #include "ash/test/ash_test_base.h"
14 #include "ash/test/cursor_manager_test_api.h" 14 #include "ash/test/cursor_manager_test_api.h"
15 #include "ash/test/display_manager_test_api.h" 15 #include "ash/test/display_manager_test_api.h"
16 #include "ash/wm/aura/wm_window_aura.h"
16 #include "ash/wm/common/window_positioning_utils.h" 17 #include "ash/wm/common/window_positioning_utils.h"
17 #include "ash/wm/drag_window_controller.h" 18 #include "ash/wm/drag_window_controller.h"
18 #include "ash/wm/window_util.h" 19 #include "ash/wm/window_util.h"
19 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
20 #include "base/strings/stringprintf.h" 21 #include "base/strings/stringprintf.h"
21 #include "ui/aura/client/aura_constants.h" 22 #include "ui/aura/client/aura_constants.h"
22 #include "ui/aura/env.h" 23 #include "ui/aura/env.h"
23 #include "ui/aura/test/test_window_delegate.h" 24 #include "ui/aura/test/test_window_delegate.h"
24 #include "ui/base/hit_test.h" 25 #include "ui/base/hit_test.h"
25 #include "ui/base/ui_base_types.h" 26 #include "ui/base/ui_base_types.h"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 } 112 }
112 113
113 ShelfLayoutManager* shelf_layout_manager() { 114 ShelfLayoutManager* shelf_layout_manager() {
114 return Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager(); 115 return Shell::GetPrimaryRootWindowController()->GetShelfLayoutManager();
115 } 116 }
116 117
117 static WindowResizer* CreateDragWindowResizer( 118 static WindowResizer* CreateDragWindowResizer(
118 aura::Window* window, 119 aura::Window* window,
119 const gfx::Point& point_in_parent, 120 const gfx::Point& point_in_parent,
120 int window_component) { 121 int window_component) {
121 return CreateWindowResizer( 122 return CreateWindowResizer(wm::WmWindowAura::Get(window), point_in_parent,
122 window, 123 window_component,
123 point_in_parent, 124 aura::client::WINDOW_MOVE_SOURCE_MOUSE)
124 window_component, 125 .release();
125 aura::client::WINDOW_MOVE_SOURCE_MOUSE).release();
126 } 126 }
127 127
128 bool TestIfMouseWarpsAt(const gfx::Point& point_in_screen) { 128 bool TestIfMouseWarpsAt(const gfx::Point& point_in_screen) {
129 return test::DisplayManagerTestApi::TestIfMouseWarpsAt(GetEventGenerator(), 129 return test::DisplayManagerTestApi::TestIfMouseWarpsAt(GetEventGenerator(),
130 point_in_screen); 130 point_in_screen);
131 } 131 }
132 132
133 aura::test::TestWindowDelegate delegate_; 133 aura::test::TestWindowDelegate delegate_;
134 aura::test::TestWindowDelegate delegate2_; 134 aura::test::TestWindowDelegate delegate2_;
135 aura::test::TestWindowDelegate delegate3_; 135 aura::test::TestWindowDelegate delegate3_;
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
725 ASSERT_TRUE(resizer.get()); 725 ASSERT_TRUE(resizer.get());
726 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0); 726 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
727 EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(399, 200))); 727 EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(399, 200)));
728 EXPECT_EQ("401,200", 728 EXPECT_EQ("401,200",
729 aura::Env::GetInstance()->last_mouse_location().ToString()); 729 aura::Env::GetInstance()->last_mouse_location().ToString());
730 resizer->CompleteDrag(); 730 resizer->CompleteDrag();
731 } 731 }
732 } 732 }
733 733
734 } // namespace ash 734 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/dock/docked_window_resizer_unittest.cc ('k') | ash/wm/panels/panel_window_resizer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698