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

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: fix win_aura 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 | « ui/aura/root_window_unittest.cc ('k') | ui/views/corewm/compound_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/window_unittest.cc
diff --git a/ui/aura/window_unittest.cc b/ui/aura/window_unittest.cc
index 1aec91f6a708aef4a650e858d9ea47c9f930c021..c2df2e96784534a8c773e26878fff8c569018b0b 100644
--- a/ui/aura/window_unittest.cc
+++ b/ui/aura/window_unittest.cc
@@ -375,8 +375,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());
@@ -456,7 +458,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());
« no previous file with comments | « ui/aura/root_window_unittest.cc ('k') | ui/views/corewm/compound_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698