| Index: ui/base/cursor/cursor.h
|
| diff --git a/ui/base/cursor/cursor.h b/ui/base/cursor/cursor.h
|
| index 05da7cdc504b3c27964b6c84f1001c8271cc6c37..716e7cf72b663f1fdf6a3e69fdbcd4bda448489f 100644
|
| --- a/ui/base/cursor/cursor.h
|
| +++ b/ui/base/cursor/cursor.h
|
| @@ -6,6 +6,7 @@
|
| #define UI_BASE_CURSOR_CURSOR_H_
|
|
|
| #include "build/build_config.h"
|
| +#include "ui/base/cursor/cursor_type.h"
|
| #include "ui/base/ui_base_export.h"
|
|
|
| #if defined(OS_WIN)
|
| @@ -24,69 +25,6 @@ typedef unsigned long PlatformCursor;
|
| typedef void* PlatformCursor;
|
| #endif
|
|
|
| -enum class CursorType {
|
| - // Equivalent to a NULL HCURSOR on Windows.
|
| - kNull = 0,
|
| -
|
| - // These cursors mirror WebKit cursors from WebCursorInfo, but are replicated
|
| - // here so we don't introduce a WebKit dependency.
|
| - kPointer = 1,
|
| - kCross = 2,
|
| - kHand = 3,
|
| - kIBeam = 4,
|
| - kWait = 5,
|
| - kHelp = 6,
|
| - kEastResize = 7,
|
| - kNorthResize = 8,
|
| - kNorthEastResize = 9,
|
| - kNorthWestResize = 10,
|
| - kSouthResize = 11,
|
| - kSouthEastResize = 12,
|
| - kSouthWestResize = 13,
|
| - kWestResize = 14,
|
| - kNorthSouthResize = 15,
|
| - kEastWestResize = 16,
|
| - kNorthEastSouthWestResize = 17,
|
| - kNorthWestSouthEastResize = 18,
|
| - kColumnResize = 19,
|
| - kRowResize = 20,
|
| - kMiddlePanning = 21,
|
| - kEastPanning = 22,
|
| - kNorthPanning = 23,
|
| - kNorthEastPanning = 24,
|
| - kNorthWestPanning = 25,
|
| - kSouthPanning = 26,
|
| - kSouthEastPanning = 27,
|
| - kSouthWestPanning = 28,
|
| - kWestPanning = 29,
|
| - kMove = 30,
|
| - kVerticalText = 31,
|
| - kCell = 32,
|
| - kContextMenu = 33,
|
| - kAlias = 34,
|
| - kProgress = 35,
|
| - kNoDrop = 36,
|
| - kCopy = 37,
|
| - kNone = 38,
|
| - kNotAllowed = 39,
|
| - kZoomIn = 40,
|
| - kZoomOut = 41,
|
| - kGrab = 42,
|
| - kGrabbing = 43,
|
| - kCustom = 44,
|
| -
|
| - // These additional drag and drop cursors are not listed in WebCursorInfo.
|
| - kDndNone = 45,
|
| - kDndMove = 46,
|
| - kDndCopy = 47,
|
| - kDndLink = 48,
|
| -};
|
| -
|
| -enum CursorSetType {
|
| - CURSOR_SET_NORMAL,
|
| - CURSOR_SET_LARGE
|
| -};
|
| -
|
| // Ref-counted cursor that supports both default and custom cursors.
|
| class UI_BASE_EXPORT Cursor {
|
| public:
|
|
|