Initial support of large mouse cursor on Exosphere

ash/wm/window_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/common/shell_window_ids.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_activation_delegate.h"
 #include "ash/wm/window_util.h"
 #include "ui/aura/client/cursor_client_observer.h"
@@ skipping 13 matching lines @@
 #include "ui/wm/core/compound_event_filter.h"
 #include "ui/wm/public/activation_client.h"
 #include "ui/wm/public/activation_delegate.h"
 
 namespace {
 
 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),
+        did_cursor_set_change_(false) {}
+  void reset() {
+    cursor_visibility_ = did_visibility_change_ = false;

[sky, 2016/06/20 15:27:51]

Shouldn't you reset cursor_set_ too?

[yoshiki, 2016/06/28 02:12:42]

Done.

+    did_cursor_set_change_ = false;
+  }
   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_; }
+  bool did_cursor_set_change() const { return did_cursor_set_change_; }
 
   // Overridden from aura::client::CursorClientObserver:
   void OnCursorVisibilityChanged(bool is_visible) override {
     cursor_visibility_ = is_visible;
     did_visibility_change_ = true;
   }
+  void OnCursorSetChanged(ui::CursorSetType new_cursor_set) override {
+    cursor_set_ = new_cursor_set;
+    did_cursor_set_change_ = true;
+  }
 
  private:
   bool cursor_visibility_;
   bool did_visibility_change_;
+  ui::CursorSetType cursor_set_;
+  bool did_cursor_set_change_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingCursorClientObserver);
 };
 
 base::TimeTicks getTime() {
   return ui::EventTimeForNow();
 }
 
 // A slightly changed TestEventHandler which can be configured to return a
 // specified value for key/mouse event handling.
@@ skipping 750 matching lines @@
   cursor_manager->AddObserver(&observer_a);
   cursor_manager->AddObserver(&observer_b);
 
   // Initial state before any events have been sent.
   observer_a.reset();
   observer_b.reset();
   EXPECT_FALSE(observer_a.did_visibility_change());
   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_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);
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_TRUE(observer_b.did_visibility_change());
   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_TRUE(observer_a.did_cursor_set_change());
+  EXPECT_TRUE(observer_b.did_cursor_set_change());
+  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();
   generator.MoveMouseTo(50, 50);
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_TRUE(observer_b.did_visibility_change());
   EXPECT_TRUE(observer_a.is_cursor_visible());
   EXPECT_TRUE(observer_b.is_cursor_visible());
 
   // Remove observer_b. Its OnCursorVisibilityChanged() should
   // not be invoked past this point.
   cursor_manager->RemoveObserver(&observer_b);
 
   // Gesture tap should hide the cursor.
   observer_a.reset();
   observer_b.reset();
   generator.GestureTapAt(gfx::Point(25, 25));
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_FALSE(observer_a.is_cursor_visible());
 
+  // Set back cursor set to normal.
+  cursor_manager->SetCursorSet(ui::CURSOR_SET_NORMAL);
+  EXPECT_TRUE(observer_a.did_cursor_set_change());
+  EXPECT_FALSE(observer_b.did_cursor_set_change());
+  EXPECT_EQ(ui::CURSOR_SET_NORMAL, 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();
   generator.MoveMouseTo(50, 50);
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_TRUE(observer_a.is_cursor_visible());
 
   cursor_manager->RemoveObserver(&observer_a);
 }
 #endif  // defined(OS_CHROMEOS)
 
 }  // namespace ash