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

Unified Diff: ui/base/cursor/cursor.cc

Issue 2833163002: Change ui cursor identifiers to an enum class. (Closed)
Patch Set: OK, it can't be explicit for mac. 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
« no previous file with comments | « ui/base/cursor/cursor.h ('k') | ui/base/cursor/cursor_data.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_;
}
« no previous file with comments | « ui/base/cursor/cursor.h ('k') | ui/base/cursor/cursor_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698