Change ui cursor identifiers to an enum class.

ash/wm/resize_shadow_and_cursor_unittest.cc

 // Copyright 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 "ash/ash_constants.h"
 #include "ash/frame/custom_frame_view_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/cursor_manager_test_api.h"
 #include "ash/wm/resize_shadow.h"
@@ skipping 81 matching lines @@
       EXPECT_EQ(window_->layer()->parent(), shadow_layer->parent());
       const auto& layers = shadow_layer->parent()->children();
       // Make sure the shadow layer is stacked directly beneath the window
       // layer.
       EXPECT_EQ(*(std::find(layers.begin(), layers.end(), shadow_layer) + 1),
                 window_->layer());
     }
   }
 
   // Returns the current cursor type.
-  int GetCurrentCursorType() const {
+  ui::CursorType GetCurrentCursorType() const {
     CursorManagerTestApi test_api(ash::Shell::Get()->cursor_manager());
     return test_api.GetCurrentCursor().native_type();
   }
 
   // Called for each step of a scroll sequence initiated at the bottom right
   // corner of |window_|. Tests whether the resize shadow is shown.
   void ProcessBottomRightResizeGesture(ui::EventType type,
                                        const gfx::Vector2dF& delta) {
     if (type == ui::ET_GESTURE_SCROLL_END) {
       // After gesture scroll ends, there should be no resize shadow.
@@ skipping 13 matching lines @@
 };
 
 // Test whether the resize shadows are visible and the cursor type based on the
 // mouse's position.
 TEST_F(ResizeShadowAndCursorTest, MouseHover) {
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
 
   generator.MoveMouseTo(50, 50);
   VerifyResizeShadow(false);
-  EXPECT_EQ(ui::kCursorNull, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNull, GetCurrentCursorType());
 
   generator.MoveMouseTo(gfx::Point(50, 0));
   VerifyResizeShadow(true);
   EXPECT_EQ(HTTOP, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorNorthResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNorthResize, GetCurrentCursorType());
 
   generator.MoveMouseTo(50, 50);
   VerifyResizeShadow(false);
-  EXPECT_EQ(ui::kCursorNull, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNull, GetCurrentCursorType());
 
   generator.MoveMouseTo(200, 100);
   VerifyResizeShadow(true);
   EXPECT_EQ(HTBOTTOMRIGHT, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorSouthEastResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kSouthEastResize, GetCurrentCursorType());
 
   generator.MoveMouseTo(50, 100);
   VerifyResizeShadow(true);
   EXPECT_EQ(HTBOTTOM, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorSouthResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kSouthResize, GetCurrentCursorType());
 
   generator.MoveMouseTo(50, 100 + ash::kResizeOutsideBoundsSize - 1);
   VerifyResizeShadow(true);
   EXPECT_EQ(HTBOTTOM, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorSouthResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kSouthResize, GetCurrentCursorType());
 
   generator.MoveMouseTo(50, 100 + ash::kResizeOutsideBoundsSize + 10);
   VerifyResizeShadow(false);
-  EXPECT_EQ(ui::kCursorNull, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNull, GetCurrentCursorType());
 
   generator.MoveMouseTo(50, 100 - ash::kResizeInsideBoundsSize);
   VerifyResizeShadow(true);
   EXPECT_EQ(HTBOTTOM, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorSouthResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kSouthResize, GetCurrentCursorType());
 
   generator.MoveMouseTo(50, 100 - ash::kResizeInsideBoundsSize - 10);
   VerifyResizeShadow(false);
-  EXPECT_EQ(ui::kCursorNull, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNull, GetCurrentCursorType());
 }
 
 // Test that the resize shadows stay visible and that the cursor stays the same
 // as long as a user is resizing a window.
 TEST_F(ResizeShadowAndCursorTest, MouseDrag) {
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
   gfx::Size initial_size(window()->bounds().size());
 
   generator.MoveMouseTo(200, 50);
   generator.PressLeftButton();
   VerifyResizeShadow(true);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kEastResize, GetCurrentCursorType());
 
   generator.MoveMouseTo(210, 50);
   VerifyResizeShadow(true);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kEastResize, GetCurrentCursorType());
 
   generator.ReleaseLeftButton();
   VerifyResizeShadow(true);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kEastResize, GetCurrentCursorType());
 
   gfx::Size new_size(window()->bounds().size());
   EXPECT_NE(new_size.ToString(), initial_size.ToString());
 }
 
 // Test that the resize shadows stay visible while resizing a window via touch.
 TEST_F(ResizeShadowAndCursorTest, Touch) {
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
 
   int start_x = 200 + ash::kResizeOutsideBoundsSize - 1;
   int start_y = 100 + ash::kResizeOutsideBoundsSize - 1;
   generator.GestureScrollSequenceWithCallback(
       gfx::Point(start_x, start_y), gfx::Point(start_x + 50, start_y + 50),
       base::TimeDelta::FromMilliseconds(200), 3,
       base::Bind(&ResizeShadowAndCursorTest::ProcessBottomRightResizeGesture,
                  base::Unretained(this)));
 }
 
 // Test that the resize shadows are not visible and that the default cursor is
 // used when the window is maximized.
 TEST_F(ResizeShadowAndCursorTest, MaximizeRestore) {
   ui::test::EventGenerator generator(Shell::GetPrimaryRootWindow());
   ASSERT_TRUE(ash::wm::GetWindowState(window())->IsNormalStateType());
 
   generator.MoveMouseTo(200, 50);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kEastResize, GetCurrentCursorType());
   generator.MoveMouseTo(200 - ash::kResizeInsideBoundsSize, 50);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kEastResize, GetCurrentCursorType());
 
   ash::wm::GetWindowState(window())->Maximize();
   gfx::Rect bounds(window()->GetBoundsInRootWindow());
   gfx::Point right_center(bounds.right() - 1,
                           (bounds.y() + bounds.bottom()) / 2);
   generator.MoveMouseTo(right_center);
   VerifyResizeShadow(false);
-  EXPECT_EQ(ui::kCursorNull, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kNull, GetCurrentCursorType());
 
   ash::wm::GetWindowState(window())->Restore();
   generator.MoveMouseTo(200, 50);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kEastResize, GetCurrentCursorType());
   generator.MoveMouseTo(200 - ash::kResizeInsideBoundsSize, 50);
   EXPECT_EQ(HTRIGHT, ResizeShadowHitTest());
-  EXPECT_EQ(ui::kCursorEastResize, GetCurrentCursorType());
+  EXPECT_EQ(ui::CursorType::kEastResize, GetCurrentCursorType());
 }
 
 }  // namespace test
 }  // namespace ash