[views-mus] Support custom cursors.

services/ui/ws/test_change_tracker.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 "services/ui/ws/test_change_tracker.h"
 
 #include <stddef.h>
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/public/cpp/bindings/map.h"
 #include "services/ui/common/util.h"
+#include "ui/base/cursor/cursor.h"
 
 namespace ui {
 
 namespace ws {
 
 std::string WindowIdToString(Id id) {
   return (id == 0) ? "null"
                    : base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
 }
 
@@ skipping 101 matching lines @@
       return base::StringPrintf("PropertyChanged window=%s key=%s value=%s",
                                 WindowIdToString(change.window_id).c_str(),
                                 change.property_key.c_str(),
                                 change.property_value.c_str());
 
     case CHANGE_TYPE_FOCUSED:
       return base::StringPrintf("Focused id=%s",
                                 WindowIdToString(change.window_id).c_str());
 
     case CHANGE_TYPE_CURSOR_CHANGED:
-      return base::StringPrintf("CursorChanged id=%s cursor_id=%d",
+      return base::StringPrintf("CursorChanged id=%s cursor_type=%d",
                                 WindowIdToString(change.window_id).c_str(),
-                                change.cursor_id);
+                                static_cast<int>(change.cursor_type));
     case CHANGE_TYPE_ON_CHANGE_COMPLETED:
       return base::StringPrintf("ChangeCompleted id=%d sucess=%s",
                                 change.change_id,
                                 change.bool_value ? "true" : "false");
 
     case CHANGE_TYPE_ON_TOP_LEVEL_CREATED:
       return base::StringPrintf(
           "TopLevelCreated id=%d %s window_id=%s drawn=%s", change.change_id,
           change.frame_sink_id.ToString().c_str(),
           WindowIdToString(change.window_id).c_str(),
@@ skipping 76 matching lines @@
     : type(CHANGE_TYPE_EMBED),
       client_id(0),
       window_id(0),
       window_id2(0),
       window_id3(0),
       event_action(0),
       matches_pointer_watcher(false),
       direction(mojom::OrderDirection::ABOVE),
       bool_value(false),
       float_value(0.f),
-      cursor_id(0),
+      cursor_type(ui::CursorType::kNull),
       change_id(0u) {}
 
 Change::Change(const Change& other) = default;
 
 Change::~Change() {}
 
 TestChangeTracker::TestChangeTracker() : delegate_(NULL) {}
 
 TestChangeTracker::~TestChangeTracker() {}
 
@@ skipping 169 matching lines @@
   AddChange(change);
 }
 
 void TestChangeTracker::OnWindowFocused(Id window_id) {
   Change change;
   change.type = CHANGE_TYPE_FOCUSED;
   change.window_id = window_id;
   AddChange(change);
 }
 
-void TestChangeTracker::OnWindowPredefinedCursorChanged(
-    Id window_id,
-    mojom::CursorType cursor_id) {
+void TestChangeTracker::OnWindowCursorChanged(Id window_id,
+                                              const ui::CursorData& cursor) {
   Change change;
   change.type = CHANGE_TYPE_CURSOR_CHANGED;
   change.window_id = window_id;
-  change.cursor_id = static_cast<int32_t>(cursor_id);
+  change.cursor_type = cursor.cursor_type();
   AddChange(change);
 }
 
 void TestChangeTracker::OnChangeCompleted(uint32_t change_id, bool success) {
   Change change;
   change.type = CHANGE_TYPE_ON_CHANGE_COMPLETED;
   change.change_id = change_id;
   change.bool_value = success;
   AddChange(change);
 }
@@ skipping 44 matching lines @@
 
 std::string TestWindow::ToString2() const {
   return base::StringPrintf(
       "window=%s parent=%s visible=%s", WindowIdToString(window_id).c_str(),
       WindowIdToString(parent_id).c_str(), visible ? "true" : "false");
 }
 
 }  // namespace ws
 
 }  // namespace ui