| Index: ui/base/cursor/cursor.cc
|
| diff --git a/ui/base/cursor/cursor.cc b/ui/base/cursor/cursor.cc
|
| index 83963558ad0d2ac9926df3a135ebc83b03e8a00f..2f55beb109ed79caa2778f3bef045c30b1d8c953 100644
|
| --- a/ui/base/cursor/cursor.cc
|
| +++ b/ui/base/cursor/cursor.cc
|
| @@ -7,46 +7,42 @@
|
| namespace ui {
|
|
|
| Cursor::Cursor()
|
| - : native_type_(0),
|
| + : native_type_(CursorType::kNull),
|
| platform_cursor_(0),
|
| - device_scale_factor_(0.0f) {
|
| -}
|
| + device_scale_factor_(0.0f) {}
|
|
|
| -Cursor::Cursor(int type)
|
| - : native_type_(type),
|
| - platform_cursor_(0),
|
| - device_scale_factor_(0.0f) {
|
| -}
|
| +Cursor::Cursor(CursorType type)
|
| + : native_type_(type), platform_cursor_(0), device_scale_factor_(0.0f) {}
|
|
|
| Cursor::Cursor(const Cursor& cursor)
|
| : native_type_(cursor.native_type_),
|
| platform_cursor_(cursor.platform_cursor_),
|
| device_scale_factor_(cursor.device_scale_factor_) {
|
| - if (native_type_ == kCursorCustom)
|
| + if (native_type_ == CursorType::kCustom)
|
| RefCustomCursor();
|
| }
|
|
|
| Cursor::~Cursor() {
|
| - if (native_type_ == kCursorCustom)
|
| + if (native_type_ == CursorType::kCustom)
|
| UnrefCustomCursor();
|
| }
|
|
|
| void Cursor::SetPlatformCursor(const PlatformCursor& platform) {
|
| - if (native_type_ == kCursorCustom)
|
| + if (native_type_ == CursorType::kCustom)
|
| UnrefCustomCursor();
|
| platform_cursor_ = platform;
|
| - if (native_type_ == kCursorCustom)
|
| + if (native_type_ == CursorType::kCustom)
|
| RefCustomCursor();
|
| }
|
|
|
| void Cursor::Assign(const Cursor& cursor) {
|
| if (*this == cursor)
|
| return;
|
| - if (native_type_ == kCursorCustom)
|
| + if (native_type_ == CursorType::kCustom)
|
| UnrefCustomCursor();
|
| native_type_ = cursor.native_type_;
|
| platform_cursor_ = cursor.platform_cursor_;
|
| - if (native_type_ == kCursorCustom)
|
| + if (native_type_ == CursorType::kCustom)
|
| RefCustomCursor();
|
| device_scale_factor_ = cursor.device_scale_factor_;
|
| }
|
|
|