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

Unified Diff: ash/display/cursor_window_controller.cc

Issue 2949353003: Implement large cursors in Mushrome. (Closed)
Patch Set: Remove old cursor.h includes. Created 3 years, 6 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
Index: ash/display/cursor_window_controller.cc
diff --git a/ash/display/cursor_window_controller.cc b/ash/display/cursor_window_controller.cc
index 075529636a4ceaf6b3aba9d45ca176515bd510dc..695b6becf2f1f4df0467e35e50d933e7665cb15c 100644
--- a/ash/display/cursor_window_controller.cc
+++ b/ash/display/cursor_window_controller.cc
@@ -90,7 +90,7 @@ CursorWindowController::CursorWindowController()
container_(NULL),
cursor_type_(ui::CursorType::kNone),
visible_(true),
- cursor_set_(ui::CURSOR_SET_NORMAL),
+ cursor_set_(ui::CursorSet::kNormal),
large_cursor_size_in_dip_(ash::kDefaultLargeCursorSize),
delegate_(new CursorWindowDelegate()) {}
@@ -190,7 +190,7 @@ void CursorWindowController::SetCursor(gfx::NativeCursor cursor) {
UpdateCursorVisibility();
}
-void CursorWindowController::SetCursorSet(ui::CursorSetType cursor_set) {
+void CursorWindowController::SetCursorSet(ui::CursorSet cursor_set) {
cursor_set_ = cursor_set;
UpdateCursorImage();
}
@@ -288,7 +288,7 @@ void CursorWindowController::UpdateCursorImage() {
// large cursor. We don't need to care about the case where cursor
// compositing is disabled as we always use cursor compositing if
// accessibility large cursor is enabled.
- if (cursor_set_ == ui::CursorSetType::CURSOR_SET_LARGE &&
+ if (cursor_set_ == ui::CursorSet::kLarge &&
large_cursor_size_in_dip_ != image->size().width()) {
float rescale = static_cast<float>(large_cursor_size_in_dip_) /
static_cast<float>(image->size().width());

Powered by Google App Engine
This is Rietveld 408576698