[views-mus] Support custom cursors.

ui/aura/mus/in_flight_change.cc

 // 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.
 
 #include "ui/aura/mus/in_flight_change.h"
 
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/mus/capture_synchronizer.h"
 #include "ui/aura/mus/focus_synchronizer.h"
 #include "ui/aura/mus/window_mus.h"
@@ skipping 163 matching lines @@
         base::MakeUnique<std::vector<uint8_t>>(*property_change.revert_value_);
   } else {
     revert_value_.reset();
   }
 }
 
 void InFlightPropertyChange::Revert() {
   window()->SetPropertyFromServer(property_name_, revert_value_.get());
 }
 
-// InFlightPredefinedCursorChange ---------------------------------------------
+// InFlightCursorChange ----------------------------------------------------
 
-InFlightPredefinedCursorChange::InFlightPredefinedCursorChange(
-    WindowMus* window,
-    ui::mojom::CursorType revert_value)
-    : InFlightChange(window, ChangeType::PREDEFINED_CURSOR),
+InFlightCursorChange::InFlightCursorChange(WindowMus* window,
+                                           const ui::CursorData& revert_value)
+    : InFlightChange(window, ChangeType::CURSOR),
       revert_cursor_(revert_value) {}
 
-InFlightPredefinedCursorChange::~InFlightPredefinedCursorChange() {}
+InFlightCursorChange::~InFlightCursorChange() {}
 
-void InFlightPredefinedCursorChange::SetRevertValueFrom(
-    const InFlightChange& change) {
+void InFlightCursorChange::SetRevertValueFrom(const InFlightChange& change) {
   revert_cursor_ =
-      static_cast<const InFlightPredefinedCursorChange&>(change).revert_cursor_;
+      static_cast<const InFlightCursorChange&>(change).revert_cursor_;
 }
 
-void InFlightPredefinedCursorChange::Revert() {
-  window()->SetPredefinedCursorFromServer(revert_cursor_);
+void InFlightCursorChange::Revert() {
+  window()->SetCursorFromServer(revert_cursor_);
 }
 
 // InFlightVisibleChange -------------------------------------------------------
 
 InFlightVisibleChange::InFlightVisibleChange(WindowTreeClient* client,
                                              WindowMus* window,
                                              bool revert_value)
     : InFlightChange(window, ChangeType::VISIBLE),
       window_tree_client_(client),
       revert_visible_(revert_value) {}
@@ skipping 42 matching lines @@
     const InFlightChange& change) {
   revert_modal_type_ =
       static_cast<const InFlightSetModalTypeChange&>(change).revert_modal_type_;
 }
 
 void InFlightSetModalTypeChange::Revert() {
   window()->GetWindow()->SetProperty(client::kModalKey, revert_modal_type_);
 }
 
 }  // namespace aura