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

Unified Diff: components/exo/wm_helper_ash.cc

Issue 2949353003: Implement large cursors in Mushrome. (Closed)
Patch Set: rename everything to CursorSize 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
« no previous file with comments | « components/exo/wm_helper_ash.h ('k') | components/exo/wm_helper_mus.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/exo/wm_helper_ash.cc
diff --git a/components/exo/wm_helper_ash.cc b/components/exo/wm_helper_ash.cc
index 70764d0cbe512a1c7c6d62a8fe0fe2031a6dfbdd..daef7ad955cf853e63b732213d7378fbfc4a7cbb 100644
--- a/components/exo/wm_helper_ash.cc
+++ b/components/exo/wm_helper_ash.cc
@@ -70,11 +70,11 @@ aura::Window* WMHelperAsh::GetFocusedWindow() const {
return focus_client->GetFocusedWindow();
}
-ui::CursorSetType WMHelperAsh::GetCursorSet() const {
+ui::CursorSize WMHelperAsh::GetCursorSize() const {
// TODO(crbug.com/631103): Mushrome doesn't have a cursor manager yet.
if (ash::Shell::GetAshConfig() == ash::Config::MUS)
- return ui::CURSOR_SET_NORMAL;
- return ash::Shell::Get()->cursor_manager()->GetCursorSet();
+ return ui::CursorSize::kNormal;
+ return ash::Shell::Get()->cursor_manager()->GetCursorSize();
}
const display::Display& WMHelperAsh::GetCursorDisplay() const {
@@ -128,8 +128,8 @@ void WMHelperAsh::OnCursorVisibilityChanged(bool is_visible) {
NotifyCursorVisibilityChanged(is_visible);
}
-void WMHelperAsh::OnCursorSetChanged(ui::CursorSetType cursor_set) {
- NotifyCursorSetChanged(cursor_set);
+void WMHelperAsh::OnCursorSizeChanged(ui::CursorSize cursor_size) {
+ NotifyCursorSizeChanged(cursor_size);
}
void WMHelperAsh::OnCursorDisplayChanged(const display::Display& display) {
« no previous file with comments | « components/exo/wm_helper_ash.h ('k') | components/exo/wm_helper_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698