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 91e3367009c995ff350104d1e108a781b8cdc4d1..17e06033a68fce0e2dfcf1bee313f0b7f730c2bf 100644 |
--- a/ui/wm/core/cursor_manager_unittest.cc |
+++ b/ui/wm/core/cursor_manager_unittest.cc |
@@ -35,9 +35,9 @@ class TestingCursorManager : public wm::NativeCursorManager { |
delegate->CommitMouseEventsEnabled(enabled); |
} |
- void SetCursorSet(ui::CursorSetType cursor_set, |
- wm::NativeCursorManagerDelegate* delegate) override { |
- delegate->CommitCursorSet(cursor_set); |
+ void SetCursorSize(ui::CursorSize cursor_size, |
+ wm::NativeCursorManagerDelegate* delegate) override { |
+ delegate->CommitCursorSize(cursor_size); |
} |
}; |
@@ -153,24 +153,24 @@ TEST_F(CursorManagerTest, EnableDisableMouseEvents) { |
EXPECT_FALSE(cursor_manager_.IsMouseEventsEnabled()); |
} |
-TEST_F(CursorManagerTest, SetCursorSet) { |
+TEST_F(CursorManagerTest, SetCursorSize) { |
wm::TestingCursorClientObserver observer; |
cursor_manager_.AddObserver(&observer); |
- EXPECT_EQ(ui::CURSOR_SET_NORMAL, cursor_manager_.GetCursorSet()); |
- EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer.cursor_set()); |
+ EXPECT_EQ(ui::CursorSize::kNormal, cursor_manager_.GetCursorSize()); |
+ EXPECT_EQ(ui::CursorSize::kNormal, observer.cursor_size()); |
- cursor_manager_.SetCursorSet(ui::CURSOR_SET_NORMAL); |
- EXPECT_EQ(ui::CURSOR_SET_NORMAL, cursor_manager_.GetCursorSet()); |
- EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer.cursor_set()); |
+ cursor_manager_.SetCursorSize(ui::CursorSize::kNormal); |
+ EXPECT_EQ(ui::CursorSize::kNormal, cursor_manager_.GetCursorSize()); |
+ EXPECT_EQ(ui::CursorSize::kNormal, observer.cursor_size()); |
- cursor_manager_.SetCursorSet(ui::CURSOR_SET_LARGE); |
- EXPECT_EQ(ui::CURSOR_SET_LARGE, cursor_manager_.GetCursorSet()); |
- EXPECT_EQ(ui::CURSOR_SET_LARGE, observer.cursor_set()); |
+ cursor_manager_.SetCursorSize(ui::CursorSize::kLarge); |
+ EXPECT_EQ(ui::CursorSize::kLarge, cursor_manager_.GetCursorSize()); |
+ EXPECT_EQ(ui::CursorSize::kLarge, observer.cursor_size()); |
- cursor_manager_.SetCursorSet(ui::CURSOR_SET_NORMAL); |
- EXPECT_EQ(ui::CURSOR_SET_NORMAL, cursor_manager_.GetCursorSet()); |
- EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer.cursor_set()); |
+ cursor_manager_.SetCursorSize(ui::CursorSize::kNormal); |
+ EXPECT_EQ(ui::CursorSize::kNormal, cursor_manager_.GetCursorSize()); |
+ EXPECT_EQ(ui::CursorSize::kNormal, observer.cursor_size()); |
} |
TEST_F(CursorManagerTest, IsMouseEventsEnabled) { |
@@ -273,8 +273,8 @@ TEST_F(CursorManagerTest, TestCursorClientObserver) { |
EXPECT_FALSE(observer_b.did_visibility_change()); |
EXPECT_FALSE(observer_a.is_cursor_visible()); |
EXPECT_FALSE(observer_b.is_cursor_visible()); |
- EXPECT_FALSE(observer_a.did_cursor_set_change()); |
- EXPECT_FALSE(observer_b.did_cursor_set_change()); |
+ EXPECT_FALSE(observer_a.did_cursor_size_change()); |
+ EXPECT_FALSE(observer_b.did_cursor_size_change()); |
// Hide the cursor using HideCursor(). |
cursor_manager_.HideCursor(); |
@@ -284,11 +284,11 @@ TEST_F(CursorManagerTest, TestCursorClientObserver) { |
EXPECT_FALSE(observer_b.is_cursor_visible()); |
// Set the cursor set. |
- cursor_manager_.SetCursorSet(ui::CURSOR_SET_LARGE); |
- EXPECT_TRUE(observer_a.did_cursor_set_change()); |
- EXPECT_EQ(ui::CURSOR_SET_LARGE, observer_a.cursor_set()); |
- EXPECT_TRUE(observer_b.did_cursor_set_change()); |
- EXPECT_EQ(ui::CURSOR_SET_LARGE, observer_b.cursor_set()); |
+ cursor_manager_.SetCursorSize(ui::CursorSize::kLarge); |
+ EXPECT_TRUE(observer_a.did_cursor_size_change()); |
+ EXPECT_EQ(ui::CursorSize::kLarge, observer_a.cursor_size()); |
+ EXPECT_TRUE(observer_b.did_cursor_size_change()); |
+ EXPECT_EQ(ui::CursorSize::kLarge, observer_b.cursor_size()); |
// Show the cursor using ShowCursor(). |
observer_a.reset(); |
@@ -312,10 +312,10 @@ TEST_F(CursorManagerTest, TestCursorClientObserver) { |
EXPECT_FALSE(observer_a.is_cursor_visible()); |
// Set back the cursor set to normal. |
- cursor_manager_.SetCursorSet(ui::CURSOR_SET_NORMAL); |
- EXPECT_TRUE(observer_a.did_cursor_set_change()); |
- EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer_a.cursor_set()); |
- EXPECT_FALSE(observer_b.did_cursor_set_change()); |
+ cursor_manager_.SetCursorSize(ui::CursorSize::kNormal); |
+ EXPECT_TRUE(observer_a.did_cursor_size_change()); |
+ EXPECT_EQ(ui::CursorSize::kNormal, observer_a.cursor_size()); |
+ EXPECT_FALSE(observer_b.did_cursor_size_change()); |
// Show the cursor using ShowCursor(). |
observer_a.reset(); |