[views-mus] Support custom cursors.

ui/aura/mus/in_flight_change.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 UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
 #define UI_AURA_MUS_IN_FLIGHT_CHANGE_H_
 
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/optional.h"
 #include "cc/surfaces/local_surface_id.h"
 #include "ui/aura/window_observer.h"
+#include "ui/base/cursor/cursor_data.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ui {
 
 namespace mojom {
 enum class CursorType : int32_t;
 }
 
 }  // namespace ui
@@ skipping 10 matching lines @@
   ADD_TRANSIENT_WINDOW,
   BOUNDS,
   CAPTURE,
   DELETE_WINDOW,
   DRAG_LOOP,
   FOCUS,
   MOVE_LOOP,
   NEW_TOP_LEVEL_WINDOW,
   NEW_WINDOW,
   OPACITY,
-  PREDEFINED_CURSOR,
+  CURSOR,
   PROPERTY,
   REMOVE_CHILD,
   REMOVE_TRANSIENT_WINDOW_FROM_PARENT,
   REORDER,
   SET_MODAL,
   VISIBLE,
 };
 
 // InFlightChange is used to track function calls to the server and take the
 // appropriate action when the call fails, or the same property changes while
@@ skipping 204 matching lines @@
   void SetRevertValueFrom(const InFlightChange& change) override;
   void Revert() override;
 
  private:
   const std::string property_name_;
   std::unique_ptr<std::vector<uint8_t>> revert_value_;
 
   DISALLOW_COPY_AND_ASSIGN(InFlightPropertyChange);
 };
 
-class InFlightPredefinedCursorChange : public InFlightChange {
+class InFlightCursorChange : public InFlightChange {
  public:
-  InFlightPredefinedCursorChange(WindowMus* window,
-                                 ui::mojom::CursorType revert_value);
-  ~InFlightPredefinedCursorChange() override;
+  InFlightCursorChange(WindowMus* window, const ui::CursorData& revert_value);
+  ~InFlightCursorChange() override;
 
   // InFlightChange:
   void SetRevertValueFrom(const InFlightChange& change) override;
   void Revert() override;
 
  private:
-  ui::mojom::CursorType revert_cursor_;
+  ui::CursorData revert_cursor_;
 
-  DISALLOW_COPY_AND_ASSIGN(InFlightPredefinedCursorChange);
+  DISALLOW_COPY_AND_ASSIGN(InFlightCursorChange);
 };
 
 class InFlightVisibleChange : public InFlightChange {
  public:
   InFlightVisibleChange(WindowTreeClient* client,
                         WindowMus* window,
                         const bool revert_value);
   ~InFlightVisibleChange() override;
 
   // InFlightChange:
@@ skipping 33 matching lines @@
 
  private:
   ui::ModalType revert_modal_type_;
 
   DISALLOW_COPY_AND_ASSIGN(InFlightSetModalTypeChange);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_IN_FLIGHT_CHANGE_H_