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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/cursor/cursor_loader_x11.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
« ui/base/cursor/cursor.h ('K') | « ui/base/cursor/cursor_loader_x11.h ('k') | ui/base/cursor/cursors_aura.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cursor/cursor_loader_x11.cc
diff --git a/ui/base/cursor/cursor_loader_x11.cc b/ui/base/cursor/cursor_loader_x11.cc
index 7febd85b555b467036d93c592149fa18abf42951..4c9429b730a121b4e6c1517ae8321b9a44093b3e 100644
--- a/ui/base/cursor/cursor_loader_x11.cc
+++ b/ui/base/cursor/cursor_loader_x11.cc
@@ -25,152 +25,156 @@
namespace {
// Returns CSS cursor name from an Aura cursor ID.
-const char* CursorCssNameFromId(int id) {
+const char* CursorCssNameFromId(ui::CursorType id) {
switch (id) {
- case ui::kCursorMiddlePanning:
+ case ui::CursorType::MIDDLE_PANNING:
return "all-scroll";
- case ui::kCursorEastPanning:
+ case ui::CursorType::EAST_PANNING:
return "e-resize";
- case ui::kCursorNorthPanning:
+ case ui::CursorType::NORTH_PANNING:
return "n-resize";
- case ui::kCursorNorthEastPanning:
+ case ui::CursorType::NORTH_EAST_PANNING:
return "ne-resize";
- case ui::kCursorNorthWestPanning:
+ case ui::CursorType::NORTH_WEST_PANNING:
return "nw-resize";
- case ui::kCursorSouthPanning:
+ case ui::CursorType::SOUTH_PANNING:
return "s-resize";
- case ui::kCursorSouthEastPanning:
+ case ui::CursorType::SOUTH_EAST_PANNING:
return "se-resize";
- case ui::kCursorSouthWestPanning:
+ case ui::CursorType::SOUTH_WEST_PANNING:
return "sw-resize";
- case ui::kCursorWestPanning:
+ case ui::CursorType::WEST_PANNING:
return "w-resize";
- case ui::kCursorNone:
+ case ui::CursorType::NONE:
return "none";
- case ui::kCursorGrab:
+ case ui::CursorType::GRAB:
return "grab";
- case ui::kCursorGrabbing:
+ case ui::CursorType::GRABBING:
return "grabbing";
#if defined(OS_CHROMEOS)
- case ui::kCursorNull:
- case ui::kCursorPointer:
- case ui::kCursorNoDrop:
- case ui::kCursorNotAllowed:
- case ui::kCursorCopy:
- case ui::kCursorMove:
- case ui::kCursorEastResize:
- case ui::kCursorNorthResize:
- case ui::kCursorSouthResize:
- case ui::kCursorWestResize:
- case ui::kCursorNorthEastResize:
- case ui::kCursorNorthWestResize:
- case ui::kCursorSouthWestResize:
- case ui::kCursorSouthEastResize:
- case ui::kCursorIBeam:
- case ui::kCursorAlias:
- case ui::kCursorCell:
- case ui::kCursorContextMenu:
- case ui::kCursorCross:
- case ui::kCursorHelp:
- case ui::kCursorWait:
- case ui::kCursorNorthSouthResize:
- case ui::kCursorEastWestResize:
- case ui::kCursorNorthEastSouthWestResize:
- case ui::kCursorNorthWestSouthEastResize:
- case ui::kCursorProgress:
- case ui::kCursorColumnResize:
- case ui::kCursorRowResize:
- case ui::kCursorVerticalText:
- case ui::kCursorZoomIn:
- case ui::kCursorZoomOut:
- case ui::kCursorHand:
+ case ui::CursorType::CURSOR_NULL:
+ case ui::CursorType::POINTER:
+ case ui::CursorType::NO_DROP:
+ case ui::CursorType::NOT_ALLOWED:
+ case ui::CursorType::COPY:
+ case ui::CursorType::MOVE:
+ case ui::CursorType::EAST_RESIZE:
+ case ui::CursorType::NORTH_RESIZE:
+ case ui::CursorType::SOUTH_RESIZE:
+ case ui::CursorType::WEST_RESIZE:
+ case ui::CursorType::NORTH_EAST_RESIZE:
+ case ui::CursorType::NORTH_WEST_RESIZE:
+ case ui::CursorType::SOUTH_WEST_RESIZE:
+ case ui::CursorType::SOUTH_EAST_RESIZE:
+ case ui::CursorType::IBEAM:
+ case ui::CursorType::ALIAS:
+ case ui::CursorType::CELL:
+ case ui::CursorType::CONTEXT_MENU:
+ case ui::CursorType::CROSS:
+ case ui::CursorType::HELP:
+ case ui::CursorType::WAIT:
+ case ui::CursorType::NORTH_SOUTH_RESIZE:
+ case ui::CursorType::EAST_WEST_RESIZE:
+ case ui::CursorType::NORTH_EAST_SOUTH_WEST_RESIZE:
+ case ui::CursorType::NORTH_WEST_SOUTH_EAST_RESIZE:
+ case ui::CursorType::PROGRESS:
+ case ui::CursorType::COLUMN_RESIZE:
+ case ui::CursorType::ROW_RESIZE:
+ case ui::CursorType::VERTICAL_TEXT:
+ case ui::CursorType::ZOOM_IN:
+ case ui::CursorType::ZOOM_OUT:
+ case ui::CursorType::HAND:
+ case ui::CursorType::DND_NONE:
+ case ui::CursorType::DND_MOVE:
+ case ui::CursorType::DND_COPY:
+ case ui::CursorType::DND_LINK:
// In some environments, the image assets are not set (e.g. in
// content-browsertests, content-shell etc.).
return "left_ptr";
#else // defined(OS_CHROMEOS)
- case ui::kCursorNull:
+ case ui::CursorType::CURSOR_NULL:
return "left_ptr";
- case ui::kCursorPointer:
+ case ui::CursorType::POINTER:
return "left_ptr";
- case ui::kCursorMove:
+ case ui::CursorType::MOVE:
// Returning "move" is the correct thing here, but Blink doesn't
// make a distinction between move and all-scroll. Other
// platforms use a cursor more consistent with all-scroll, so
// use that.
return "all-scroll";
- case ui::kCursorCross:
+ case ui::CursorType::CROSS:
return "crosshair";
- case ui::kCursorHand:
+ case ui::CursorType::HAND:
return "pointer";
- case ui::kCursorIBeam:
+ case ui::CursorType::IBEAM:
return "text";
- case ui::kCursorProgress:
+ case ui::CursorType::PROGRESS:
return "progress";
- case ui::kCursorWait:
+ case ui::CursorType::WAIT:
return "wait";
- case ui::kCursorHelp:
+ case ui::CursorType::HELP:
return "help";
- case ui::kCursorEastResize:
+ case ui::CursorType::EAST_RESIZE:
return "e-resize";
- case ui::kCursorNorthResize:
+ case ui::CursorType::NORTH_RESIZE:
return "n-resize";
- case ui::kCursorNorthEastResize:
+ case ui::CursorType::NORTH_EAST_RESIZE:
return "ne-resize";
- case ui::kCursorNorthWestResize:
+ case ui::CursorType::NORTH_WEST_RESIZE:
return "nw-resize";
- case ui::kCursorSouthResize:
+ case ui::CursorType::SOUTH_RESIZE:
return "s-resize";
- case ui::kCursorSouthEastResize:
+ case ui::CursorType::SOUTH_EAST_RESIZE:
return "se-resize";
- case ui::kCursorSouthWestResize:
+ case ui::CursorType::SOUTH_WEST_RESIZE:
return "sw-resize";
- case ui::kCursorWestResize:
+ case ui::CursorType::WEST_RESIZE:
return "w-resize";
- case ui::kCursorNorthSouthResize:
+ case ui::CursorType::NORTH_SOUTH_RESIZE:
return "ns-resize";
- case ui::kCursorEastWestResize:
+ case ui::CursorType::EAST_WEST_RESIZE:
return "ew-resize";
- case ui::kCursorColumnResize:
+ case ui::CursorType::COLUMN_RESIZE:
return "col-resize";
- case ui::kCursorRowResize:
+ case ui::CursorType::ROW_RESIZE:
return "row-resize";
- case ui::kCursorNorthEastSouthWestResize:
+ case ui::CursorType::NORTH_EAST_SOUTH_WEST_RESIZE:
return "nesw-resize";
- case ui::kCursorNorthWestSouthEastResize:
+ case ui::CursorType::NORTH_WEST_SOUTH_EAST_RESIZE:
return "nwse-resize";
- case ui::kCursorVerticalText:
+ case ui::CursorType::VERTICAL_TEXT:
return "vertical-text";
- case ui::kCursorZoomIn:
+ case ui::CursorType::ZOOM_IN:
return "zoom-in";
- case ui::kCursorZoomOut:
+ case ui::CursorType::ZOOM_OUT:
return "zoom-out";
- case ui::kCursorCell:
+ case ui::CursorType::CELL:
return "cell";
- case ui::kCursorContextMenu:
+ case ui::CursorType::CONTEXT_MENU:
return "context-menu";
- case ui::kCursorAlias:
+ case ui::CursorType::ALIAS:
return "alias";
- case ui::kCursorNoDrop:
+ case ui::CursorType::NO_DROP:
return "no-drop";
- case ui::kCursorCopy:
+ case ui::CursorType::COPY:
return "copy";
- case ui::kCursorNotAllowed:
+ case ui::CursorType::NOT_ALLOWED:
return "not-allowed";
- case ui::kCursorDndNone:
+ case ui::CursorType::DND_NONE:
return "dnd-none";
- case ui::kCursorDndMove:
+ case ui::CursorType::DND_MOVE:
return "dnd-move";
- case ui::kCursorDndCopy:
+ case ui::CursorType::DND_COPY:
return "dnd-copy";
- case ui::kCursorDndLink:
+ case ui::CursorType::DND_LINK:
return "dnd-link";
#endif // defined(OS_CHROMEOS)
- case ui::kCursorCustom:
+ case ui::CursorType::CUSTOM:
NOTREACHED();
return "left_ptr";
}
- NOTREACHED() << "Case not handled for " << id;
+ NOTREACHED() << "Case not handled for " << static_cast<int>(id);
return "left_ptr";
}
@@ -235,7 +239,7 @@ CursorLoaderX11::~CursorLoaderX11() {
UnloadAll();
}
-void CursorLoaderX11::LoadImageCursor(int id,
+void CursorLoaderX11::LoadImageCursor(CursorType id,
int resource_id,
const gfx::Point& hot) {
SkBitmap bitmap;
@@ -246,7 +250,7 @@ void CursorLoaderX11::LoadImageCursor(int id,
image_cursors_[id].reset(new ImageCursor(x_image, scale(), rotation()));
}
-void CursorLoaderX11::LoadAnimatedCursor(int id,
+void CursorLoaderX11::LoadAnimatedCursor(CursorType id,
int resource_id,
const gfx::Point& hot,
int frame_delay_ms) {
@@ -283,28 +287,28 @@ void CursorLoaderX11::UnloadAll() {
void CursorLoaderX11::SetPlatformCursor(gfx::NativeCursor* cursor) {
DCHECK(cursor);
- if (*cursor == kCursorNone) {
+ if (*cursor == CursorType::NONE) {
cursor->SetPlatformCursor(invisible_cursor_.get());
return;
}
- if (*cursor == kCursorCustom)
+ if (*cursor == CursorType::CUSTOM)
return;
cursor->set_device_scale_factor(scale());
cursor->SetPlatformCursor(CursorFromId(cursor->native_type()));
}
-const XcursorImage* CursorLoaderX11::GetXcursorImageForTest(int id) {
+const XcursorImage* CursorLoaderX11::GetXcursorImageForTest(CursorType id) {
return test::GetCachedXcursorImage(image_cursors_[id]->cursor);
}
bool CursorLoaderX11::IsImageCursor(gfx::NativeCursor native_cursor) {
- int type = native_cursor.native_type();
+ CursorType type = native_cursor.native_type();
return image_cursors_.count(type) || animated_cursors_.count(type);
}
-::Cursor CursorLoaderX11::CursorFromId(int id) {
+::Cursor CursorLoaderX11::CursorFromId(CursorType id) {
const char* css_name = CursorCssNameFromId(id);
auto font_it = font_cursors_.find(id);
« ui/base/cursor/cursor.h ('K') | « ui/base/cursor/cursor_loader_x11.h ('k') | ui/base/cursor/cursors_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698