Change ui cursor identifiers to an enum class.

services/ui/ws/platform_display_default.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/ui/ws/platform_display_default.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 #include "services/ui/display/screen_manager.h"
+#include "services/ui/public/interfaces/cursor/cursor_struct_traits.h"
 #include "services/ui/ws/display_client_compositor_frame_sink.h"
 #include "services/ui/ws/server_window.h"
 #include "ui/base/cursor/image_cursors.h"
 #include "ui/display/display.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/platform_window/platform_ime_controller.h"
 #include "ui/platform_window/platform_window.h"
 
 #if defined(OS_WIN)
@@ skipping 79 matching lines @@
 
 void PlatformDisplayDefault::SetCursorById(mojom::CursorType cursor_id) {
   if (!image_cursors_)
     return;
 
   // TODO(erg): This still isn't sufficient, and will only use native cursors
   // that chrome would use, not custom image cursors. For that, we should
   // delegate to the window manager to load images from resource packs.
   //
   // We probably also need to deal with different DPIs.
-  ui::Cursor cursor(static_cast<int32_t>(cursor_id));
-  image_cursors_->SetPlatformCursor(&cursor);
-  platform_window_->SetCursor(cursor.platform());
+  ui::CursorType type;
+  if (mojo::EnumTraits<ui::mojom::CursorType, ui::CursorType>::FromMojom(
+          cursor_id, &type)) {
+    ui::Cursor cursor(type);
+    image_cursors_->SetPlatformCursor(&cursor);
+    platform_window_->SetCursor(cursor.platform());
+  }
 }
 
 void PlatformDisplayDefault::UpdateTextInputState(
     const ui::TextInputState& state) {
   ui::PlatformImeController* ime = platform_window_->GetPlatformImeController();
   if (ime)
     ime->UpdateTextInputState(state);
 }
 
 void PlatformDisplayDefault::SetImeVisibility(bool visible) {
@@ skipping 123 matching lines @@
 }
 
 void PlatformDisplayDefault::OnAcceleratedWidgetDestroyed() {
   NOTREACHED();
 }
 
 void PlatformDisplayDefault::OnActivationChanged(bool active) {}
 
 }  // namespace ws
 }  // namespace ui