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

services/ui/ws/test_change_tracker.h

 // 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.
 
 #ifndef SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_
 #define SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 17 matching lines @@
   // TODO(sky): nuke NODE.
   CHANGE_TYPE_NODE_ADD_TRANSIENT_WINDOW,
   CHANGE_TYPE_NODE_BOUNDS_CHANGED,
   CHANGE_TYPE_NODE_HIERARCHY_CHANGED,
   CHANGE_TYPE_NODE_REMOVE_TRANSIENT_WINDOW_FROM_PARENT,
   CHANGE_TYPE_NODE_REORDERED,
   CHANGE_TYPE_NODE_VISIBILITY_CHANGED,
   CHANGE_TYPE_NODE_DRAWN_STATE_CHANGED,
   CHANGE_TYPE_NODE_DELETED,
   CHANGE_TYPE_INPUT_EVENT,
-  CHANGE_TYPE_EVENT_OBSERVED,
+  CHANGE_TYPE_POINTER_WATCHER_EVENT,
   CHANGE_TYPE_PROPERTY_CHANGED,
   CHANGE_TYPE_FOCUSED,
   CHANGE_TYPE_CURSOR_CHANGED,
   CHANGE_TYPE_ON_CHANGE_COMPLETED,
   CHANGE_TYPE_ON_TOP_LEVEL_CREATED,
   CHANGE_TYPE_OPACITY,
 };
 
 // TODO(sky): consider nuking and converting directly to WindowData.
 struct TestWindow {
@@ skipping 22 matching lines @@
 
   ChangeType type;
   ClientSpecificId client_id;
   std::vector<TestWindow> windows;
   Id window_id;
   Id window_id2;
   Id window_id3;
   gfx::Rect bounds;
   gfx::Rect bounds2;
   int32_t event_action;
-  uint32_t event_observer_id;
+  uint32_t pointer_watcher_id;
   mojo::String embed_url;
   mojom::OrderDirection direction;
   bool bool_value;
   float float_value;
   std::string property_key;
   std::string property_value;
   int32_t cursor_id;
   uint32_t change_id;
 };
 
@@ skipping 58 matching lines @@
                                 mojo::Array<mojom::WindowDataPtr> windows);
   void OnWindowReordered(Id window_id,
                          Id relative_window_id,
                          mojom::OrderDirection direction);
   void OnWindowDeleted(Id window_id);
   void OnWindowVisibilityChanged(Id window_id, bool visible);
   void OnWindowOpacityChanged(Id window_id, float opacity);
   void OnWindowParentDrawnStateChanged(Id window_id, bool drawn);
   void OnWindowInputEvent(Id window_id,
                           const ui::Event& event,
-                          uint32_t event_observer_id);
-  void OnEventObserved(const ui::Event& event, uint32_t event_observer_id);
+                          uint32_t pointer_watcher_id);
+  void OnPointerEventObserved(const ui::Event& event,
+                              uint32_t pointer_watcher_id);
   void OnWindowSharedPropertyChanged(Id window_id,
                                      mojo::String name,
                                      mojo::Array<uint8_t> data);
   void OnWindowFocused(Id window_id);
   void OnWindowPredefinedCursorChanged(Id window_id, mojom::Cursor cursor_id);
   void OnChangeCompleted(uint32_t change_id, bool success);
   void OnTopLevelCreated(uint32_t change_id,
                          mojom::WindowDataPtr window_data,
                          bool drawn);
 
  private:
   void AddChange(const Change& change);
 
   Delegate* delegate_;
   std::vector<Change> changes_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChangeTracker);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_TEST_CHANGE_TRACKER_H_