Implement large cursors in Mushrome.

ui/wm/core/cursor_manager_unittest.cc

 // Copyright (c) 2013 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 "ui/wm/core/cursor_manager.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/cursor_client_observer.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 17 matching lines @@
                      wm::NativeCursorManagerDelegate* delegate) override {
     delegate->CommitVisibility(visible);
   }
 
   void SetMouseEventsEnabled(
       bool enabled,
       wm::NativeCursorManagerDelegate* delegate) override {
     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);
   }
 };
 
 }  // namespace
 
 class CursorManagerTest : public aura::test::AuraTestBase {
  protected:
   CursorManagerTest()
       : delegate_(new TestingCursorManager),
         cursor_manager_(base::WrapUnique(delegate_)) {}
@@ skipping 95 matching lines @@
   cursor_manager_.EnableMouseEvents();
   cursor_manager_.UnlockCursor();
   EXPECT_TRUE(cursor_manager_.IsMouseEventsEnabled());
 
   cursor_manager_.DisableMouseEvents();
   cursor_manager_.LockCursor();
   cursor_manager_.UnlockCursor();
   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) {
   cursor_manager_.EnableMouseEvents();
   EXPECT_TRUE(cursor_manager_.IsMouseEventsEnabled());
   cursor_manager_.DisableMouseEvents();
   EXPECT_FALSE(cursor_manager_.IsMouseEventsEnabled());
 }
 
 // Verifies that the mouse events enable state changes correctly when
@@ skipping 82 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_FALSE(observer_a.did_cursor_size_change());
+  EXPECT_FALSE(observer_b.did_cursor_size_change());
 
   // Hide the cursor using HideCursor().
   cursor_manager_.HideCursor();
   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 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();
   observer_b.reset();
   cursor_manager_.ShowCursor();
   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);
 
   // Hide the cursor using HideCursor().
   observer_a.reset();
   observer_b.reset();
   cursor_manager_.HideCursor();
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   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();
   observer_b.reset();
   cursor_manager_.ShowCursor();
   EXPECT_TRUE(observer_a.did_visibility_change());
   EXPECT_FALSE(observer_b.did_visibility_change());
   EXPECT_TRUE(observer_a.is_cursor_visible());
 }
 
@@ skipping 24 matching lines @@
   // This block validates that the cursor is visible initially. It then
   // performs normal cursor visibility operations.
   {
     wm::CursorManager cursor_manager3(
         base::WrapUnique(new TestingCursorManager));
     EXPECT_TRUE(cursor_manager3.IsCursorVisible());
     cursor_manager3.HideCursor();
     EXPECT_FALSE(cursor_manager3.IsCursorVisible());
   }
 }