Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(571)

Unified Diff: content/common/cursors/webcursor_aura.cc

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: Remove extranious ::ui:: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/common/cursors/webcursor_aura.cc
diff --git a/content/common/cursors/webcursor_aura.cc b/content/common/cursors/webcursor_aura.cc
index dd43fe85efc97ee162cdc73d03fd63634cecc1cd..ff3891b220602d3b7ea6b7ddd0dc50a8686760f9 100644
--- a/content/common/cursors/webcursor_aura.cc
+++ b/content/common/cursors/webcursor_aura.cc
@@ -16,93 +16,93 @@ namespace content {
gfx::NativeCursor WebCursor::GetNativeCursor() {
switch (type_) {
case WebCursorInfo::kTypePointer:
- return ui::kCursorPointer;
+ return ui::CursorType::POINTER;
case WebCursorInfo::kTypeCross:
- return ui::kCursorCross;
+ return ui::CursorType::CROSS;
case WebCursorInfo::kTypeHand:
- return ui::kCursorHand;
+ return ui::CursorType::HAND;
case WebCursorInfo::kTypeIBeam:
- return ui::kCursorIBeam;
+ return ui::CursorType::IBEAM;
case WebCursorInfo::kTypeWait:
- return ui::kCursorWait;
+ return ui::CursorType::WAIT;
case WebCursorInfo::kTypeHelp:
- return ui::kCursorHelp;
+ return ui::CursorType::HELP;
case WebCursorInfo::kTypeEastResize:
- return ui::kCursorEastResize;
+ return ui::CursorType::EAST_RESIZE;
case WebCursorInfo::kTypeNorthResize:
- return ui::kCursorNorthResize;
+ return ui::CursorType::NORTH_RESIZE;
case WebCursorInfo::kTypeNorthEastResize:
- return ui::kCursorNorthEastResize;
+ return ui::CursorType::NORTH_EAST_RESIZE;
case WebCursorInfo::kTypeNorthWestResize:
- return ui::kCursorNorthWestResize;
+ return ui::CursorType::NORTH_WEST_RESIZE;
case WebCursorInfo::kTypeSouthResize:
- return ui::kCursorSouthResize;
+ return ui::CursorType::SOUTH_RESIZE;
case WebCursorInfo::kTypeSouthEastResize:
- return ui::kCursorSouthEastResize;
+ return ui::CursorType::SOUTH_EAST_RESIZE;
case WebCursorInfo::kTypeSouthWestResize:
- return ui::kCursorSouthWestResize;
+ return ui::CursorType::SOUTH_WEST_RESIZE;
case WebCursorInfo::kTypeWestResize:
- return ui::kCursorWestResize;
+ return ui::CursorType::WEST_RESIZE;
case WebCursorInfo::kTypeNorthSouthResize:
- return ui::kCursorNorthSouthResize;
+ return ui::CursorType::NORTH_SOUTH_RESIZE;
case WebCursorInfo::kTypeEastWestResize:
- return ui::kCursorEastWestResize;
+ return ui::CursorType::EAST_WEST_RESIZE;
case WebCursorInfo::kTypeNorthEastSouthWestResize:
- return ui::kCursorNorthEastSouthWestResize;
+ return ui::CursorType::NORTH_EAST_SOUTH_WEST_RESIZE;
case WebCursorInfo::kTypeNorthWestSouthEastResize:
- return ui::kCursorNorthWestSouthEastResize;
+ return ui::CursorType::NORTH_WEST_SOUTH_EAST_RESIZE;
case WebCursorInfo::kTypeColumnResize:
- return ui::kCursorColumnResize;
+ return ui::CursorType::COLUMN_RESIZE;
case WebCursorInfo::kTypeRowResize:
- return ui::kCursorRowResize;
+ return ui::CursorType::ROW_RESIZE;
case WebCursorInfo::kTypeMiddlePanning:
- return ui::kCursorMiddlePanning;
+ return ui::CursorType::MIDDLE_PANNING;
case WebCursorInfo::kTypeEastPanning:
- return ui::kCursorEastPanning;
+ return ui::CursorType::EAST_PANNING;
case WebCursorInfo::kTypeNorthPanning:
- return ui::kCursorNorthPanning;
+ return ui::CursorType::NORTH_PANNING;
case WebCursorInfo::kTypeNorthEastPanning:
- return ui::kCursorNorthEastPanning;
+ return ui::CursorType::NORTH_EAST_PANNING;
case WebCursorInfo::kTypeNorthWestPanning:
- return ui::kCursorNorthWestPanning;
+ return ui::CursorType::NORTH_WEST_PANNING;
case WebCursorInfo::kTypeSouthPanning:
- return ui::kCursorSouthPanning;
+ return ui::CursorType::SOUTH_PANNING;
case WebCursorInfo::kTypeSouthEastPanning:
- return ui::kCursorSouthEastPanning;
+ return ui::CursorType::SOUTH_EAST_PANNING;
case WebCursorInfo::kTypeSouthWestPanning:
- return ui::kCursorSouthWestPanning;
+ return ui::CursorType::SOUTH_WEST_PANNING;
case WebCursorInfo::kTypeWestPanning:
- return ui::kCursorWestPanning;
+ return ui::CursorType::WEST_PANNING;
case WebCursorInfo::kTypeMove:
- return ui::kCursorMove;
+ return ui::CursorType::MOVE;
case WebCursorInfo::kTypeVerticalText:
- return ui::kCursorVerticalText;
+ return ui::CursorType::VERTICAL_TEXT;
case WebCursorInfo::kTypeCell:
- return ui::kCursorCell;
+ return ui::CursorType::CELL;
case WebCursorInfo::kTypeContextMenu:
- return ui::kCursorContextMenu;
+ return ui::CursorType::CONTEXT_MENU;
case WebCursorInfo::kTypeAlias:
- return ui::kCursorAlias;
+ return ui::CursorType::ALIAS;
case WebCursorInfo::kTypeProgress:
- return ui::kCursorProgress;
+ return ui::CursorType::PROGRESS;
case WebCursorInfo::kTypeNoDrop:
- return ui::kCursorNoDrop;
+ return ui::CursorType::NO_DROP;
case WebCursorInfo::kTypeCopy:
- return ui::kCursorCopy;
+ return ui::CursorType::COPY;
case WebCursorInfo::kTypeNone:
- return ui::kCursorNone;
+ return ui::CursorType::NONE;
case WebCursorInfo::kTypeNotAllowed:
- return ui::kCursorNotAllowed;
+ return ui::CursorType::NOT_ALLOWED;
case WebCursorInfo::kTypeZoomIn:
- return ui::kCursorZoomIn;
+ return ui::CursorType::ZOOM_IN;
case WebCursorInfo::kTypeZoomOut:
- return ui::kCursorZoomOut;
+ return ui::CursorType::ZOOM_OUT;
case WebCursorInfo::kTypeGrab:
- return ui::kCursorGrab;
+ return ui::CursorType::GRAB;
case WebCursorInfo::kTypeGrabbing:
- return ui::kCursorGrabbing;
+ return ui::CursorType::GRABBING;
case WebCursorInfo::kTypeCustom: {
- ui::Cursor cursor(ui::kCursorCustom);
+ ui::Cursor cursor(ui::CursorType::CUSTOM);
cursor.SetPlatformCursor(GetPlatformCursor());
return cursor;
}

Powered by Google App Engine
This is Rietveld 408576698