mus: Change PointerWatcher to observe all pointer events, with moves optional.

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"
@@ skipping 85 matching lines @@
 
     case CHANGE_TYPE_NODE_DRAWN_STATE_CHANGED:
       return base::StringPrintf("DrawnStateChanged window=%s drawn=%s",
                                 WindowIdToString(change.window_id).c_str(),
                                 change.bool_value ? "true" : "false");
 
     case CHANGE_TYPE_INPUT_EVENT: {
       std::string result = base::StringPrintf(
           "InputEvent window=%s event_action=%d",
           WindowIdToString(change.window_id).c_str(), change.event_action);
-      if (change.event_observer_id != 0)
-        base::StringAppendF(&result, " event_observer_id=%u",
-                            change.event_observer_id);
+      if (change.pointer_watcher_id != 0)
+        base::StringAppendF(&result, " pointer_watcher_id=%u",
+                            change.pointer_watcher_id);
       return result;
     }
 
-    case CHANGE_TYPE_EVENT_OBSERVED:
+    case CHANGE_TYPE_POINTER_WATCHER_EVENT:
       return base::StringPrintf(
-          "EventObserved event_action=%d event_observer_id=%u",
-          change.event_action, change.event_observer_id);
+          "PointerWatcherEvent event_action=%d pointer_watcher_id=%u",
+          change.event_action, change.pointer_watcher_id);
 
     case CHANGE_TYPE_PROPERTY_CHANGED:
       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());
@@ skipping 83 matching lines @@
     test_windows->push_back(WindowDataToTestWindow(data[i]));
 }
 
 Change::Change()
     : type(CHANGE_TYPE_EMBED),
       client_id(0),
       window_id(0),
       window_id2(0),
       window_id3(0),
       event_action(0),
-      event_observer_id(0u),
+      pointer_watcher_id(0u),
       direction(mojom::OrderDirection::ABOVE),
       bool_value(false),
       float_value(0.f),
       cursor_id(0),
       change_id(0u) {}
 
 Change::Change(const Change& other) = default;
 
 Change::~Change() {}
 
@@ skipping 114 matching lines @@
                                                         bool drawn) {
   Change change;
   change.type = CHANGE_TYPE_NODE_DRAWN_STATE_CHANGED;
   change.window_id = window_id;
   change.bool_value = drawn;
   AddChange(change);
 }
 
 void TestChangeTracker::OnWindowInputEvent(Id window_id,
                                            const ui::Event& event,
-                                           uint32_t event_observer_id) {
+                                           uint32_t pointer_watcher_id) {
   Change change;
   change.type = CHANGE_TYPE_INPUT_EVENT;
   change.window_id = window_id;
   change.event_action = static_cast<int32_t>(event.type());
-  change.event_observer_id = event_observer_id;
+  change.pointer_watcher_id = pointer_watcher_id;
   AddChange(change);
 }
 
-void TestChangeTracker::OnEventObserved(const ui::Event& event,
-                                        uint32_t event_observer_id) {
+void TestChangeTracker::OnPointerEventObserved(const ui::Event& event,
+                                               uint32_t pointer_watcher_id) {
   Change change;
-  change.type = CHANGE_TYPE_EVENT_OBSERVED;
+  change.type = CHANGE_TYPE_POINTER_WATCHER_EVENT;
   change.event_action = static_cast<int32_t>(event.type());
-  change.event_observer_id = event_observer_id;
+  change.pointer_watcher_id = pointer_watcher_id;
   AddChange(change);
 }
 
 void TestChangeTracker::OnWindowSharedPropertyChanged(Id window_id,
                                                       String name,
                                                       Array<uint8_t> data) {
   Change change;
   change.type = CHANGE_TYPE_PROPERTY_CHANGED;
   change.window_id = window_id;
   change.property_key = name;
@@ skipping 60 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