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

Unified Diff: ui/wm/core/cursor_manager.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: ui/wm/core/cursor_manager.cc
diff --git a/ui/wm/core/cursor_manager.cc b/ui/wm/core/cursor_manager.cc
index 839a22e3d9c619fa34f8c03ddd93337681f59a5b..a9ccfb260424134355609bd576a9175311324cc8 100644
--- a/ui/wm/core/cursor_manager.cc
+++ b/ui/wm/core/cursor_manager.cc
@@ -24,7 +24,7 @@ class CursorState {
CursorState()
: cursor_(ui::CursorType::kNone),
visible_(true),
- cursor_set_(ui::CURSOR_SET_NORMAL),
+ cursor_set_(ui::CursorSet::kNormal),
mouse_events_enabled_(true),
visible_on_mouse_events_enabled_(true) {}
@@ -38,10 +38,8 @@ class CursorState {
// Ignores the call when mouse events disabled.
}
- ui::CursorSetType cursor_set() const { return cursor_set_; }
- void set_cursor_set(ui::CursorSetType cursor_set) {
- cursor_set_ = cursor_set;
- }
+ ui::CursorSet cursor_set() const { return cursor_set_; }
+ void set_cursor_set(ui::CursorSet cursor_set) { cursor_set_ = cursor_set; }
bool mouse_events_enabled() const { return mouse_events_enabled_; }
void SetMouseEventsEnabled(bool enabled) {
@@ -61,7 +59,7 @@ class CursorState {
private:
gfx::NativeCursor cursor_;
bool visible_;
- ui::CursorSetType cursor_set_;
+ ui::CursorSet cursor_set_;
bool mouse_events_enabled_;
// The visibility to set when mouse events are enabled.
@@ -129,7 +127,7 @@ bool CursorManager::IsCursorVisible() const {
return current_state_->visible();
}
-void CursorManager::SetCursorSet(ui::CursorSetType cursor_set) {
+void CursorManager::SetCursorSet(ui::CursorSet cursor_set) {
state_on_unlock_->set_cursor_set(cursor_set);
if (GetCursorSet() != state_on_unlock_->cursor_set()) {
delegate_->SetCursorSet(state_on_unlock_->cursor_set(), this);
@@ -138,7 +136,7 @@ void CursorManager::SetCursorSet(ui::CursorSetType cursor_set) {
}
}
-ui::CursorSetType CursorManager::GetCursorSet() const {
+ui::CursorSet CursorManager::GetCursorSet() const {
return current_state_->cursor_set();
}
@@ -230,7 +228,7 @@ void CursorManager::CommitVisibility(bool visible) {
current_state_->SetVisible(visible);
}
-void CursorManager::CommitCursorSet(ui::CursorSetType cursor_set) {
+void CursorManager::CommitCursorSet(ui::CursorSet cursor_set) {
current_state_->set_cursor_set(cursor_set);
}

Powered by Google App Engine
This is Rietveld 408576698