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

Unified Diff: ui/aura/window_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
Index: ui/aura/window_unittest.cc
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 6289000c45b7f9fec71f05da90a3ac86f85c71fe..6a5ecd70821158d3d05a9d13fb1467d987bb1e68 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -376,8 +376,10 @@ TEST_F(WindowTest, MoveCursorToWithTransformRootWindow) {
root->SetTransform(transform);
root->MoveCursorTo(gfx::Point(10, 10));
#if !defined(OS_WIN)
+ gfx::Point mouse_location;
+ EXPECT_TRUE(root->QueryMouseLocationForTest(&mouse_location));
// TODO(yoshiki): fix this to build on Windows. See crbug.com/133413.OD
- EXPECT_EQ("50,120", root->QueryMouseLocationForTest().ToString());
+ EXPECT_EQ("50,120", mouse_location.ToString());
#endif
EXPECT_EQ("10,10",
gfx::Screen::GetScreenFor(root)->GetCursorScreenPoint().ToString());
@@ -457,7 +459,9 @@ TEST_F(WindowTest, MoveCursorToWithComplexTransform) {
#if !defined(OS_WIN)
// TODO(yoshiki): fix this to build on Windows. See crbug.com/133413.
- EXPECT_EQ("169,80", root->QueryMouseLocationForTest().ToString());
+ gfx::Point mouse_location;
+ EXPECT_TRUE(root->QueryMouseLocationForTest(&mouse_location));
+ EXPECT_EQ("169,80", mouse_location.ToString());
#endif
EXPECT_EQ("20,53",
gfx::Screen::GetScreenFor(root)->GetCursorScreenPoint().ToString());

Powered by Google App Engine
This is Rietveld 408576698