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

Unified Diff: ash/wm/root_window_event_filter_unittest.cc

Issue 9463003: aura-x11: Add custom web cursor support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 10 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 | « no previous file | ui/aura/aura.gyp » ('j') | ui/aura/cursor.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/root_window_event_filter_unittest.cc
diff --git a/ash/wm/root_window_event_filter_unittest.cc b/ash/wm/root_window_event_filter_unittest.cc
index f557119e6644cda3577bfa2c3c0b5b23b8cee1c2..f320bd969ef489a8cebb87b0e9bdef4dbad26442 100644
--- a/ash/wm/root_window_event_filter_unittest.cc
+++ b/ash/wm/root_window_event_filter_unittest.cc
@@ -384,45 +384,49 @@ TEST_F(RootWindowEventFilterTest, MouseEventCursors) {
aura::MouseEvent move2(ui::ET_MOUSE_MOVED, point2, point2, 0x0);
// Cursor starts as null.
- EXPECT_EQ(aura::kCursorNull, root_window->last_cursor());
+ EXPECT_EQ(aura::kCursorNull, root_window->last_cursor().native_type());
// Resize edges and corners show proper cursors.
window_delegate.set_hittest_code(HTBOTTOM);
root_window->DispatchMouseEvent(&move1);
- EXPECT_EQ(aura::kCursorSouthResize, root_window->last_cursor());
+ EXPECT_EQ(aura::kCursorSouthResize, root_window->last_cursor().native_type());
window_delegate.set_hittest_code(HTBOTTOMLEFT);
root_window->DispatchMouseEvent(&move2);
- EXPECT_EQ(aura::kCursorSouthWestResize, root_window->last_cursor());
+ EXPECT_EQ(aura::kCursorSouthWestResize,
+ root_window->last_cursor().native_type());
window_delegate.set_hittest_code(HTBOTTOMRIGHT);
root_window->DispatchMouseEvent(&move1);
- EXPECT_EQ(aura::kCursorSouthEastResize, root_window->last_cursor());
+ EXPECT_EQ(aura::kCursorSouthEastResize,
+ root_window->last_cursor().native_type());
window_delegate.set_hittest_code(HTLEFT);
root_window->DispatchMouseEvent(&move2);
- EXPECT_EQ(aura::kCursorWestResize, root_window->last_cursor());
+ EXPECT_EQ(aura::kCursorWestResize, root_window->last_cursor().native_type());
window_delegate.set_hittest_code(HTRIGHT);
root_window->DispatchMouseEvent(&move1);
- EXPECT_EQ(aura::kCursorEastResize, root_window->last_cursor());
+ EXPECT_EQ(aura::kCursorEastResize, root_window->last_cursor().native_type());
window_delegate.set_hittest_code(HTTOP);
root_window->DispatchMouseEvent(&move2);
- EXPECT_EQ(aura::kCursorNorthResize, root_window->last_cursor());
+ EXPECT_EQ(aura::kCursorNorthResize, root_window->last_cursor().native_type());
window_delegate.set_hittest_code(HTTOPLEFT);
root_window->DispatchMouseEvent(&move1);
- EXPECT_EQ(aura::kCursorNorthWestResize, root_window->last_cursor());
+ EXPECT_EQ(aura::kCursorNorthWestResize,
+ root_window->last_cursor().native_type());
window_delegate.set_hittest_code(HTTOPRIGHT);
root_window->DispatchMouseEvent(&move2);
- EXPECT_EQ(aura::kCursorNorthEastResize, root_window->last_cursor());
+ EXPECT_EQ(aura::kCursorNorthEastResize,
+ root_window->last_cursor().native_type());
// Client area uses null cursor.
window_delegate.set_hittest_code(HTCLIENT);
root_window->DispatchMouseEvent(&move1);
- EXPECT_EQ(aura::kCursorNull, root_window->last_cursor());
+ EXPECT_EQ(aura::kCursorNull, root_window->last_cursor().native_type());
}
TEST_F(RootWindowEventFilterTest, TransformActivate) {
« no previous file with comments | « no previous file | ui/aura/aura.gyp » ('j') | ui/aura/cursor.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698