Change ui cursor identifiers to an enum class.

ui/base/cursor/cursor_loader_win.cc

Index: ui/base/cursor/cursor_loader_win.cc
diff --git a/ui/base/cursor/cursor_loader_win.cc b/ui/base/cursor/cursor_loader_win.cc
index 430cf7ecbaa5b2620b247cae17092a8d5d55b5a2..b72cc3d69c35f0c1b7fa92abb4f850c09c563d9f 100644
--- a/ui/base/cursor/cursor_loader_win.cc
+++ b/ui/base/cursor/cursor_loader_win.cc
@@ -18,94 +18,94 @@ base::LazyInstance<base::string16>::DestructorAtExit
 
 const wchar_t* GetCursorId(gfx::NativeCursor native_cursor) {
   switch (native_cursor.native_type()) {
-    case kCursorNull:
+    case CursorType::CURSOR_NULL:
       return IDC_ARROW;
-    case kCursorPointer:
+    case CursorType::POINTER:
       return IDC_ARROW;
-    case kCursorCross:
+    case CursorType::CROSS:
       return IDC_CROSS;
-    case kCursorHand:
+    case CursorType::HAND:
       return IDC_HAND;
-    case kCursorIBeam:
+    case CursorType::IBEAM:
       return IDC_IBEAM;
-    case kCursorWait:
+    case CursorType::WAIT:
       return IDC_WAIT;
-    case kCursorHelp:
+    case CursorType::HELP:
       return IDC_HELP;
-    case kCursorEastResize:
+    case CursorType::EAST_RESIZE:
       return IDC_SIZEWE;
-    case kCursorNorthResize:
+    case CursorType::NORTH_RESIZE:
       return IDC_SIZENS;
-    case kCursorNorthEastResize:
+    case CursorType::NORTH_EAST_RESIZE:
       return IDC_SIZENESW;
-    case kCursorNorthWestResize:
+    case CursorType::NORTH_WEST_RESIZE:
       return IDC_SIZENWSE;
-    case kCursorSouthResize:
+    case CursorType::SOUTH_RESIZE:
       return IDC_SIZENS;
-    case kCursorSouthEastResize:
+    case CursorType::SOUTH_EAST_RESIZE:
       return IDC_SIZENWSE;
-    case kCursorSouthWestResize:
+    case CursorType::SOUTH_WEST_RESIZE:
       return IDC_SIZENESW;
-    case kCursorWestResize:
+    case CursorType::WEST_RESIZE:
       return IDC_SIZEWE;
-    case kCursorNorthSouthResize:
+    case CursorType::NORTH_SOUTH_RESIZE:
       return IDC_SIZENS;
-    case kCursorEastWestResize:
+    case CursorType::EAST_WEST_RESIZE:
       return IDC_SIZEWE;
-    case kCursorNorthEastSouthWestResize:
+    case CursorType::NORTH_EAST_SOUTH_WEST_RESIZE:
       return IDC_SIZENESW;
-    case kCursorNorthWestSouthEastResize:
+    case CursorType::NORTH_WEST_SOUTH_EAST_RESIZE:
       return IDC_SIZENWSE;
-    case kCursorMove:
+    case CursorType::MOVE:
       return IDC_SIZEALL;
-    case kCursorProgress:
+    case CursorType::PROGRESS:
       return IDC_APPSTARTING;
-    case kCursorNoDrop:
+    case CursorType::NO_DROP:
       return IDC_NO;
-    case kCursorNotAllowed:
+    case CursorType::NOT_ALLOWED:
       return IDC_NO;
-    case kCursorColumnResize:
+    case CursorType::COLUMN_RESIZE:
       return MAKEINTRESOURCE(IDC_COLRESIZE);
-    case kCursorRowResize:
+    case CursorType::ROW_RESIZE:
       return MAKEINTRESOURCE(IDC_ROWRESIZE);
-    case kCursorMiddlePanning:
+    case CursorType::MIDDLE_PANNING:
       return MAKEINTRESOURCE(IDC_PAN_MIDDLE);
-    case kCursorEastPanning:
+    case CursorType::EAST_PANNING:
       return MAKEINTRESOURCE(IDC_PAN_EAST);
-    case kCursorNorthPanning:
+    case CursorType::NORTH_PANNING:
       return MAKEINTRESOURCE(IDC_PAN_NORTH);
-    case kCursorNorthEastPanning:
+    case CursorType::NORTH_EAST_PANNING:
       return MAKEINTRESOURCE(IDC_PAN_NORTH_EAST);
-    case kCursorNorthWestPanning:
+    case CursorType::NORTH_WEST_PANNING:
       return MAKEINTRESOURCE(IDC_PAN_NORTH_WEST);
-    case kCursorSouthPanning:
+    case CursorType::SOUTH_PANNING:
       return MAKEINTRESOURCE(IDC_PAN_SOUTH);
-    case kCursorSouthEastPanning:
+    case CursorType::SOUTH_EAST_PANNING:
       return MAKEINTRESOURCE(IDC_PAN_SOUTH_EAST);
-    case kCursorSouthWestPanning:
+    case CursorType::SOUTH_WEST_PANNING:
       return MAKEINTRESOURCE(IDC_PAN_SOUTH_WEST);
-    case kCursorWestPanning:
+    case CursorType::WEST_PANNING:
       return MAKEINTRESOURCE(IDC_PAN_WEST);
-    case kCursorVerticalText:
+    case CursorType::VERTICAL_TEXT:
       return MAKEINTRESOURCE(IDC_VERTICALTEXT);
-    case kCursorCell:
+    case CursorType::CELL:
       return MAKEINTRESOURCE(IDC_CELL);
-    case kCursorZoomIn:
+    case CursorType::ZOOM_IN:
       return MAKEINTRESOURCE(IDC_ZOOMIN);
-    case kCursorZoomOut:
+    case CursorType::ZOOM_OUT:
       return MAKEINTRESOURCE(IDC_ZOOMOUT);
-    case kCursorGrab:
+    case CursorType::GRAB:
       return MAKEINTRESOURCE(IDC_HAND_GRAB);
-    case kCursorGrabbing:
+    case CursorType::GRABBING:
       return MAKEINTRESOURCE(IDC_HAND_GRABBING);
-    case kCursorCopy:
+    case CursorType::COPY:
       return MAKEINTRESOURCE(IDC_COPYCUR);
-    case kCursorAlias:
+    case CursorType::ALIAS:
       return MAKEINTRESOURCE(IDC_ALIAS);
-    case kCursorNone:
+    case CursorType::NONE:
       return MAKEINTRESOURCE(IDC_CURSOR_NONE);
-    case kCursorContextMenu:
-    case kCursorCustom:
+    case CursorType::CONTEXT_MENU:
+    case CursorType::CUSTOM:
       NOTIMPLEMENTED();
       return IDC_ARROW;
     default:
@@ -126,13 +126,13 @@ CursorLoaderWin::CursorLoaderWin() {
 CursorLoaderWin::~CursorLoaderWin() {
 }
 
-void CursorLoaderWin::LoadImageCursor(int id,
+void CursorLoaderWin::LoadImageCursor(CursorType id,
                                       int resource_id,
                                       const gfx::Point& hot) {
   // NOTIMPLEMENTED();
 }
 
-void CursorLoaderWin::LoadAnimatedCursor(int id,
+void CursorLoaderWin::LoadAnimatedCursor(CursorType id,
                                          int resource_id,
                                          const gfx::Point& hot,
                                          int frame_delay_ms) {
@@ -144,7 +144,7 @@ void CursorLoaderWin::UnloadAll() {
 }
 
 void CursorLoaderWin::SetPlatformCursor(gfx::NativeCursor* cursor) {
-  if (cursor->native_type() != kCursorCustom) {
+  if (cursor->native_type() != CursorType::CUSTOM) {
     if (cursor->platform()) {
       cursor->SetPlatformCursor(cursor->platform());
     } else {