Add {Lock,Unlock,Show,Hide}Cursor() to the window manager mojom.

services/ui/ws/display.h

 // Copyright 2015 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.
 
 #ifndef SERVICES_UI_WS_DISPLAY_H_
 #define SERVICES_UI_WS_DISPLAY_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 131 matching lines @@
                             const ui::TextInputState& state);
   void SetImeVisibility(ServerWindow* window, bool visible);
 
   // Called just before |tree| is destroyed.
   void OnWillDestroyTree(WindowTree* tree);
 
   // Removes |display_root| from internal maps. This called prior to
   // |display_root| being destroyed.
   void RemoveWindowManagerDisplayRoot(WindowManagerDisplayRoot* display_root);
 
-  void UpdateNativeCursor(const ui::CursorData& cursor);
+  // Sets the native cursor to |cursor|.
+  void SetNativeCursor(const ui::CursorData& curosor);
 
   // mojom::WindowTreeHost:
   void SetSize(const gfx::Size& size) override;
   void SetTitle(const std::string& title) override;
 
   // Updates the size of display root ServerWindow and WM root ServerWindow(s).
   void OnViewportMetricsChanged(const display::ViewportMetrics& metrics);
 
   // Returns the root window of the active user.
   ServerWindow* GetActiveRootWindow();
 
  private:
   friend class test::DisplayTestApi;
 
   using WindowManagerDisplayRootMap =
       std::map<UserId, WindowManagerDisplayRoot*>;
 
+  class CursorState;
+
   // Inits the necessary state once the display is ready.
   void InitWindowManagerDisplayRoots();
 
   // Creates the set of WindowManagerDisplayRoots from the
   // WindowManagerWindowTreeFactorySet.
   void CreateWindowManagerDisplayRootsFromFactories();
 
   void CreateWindowManagerDisplayRootFromFactory(
       WindowManagerWindowTreeFactory* factory);
 
@@ skipping 31 matching lines @@
   std::unique_ptr<DisplayBinding> binding_;
   WindowServer* const window_server_;
   std::unique_ptr<ServerWindow> root_;
   std::unique_ptr<PlatformDisplay> platform_display_;
   std::unique_ptr<FocusController> focus_controller_;
 
   // In internal window mode this contains information about the display. In
   // external window mode this will be invalid.
   display::Display display_;
 
-  // The last cursor set. Used to track whether we need to change the cursor.
-  ui::CursorData last_cursor_;
-
   ServerWindowTracker activation_parents_;
 
   cc::LocalSurfaceIdAllocator allocator_;
 
   WindowManagerDisplayRootMap window_manager_display_root_map_;
 
   DISALLOW_COPY_AND_ASSIGN(Display);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_DISPLAY_H_