| Index: ash/wm/window_manager_unittest.cc
|
| diff --git a/ash/wm/window_manager_unittest.cc b/ash/wm/window_manager_unittest.cc
|
| index eb41fd467d650b4c05d839506a1eb5d46c2e619e..f707cc5742411b57d57649680bfa80ef7055a98d 100644
|
| --- a/ash/wm/window_manager_unittest.cc
|
| +++ b/ash/wm/window_manager_unittest.cc
|
| @@ -31,9 +31,14 @@ class TestingCursorClientObserver : public aura::client::CursorClientObserver {
|
| public:
|
| TestingCursorClientObserver()
|
| : cursor_visibility_(false),
|
| - did_visibility_change_(false) {}
|
| - void reset() { cursor_visibility_ = did_visibility_change_ = false; }
|
| + did_visibility_change_(false),
|
| + cursor_set_(ui::CURSOR_SET_NORMAL) {}
|
| + void reset() {
|
| + cursor_visibility_ = did_visibility_change_ = false;
|
| + cursor_set_ = ui::CURSOR_SET_NORMAL;
|
| + }
|
| bool is_cursor_visible() const { return cursor_visibility_; }
|
| + ui::CursorSetType cursor_set() const { return cursor_set_; }
|
| bool did_visibility_change() const { return did_visibility_change_; }
|
|
|
| // Overridden from aura::client::CursorClientObserver:
|
| @@ -41,10 +46,14 @@ class TestingCursorClientObserver : public aura::client::CursorClientObserver {
|
| cursor_visibility_ = is_visible;
|
| did_visibility_change_ = true;
|
| }
|
| + void OnCursorSetChanged(ui::CursorSetType new_cursor_set) override {
|
| + cursor_set_ = new_cursor_set;
|
| + }
|
|
|
| private:
|
| bool cursor_visibility_;
|
| bool did_visibility_change_;
|
| + ui::CursorSetType cursor_set_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestingCursorClientObserver);
|
| };
|
| @@ -815,6 +824,8 @@ TEST_F(WindowManagerTest, TestCursorClientObserver) {
|
| EXPECT_FALSE(observer_b.did_visibility_change());
|
| EXPECT_FALSE(observer_a.is_cursor_visible());
|
| EXPECT_FALSE(observer_b.is_cursor_visible());
|
| + EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer_a.cursor_set());
|
| + EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer_b.cursor_set());
|
|
|
| // Keypress should hide the cursor.
|
| generator.PressKey(ui::VKEY_A, ui::EF_NONE);
|
| @@ -823,6 +834,11 @@ TEST_F(WindowManagerTest, TestCursorClientObserver) {
|
| EXPECT_FALSE(observer_a.is_cursor_visible());
|
| EXPECT_FALSE(observer_b.is_cursor_visible());
|
|
|
| + // Set cursor set.
|
| + cursor_manager->SetCursorSet(ui::CURSOR_SET_LARGE);
|
| + EXPECT_EQ(ui::CURSOR_SET_LARGE, observer_a.cursor_set());
|
| + EXPECT_EQ(ui::CURSOR_SET_LARGE, observer_b.cursor_set());
|
| +
|
| // Mouse move should show the cursor.
|
| observer_a.reset();
|
| observer_b.reset();
|
| @@ -844,6 +860,11 @@ TEST_F(WindowManagerTest, TestCursorClientObserver) {
|
| EXPECT_FALSE(observer_b.did_visibility_change());
|
| EXPECT_FALSE(observer_a.is_cursor_visible());
|
|
|
| + // Set cursor set.
|
| + cursor_manager->SetCursorSet(ui::CURSOR_SET_LARGE);
|
| + EXPECT_EQ(ui::CURSOR_SET_LARGE, observer_a.cursor_set());
|
| + EXPECT_EQ(ui::CURSOR_SET_NORMAL, observer_b.cursor_set());
|
| +
|
| // Mouse move should show the cursor.
|
| observer_a.reset();
|
| observer_b.reset();
|
|
|