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

Unified Diff: ui/wm/core/cursor_manager_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 | « ui/wm/core/cursor_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/cursor_manager_unittest.cc
diff --git a/ui/wm/core/cursor_manager_unittest.cc b/ui/wm/core/cursor_manager_unittest.cc
index df18de8350d8a25743224cb71a3354a73f70fe50..91e3367009c995ff350104d1e108a781b8cdc4d1 100644
--- a/ui/wm/core/cursor_manager_unittest.cc
+++ b/ui/wm/core/cursor_manager_unittest.cc
@@ -54,15 +54,15 @@ class CursorManagerTest : public aura::test::AuraTestBase {
};
TEST_F(CursorManagerTest, ShowHideCursor) {
- cursor_manager_.SetCursor(ui::kCursorCopy);
- EXPECT_EQ(ui::kCursorCopy, cursor_manager_.GetCursor().native_type());
+ cursor_manager_.SetCursor(ui::CursorType::kCopy);
+ EXPECT_EQ(ui::CursorType::kCopy, cursor_manager_.GetCursor().native_type());
cursor_manager_.ShowCursor();
EXPECT_TRUE(cursor_manager_.IsCursorVisible());
cursor_manager_.HideCursor();
EXPECT_FALSE(cursor_manager_.IsCursorVisible());
// The current cursor does not change even when the cursor is not shown.
- EXPECT_EQ(ui::kCursorCopy, cursor_manager_.GetCursor().native_type());
+ EXPECT_EQ(ui::CursorType::kCopy, cursor_manager_.GetCursor().native_type());
// Check if cursor visibility is locked.
cursor_manager_.LockCursor();
@@ -105,15 +105,15 @@ TEST_F(CursorManagerTest, ShowHideCursor) {
// Verifies that LockCursor/UnlockCursor work correctly with
// EnableMouseEvents and DisableMouseEvents
TEST_F(CursorManagerTest, EnableDisableMouseEvents) {
- cursor_manager_.SetCursor(ui::kCursorCopy);
- EXPECT_EQ(ui::kCursorCopy, cursor_manager_.GetCursor().native_type());
+ cursor_manager_.SetCursor(ui::CursorType::kCopy);
+ EXPECT_EQ(ui::CursorType::kCopy, cursor_manager_.GetCursor().native_type());
cursor_manager_.EnableMouseEvents();
EXPECT_TRUE(cursor_manager_.IsMouseEventsEnabled());
cursor_manager_.DisableMouseEvents();
EXPECT_FALSE(cursor_manager_.IsMouseEventsEnabled());
// The current cursor does not change even when the cursor is not shown.
- EXPECT_EQ(ui::kCursorCopy, cursor_manager_.GetCursor().native_type());
+ EXPECT_EQ(ui::CursorType::kCopy, cursor_manager_.GetCursor().native_type());
// Check if cursor enable state is locked.
cursor_manager_.LockCursor();
« no previous file with comments | « ui/wm/core/cursor_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698