| Index: ui/base/cursor/cursor_loader_ozone.cc
|
| diff --git a/ui/base/cursor/cursor_loader_ozone.cc b/ui/base/cursor/cursor_loader_ozone.cc
|
| index 1d74eec7345c738bf3ad0b7a3d36549fe3c2300f..4d67b8d09380a0bcbb65e564c3a3b14a20c9cbb7 100644
|
| --- a/ui/base/cursor/cursor_loader_ozone.cc
|
| +++ b/ui/base/cursor/cursor_loader_ozone.cc
|
| @@ -16,7 +16,7 @@ CursorLoaderOzone::CursorLoaderOzone() {}
|
|
|
| CursorLoaderOzone::~CursorLoaderOzone() {}
|
|
|
| -void CursorLoaderOzone::LoadImageCursor(int id,
|
| +void CursorLoaderOzone::LoadImageCursor(CursorType id,
|
| int resource_id,
|
| const gfx::Point& hot) {
|
| SkBitmap bitmap;
|
| @@ -28,7 +28,7 @@ void CursorLoaderOzone::LoadImageCursor(int id,
|
| bitmap, hotspot, scale());
|
| }
|
|
|
| -void CursorLoaderOzone::LoadAnimatedCursor(int id,
|
| +void CursorLoaderOzone::LoadAnimatedCursor(CursorType id,
|
| int resource_id,
|
| const gfx::Point& hot,
|
| int frame_delay_ms) {
|
| @@ -51,13 +51,13 @@ void CursorLoaderOzone::UnloadAll() {
|
| }
|
|
|
| void CursorLoaderOzone::SetPlatformCursor(gfx::NativeCursor* cursor) {
|
| - int native_type = cursor->native_type();
|
| + CursorType native_type = cursor->native_type();
|
| PlatformCursor platform;
|
|
|
| if (cursors_.count(native_type)) {
|
| // An image cursor is loaded for this type.
|
| platform = cursors_[native_type];
|
| - } else if (native_type == kCursorCustom) {
|
| + } else if (native_type == CursorType::CUSTOM) {
|
| // The platform cursor was already set via WebCursor::GetPlatformCursor.
|
| platform = cursor->platform();
|
| } else {
|
|
|