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

Unified Diff: ash/display/mouse_cursor_event_filter_unittest.cc

Issue 249303002: Revert of Use platform's device scale factor for cursor (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/display/screen_ash.cc » ('j') | no next file with comments »
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 3325d37a0cb33edc814ee5b81f8b14be5cb32218..1b344563208877aac7877a39a0ad8aed41953320 100644
--- a/ash/display/mouse_cursor_event_filter_unittest.cc
+++ b/ash/display/mouse_cursor_event_filter_unittest.cc
@@ -368,11 +368,11 @@
test::CursorManagerTestApi cursor_test_api(
Shell::GetInstance()->cursor_manager());
- EXPECT_EQ(1.0f, cursor_test_api.GetCurrentCursor().device_scale_factor());
+ EXPECT_EQ(1.0f, cursor_test_api.GetDisplay().device_scale_factor());
WarpMouseCursorIfNecessary(root_windows[0], gfx::Point(399, 200));
- EXPECT_EQ(2.0f, cursor_test_api.GetCurrentCursor().device_scale_factor());
+ EXPECT_EQ(2.0f, cursor_test_api.GetDisplay().device_scale_factor());
WarpMouseCursorIfNecessary(root_windows[1], gfx::Point(400, 200));
- EXPECT_EQ(1.0f, cursor_test_api.GetCurrentCursor().device_scale_factor());
+ EXPECT_EQ(1.0f, cursor_test_api.GetDisplay().device_scale_factor());
}
} // namespace ash
« no previous file with comments | « ash/display/display_manager.cc ('k') | ash/display/screen_ash.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698