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

Unified Diff: ash/display/cursor_window_controller.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 | « ash/display/cursor_window_controller.h ('k') | ash/display/cursor_window_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/cursor_window_controller.cc
diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc
index 011595f40fd533ad8bccd00bbcd8a8d08f2b78f6..06b2c125108a19ccdcb165e17cd5fb5c705ee97f 100644
--- a/ash/display/cursor_window_controller.cc
+++ b/ash/display/cursor_window_controller.cc
@@ -88,12 +88,11 @@ class CursorWindowDelegate : public aura::WindowDelegate {
CursorWindowController::CursorWindowController()
: is_cursor_compositing_enabled_(false),
container_(NULL),
- cursor_type_(ui::kCursorNone),
+ cursor_type_(ui::CursorType::kNone),
visible_(true),
cursor_set_(ui::CURSOR_SET_NORMAL),
large_cursor_size_in_dip_(ash::kDefaultLargeCursorSize),
- delegate_(new CursorWindowDelegate()) {
-}
+ delegate_(new CursorWindowDelegate()) {}
CursorWindowController::~CursorWindowController() {
SetContainer(NULL);
@@ -320,7 +319,7 @@ void CursorWindowController::UpdateCursorImage() {
void CursorWindowController::UpdateCursorVisibility() {
if (!cursor_window_)
return;
- bool visible = (visible_ && cursor_type_ != ui::kCursorNone);
+ bool visible = (visible_ && cursor_type_ != ui::CursorType::kNone);
if (visible)
cursor_window_->Show();
else
« no previous file with comments | « ash/display/cursor_window_controller.h ('k') | ash/display/cursor_window_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698