Change ui cursor identifiers to an enum class.

ash/utility/screenshot_controller.cc

 // Copyright 2014 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 "ash/utility/screenshot_controller.h"
 
 #include <cmath>
 
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/public/cpp/shell_window_ids.h"
@@ skipping 186 matching lines @@
 
 class ScreenshotController::ScopedCursorSetter {
  public:
   ScopedCursorSetter(::wm::CursorManager* cursor_manager,
                      gfx::NativeCursor cursor)
       : cursor_manager_(nullptr) {
     if (cursor_manager->IsCursorLocked())
       return;
     gfx::NativeCursor original_cursor = cursor_manager->GetCursor();
     cursor_manager_ = cursor_manager;
-    if (cursor == ui::kCursorNone) {
+    if (cursor == ui::CursorType::kNone) {
       cursor_manager_->HideCursor();
     } else {
       cursor_manager_->SetCursor(cursor);
       cursor_manager_->ShowCursor();
     }
     cursor_manager_->LockCursor();
     // Set/ShowCursor does not make any effects at this point but it sets
     // back to the original cursor when unlocked.
     cursor_manager_->SetCursor(original_cursor);
     cursor_manager_->ShowCursor();
@@ skipping 36 matching lines @@
   mode_ = WINDOW;
 
   display::Screen::GetScreen()->AddObserver(this);
   for (aura::Window* root : Shell::GetAllRootWindows()) {
     layers_[root] = base::MakeUnique<ScreenshotLayer>(
         Shell::GetContainer(root, kShellWindowId_OverlayContainer)->layer(),
         true);
   }
   SetSelectedWindow(wm::GetActiveWindow());
 
-  cursor_setter_.reset(
-      new ScopedCursorSetter(Shell::Get()->cursor_manager(), ui::kCursorCross));
+  cursor_setter_.reset(new ScopedCursorSetter(Shell::Get()->cursor_manager(),
+                                              ui::CursorType::kCross));
 
   EnableMouseWarp(true);
 }
 
 void ScreenshotController::StartPartialScreenshotSession(
     ScreenshotDelegate* screenshot_delegate,
     bool draw_overlay_immediately) {
   // Already in a screenshot session.
   if (screenshot_delegate_) {
     DCHECK_EQ(screenshot_delegate_, screenshot_delegate);
     return;
   }
 
   screenshot_delegate_ = screenshot_delegate;
   mode_ = PARTIAL;
   display::Screen::GetScreen()->AddObserver(this);
   for (aura::Window* root : Shell::GetAllRootWindows()) {
     layers_[root] = base::MakeUnique<ScreenshotLayer>(
         Shell::GetContainer(root, kShellWindowId_OverlayContainer)->layer(),
         draw_overlay_immediately);
   }
 
   if (!pen_events_only_) {
     cursor_setter_.reset(new ScopedCursorSetter(Shell::Get()->cursor_manager(),
-                                                ui::kCursorCross));
+                                                ui::CursorType::kCross));
   }
 
   EnableMouseWarp(false);
 }
 
 void ScreenshotController::CancelScreenshotSession() {
   for (aura::Window* root : Shell::GetAllRootWindows()) {
     // Having pre-handled all mouse events, widgets that had mouse capture may
     // now misbehave, so break any existing captures. Do this after the
     // screenshot session is over so that it's still possible to screenshot
@@ skipping 32 matching lines @@
       CompletePartialScreenshot();
     }
   } else {
     root_window_ = current_root;
     start_position_ = event.root_location();
     if (!pen_events_only_) {
       // ScopedCursorSetter must be reset first to make sure that its dtor is
       // called before ctor is called.
       cursor_setter_.reset();
       cursor_setter_.reset(new ScopedCursorSetter(
-          Shell::Get()->cursor_manager(), ui::kCursorNone));
+          Shell::Get()->cursor_manager(), ui::CursorType::kNone));
     }
     Update(event);
   }
 }
 
 void ScreenshotController::CompleteWindowScreenshot() {
   if (selected_)
     screenshot_delegate_->HandleTakeWindowScreenshot(selected_);
   CancelScreenshotSession();
 }
@@ skipping 191 matching lines @@
 
 void ScreenshotController::OnDisplayMetricsChanged(
     const display::Display& display,
     uint32_t changed_metrics) {}
 
 void ScreenshotController::OnWindowDestroying(aura::Window* window) {
   SetSelectedWindow(nullptr);
 }
 
 }  // namespace ash