Index: ui/base/cursor/image_cursors.cc |
diff --git a/ui/base/cursor/image_cursors.cc b/ui/base/cursor/image_cursors.cc |
index 32ff66136497bbec28fb3e54baf6e23014e52905..9b648cacc7ce505778b59feabeb02681359b6d26 100644 |
--- a/ui/base/cursor/image_cursors.cc |
+++ b/ui/base/cursor/image_cursors.cc |
@@ -20,45 +20,43 @@ namespace ui { |
namespace { |
-const int kImageCursorIds[] = { |
- kCursorNull, |
- kCursorPointer, |
- kCursorNoDrop, |
- kCursorNotAllowed, |
- kCursorCopy, |
- kCursorHand, |
- kCursorMove, |
- kCursorNorthEastResize, |
- kCursorSouthWestResize, |
- kCursorSouthEastResize, |
- kCursorNorthWestResize, |
- kCursorNorthResize, |
- kCursorSouthResize, |
- kCursorEastResize, |
- kCursorWestResize, |
- kCursorIBeam, |
- kCursorAlias, |
- kCursorCell, |
- kCursorContextMenu, |
- kCursorCross, |
- kCursorHelp, |
- kCursorVerticalText, |
- kCursorZoomIn, |
- kCursorZoomOut, |
- kCursorRowResize, |
- kCursorColumnResize, |
- kCursorEastWestResize, |
- kCursorNorthSouthResize, |
- kCursorNorthEastSouthWestResize, |
- kCursorNorthWestSouthEastResize, |
- kCursorGrab, |
- kCursorGrabbing, |
+const CursorType kImageCursorIds[] = { |
+ CursorType::CURSOR_NULL, |
+ CursorType::POINTER, |
+ CursorType::NO_DROP, |
+ CursorType::NOT_ALLOWED, |
+ CursorType::COPY, |
+ CursorType::HAND, |
+ CursorType::MOVE, |
+ CursorType::NORTH_EAST_RESIZE, |
+ CursorType::SOUTH_WEST_RESIZE, |
+ CursorType::SOUTH_EAST_RESIZE, |
+ CursorType::NORTH_WEST_RESIZE, |
+ CursorType::NORTH_RESIZE, |
+ CursorType::SOUTH_RESIZE, |
+ CursorType::EAST_RESIZE, |
+ CursorType::WEST_RESIZE, |
+ CursorType::IBEAM, |
+ CursorType::ALIAS, |
+ CursorType::CELL, |
+ CursorType::CONTEXT_MENU, |
+ CursorType::CROSS, |
+ CursorType::HELP, |
+ CursorType::VERTICAL_TEXT, |
+ CursorType::ZOOM_IN, |
+ CursorType::ZOOM_OUT, |
+ CursorType::ROW_RESIZE, |
+ CursorType::COLUMN_RESIZE, |
+ CursorType::EAST_WEST_RESIZE, |
+ CursorType::NORTH_SOUTH_RESIZE, |
+ CursorType::NORTH_EAST_SOUTH_WEST_RESIZE, |
+ CursorType::NORTH_WEST_SOUTH_EAST_RESIZE, |
+ CursorType::GRAB, |
+ CursorType::GRABBING, |
}; |
-const int kAnimatedCursorIds[] = { |
- kCursorWait, |
- kCursorProgress |
-}; |
+const CursorType kAnimatedCursorIds[] = {CursorType::WAIT, |
+ CursorType::PROGRESS}; |
} // namespace |