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

Unified Diff: ash/extended_desktop_unittest.cc

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: OK, it can't be explicit for mac. Created 3 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/drag_drop/drag_drop_controller.cc ('k') | ash/mus/move_event_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/extended_desktop_unittest.cc
diff --git a/ash/extended_desktop_unittest.cc b/ash/extended_desktop_unittest.cc
index 5cca23da1d904c12cecbb609ec60614787f61287..e0e939ece9866b56c17ce48c66f163b92277e2f7 100644
--- a/ash/extended_desktop_unittest.cc
+++ b/ash/extended_desktop_unittest.cc
@@ -256,11 +256,11 @@ TEST_F(ExtendedDesktopTest, TestCursor) {
aura::Window::Windows root_windows = Shell::GetAllRootWindows();
aura::WindowTreeHost* host0 = root_windows[0]->GetHost();
aura::WindowTreeHost* host1 = root_windows[1]->GetHost();
- EXPECT_EQ(ui::kCursorPointer, host0->last_cursor().native_type());
- EXPECT_EQ(ui::kCursorNull, host1->last_cursor().native_type());
- Shell::Get()->cursor_manager()->SetCursor(ui::kCursorCopy);
- EXPECT_EQ(ui::kCursorCopy, host0->last_cursor().native_type());
- EXPECT_EQ(ui::kCursorCopy, host1->last_cursor().native_type());
+ EXPECT_EQ(ui::CursorType::kPointer, host0->last_cursor().native_type());
+ EXPECT_EQ(ui::CursorType::kNull, host1->last_cursor().native_type());
+ Shell::Get()->cursor_manager()->SetCursor(ui::CursorType::kCopy);
+ EXPECT_EQ(ui::CursorType::kCopy, host0->last_cursor().native_type());
+ EXPECT_EQ(ui::CursorType::kCopy, host1->last_cursor().native_type());
}
TEST_F(ExtendedDesktopTest, TestCursorLocation) {
« no previous file with comments | « ash/drag_drop/drag_drop_controller.cc ('k') | ash/mus/move_event_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698