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

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

Issue 1900443002: Removes aura dependencies from WindowPositioner (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nuke GetWorkAreaForWindowInParent and fix windows 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
« no previous file with comments | « ash/wm/drag_window_resizer.cc ('k') | ash/wm/window_positioner.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/common/window_positioning_utils.h"
16 #include "ash/wm/drag_window_controller.h" 17 #include "ash/wm/drag_window_controller.h"
17 #include "ash/wm/window_util.h" 18 #include "ash/wm/window_util.h"
18 #include "base/strings/string_number_conversions.h" 19 #include "base/strings/string_number_conversions.h"
19 #include "base/strings/stringprintf.h" 20 #include "base/strings/stringprintf.h"
20 #include "ui/aura/client/aura_constants.h" 21 #include "ui/aura/client/aura_constants.h"
21 #include "ui/aura/env.h" 22 #include "ui/aura/env.h"
22 #include "ui/aura/test/test_window_delegate.h" 23 #include "ui/aura/test/test_window_delegate.h"
23 #include "ui/base/hit_test.h" 24 #include "ui/base/hit_test.h"
24 #include "ui/base/ui_base_types.h" 25 #include "ui/base/ui_base_types.h"
25 #include "ui/compositor/layer_tree_owner.h" 26 #include "ui/compositor/layer_tree_owner.h"
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 std::unique_ptr<WindowResizer> resizer( 205 std::unique_ptr<WindowResizer> resizer(
205 CreateDragWindowResizer(window_.get(), gfx::Point(49, 0), HTCAPTION)); 206 CreateDragWindowResizer(window_.get(), gfx::Point(49, 0), HTCAPTION));
206 ASSERT_TRUE(resizer.get()); 207 ASSERT_TRUE(resizer.get());
207 resizer->Drag(CalculateDragPoint(*resizer, 751, 10), ui::EF_CONTROL_DOWN); 208 resizer->Drag(CalculateDragPoint(*resizer, 751, 10), ui::EF_CONTROL_DOWN);
208 resizer->CompleteDrag(); 209 resizer->CompleteDrag();
209 // Since the pointer is on the secondary, the parent should be changed 210 // Since the pointer is on the secondary, the parent should be changed
210 // even though only small fraction of the window is within the secondary 211 // even though only small fraction of the window is within the secondary
211 // root window's bounds. 212 // root window's bounds.
212 EXPECT_EQ(root_windows[1], window_->GetRootWindow()); 213 EXPECT_EQ(root_windows[1], window_->GetRootWindow());
213 // Window origin should be adjusted for minimum visibility (25px). 214 // Window origin should be adjusted for minimum visibility (25px).
214 int expected_x = -50 + kMinimumOnScreenArea; 215 int expected_x = -50 + wm::kMinimumOnScreenArea;
215 216
216 EXPECT_EQ(base::IntToString(expected_x) + ",10 50x60", 217 EXPECT_EQ(base::IntToString(expected_x) + ",10 50x60",
217 window_->bounds().ToString()); 218 window_->bounds().ToString());
218 } 219 }
219 // Dropping a window that is larger than the destination work area 220 // Dropping a window that is larger than the destination work area
220 // will shrink to fit to the work area. 221 // will shrink to fit to the work area.
221 window_->SetBoundsInScreen(gfx::Rect(0, 0, 700, 500), 222 window_->SetBoundsInScreen(gfx::Rect(0, 0, 700, 500),
222 gfx::Screen::GetScreen()->GetPrimaryDisplay()); 223 gfx::Screen::GetScreen()->GetPrimaryDisplay());
223 EXPECT_EQ(root_windows[0], window_->GetRootWindow()); 224 EXPECT_EQ(root_windows[0], window_->GetRootWindow());
224 { 225 {
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 ASSERT_TRUE(resizer.get()); 725 ASSERT_TRUE(resizer.get());
725 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0); 726 resizer->Drag(CalculateDragPoint(*resizer, 399, 200), 0);
726 EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(399, 200))); 727 EXPECT_TRUE(TestIfMouseWarpsAt(gfx::Point(399, 200)));
727 EXPECT_EQ("401,200", 728 EXPECT_EQ("401,200",
728 aura::Env::GetInstance()->last_mouse_location().ToString()); 729 aura::Env::GetInstance()->last_mouse_location().ToString());
729 resizer->CompleteDrag(); 730 resizer->CompleteDrag();
730 } 731 }
731 } 732 }
732 733
733 } // namespace ash 734 } // namespace ash
OLDNEW
« no previous file with comments | « ash/wm/drag_window_resizer.cc ('k') | ash/wm/window_positioner.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698