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

Unified Diff: ash/display/mouse_cursor_event_filter_unittest.cc

Issue 11412315: Make the cursor have separate mode for disabled mouse events and invisible. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/magnifier/magnification_controller.cc » ('j') | ui/aura/client/cursor_client.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/mouse_cursor_event_filter_unittest.cc
diff --git a/ash/display/mouse_cursor_event_filter_unittest.cc b/ash/display/mouse_cursor_event_filter_unittest.cc
index 6bdc907f761ad4454319b2371fb2df01a67f7c2d..00a53f506bbcefd7d2825ce18c703b953441b33f 100644
--- a/ash/display/mouse_cursor_event_filter_unittest.cc
+++ b/ash/display/mouse_cursor_event_filter_unittest.cc
@@ -105,8 +105,7 @@ TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentSizeDisplays) {
display_controller()->default_display_layout().position);
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
- aura::Env::GetInstance()->SetLastMouseLocation(*root_windows[1],
- gfx::Point(123, 123));
+ aura::Env::GetInstance()->set_last_mouse_location(gfx::Point(623, 123));
// Touch the left edge of the secondary root window. Pointer should NOT warp
// because 1px left of (0, 500) is outside the primary root window.
@@ -138,8 +137,7 @@ TEST_F(MouseCursorEventFilterTest, WarpMouseDifferentScaleDisplays) {
display_controller()->default_display_layout().position);
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
- aura::Env::GetInstance()->SetLastMouseLocation(*root_windows[1],
- gfx::Point(400, 123));
+ aura::Env::GetInstance()->set_last_mouse_location(gfx::Point(900, 123));
// This emulates the dragging back to the 2nd display, which has
// higher scale factor, by having 2nd display's root as target
@@ -168,8 +166,7 @@ TEST_F(MouseCursorEventFilterTest, SetMouseWarpModeFlag) {
Shell::GetInstance()->mouse_cursor_filter();
Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
- aura::Env::GetInstance()->SetLastMouseLocation(*root_windows[0],
- gfx::Point(1, 1));
+ aura::Env::GetInstance()->set_last_mouse_location(gfx::Point(1, 1));
event_filter->set_mouse_warp_mode(MouseCursorEventFilter::WARP_NONE);
bool is_warped = event_filter->WarpMouseCursorIfNecessary(root_windows[0],
« no previous file with comments | « no previous file | ash/magnifier/magnification_controller.cc » ('j') | ui/aura/client/cursor_client.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698