mus: Change PointerWatcher to watch for all events.

ui/views/mus/window_manager_connection.h

Index: ui/views/mus/window_manager_connection.h
diff --git a/ui/views/mus/window_manager_connection.h b/ui/views/mus/window_manager_connection.h
index 867e97b4522a1dcd7fe157b571c1a7c6d6441807..9fb414436fe7c94d23a1f412be46a15ed0deb7a5 100644
--- a/ui/views/mus/window_manager_connection.h
+++ b/ui/views/mus/window_manager_connection.h
@@ -28,7 +28,6 @@ namespace views {
 class ClipboardMus;
 class NativeWidget;
 class PointerWatcher;
-class TouchEventWatcher;
 class ScreenMus;
 namespace internal {
 class NativeWidgetDelegate;
@@ -65,12 +64,11 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
       const Widget::InitParams& init_params,
       internal::NativeWidgetDelegate* delegate);
 
-  void AddPointerWatcher(PointerWatcher* watcher);
+  void AddPointerWatcher(PointerWatcher* watcher,
+                         ui::EventPointerType type,
+                         bool want_moves);
   void RemovePointerWatcher(PointerWatcher* watcher);
 
-  void AddTouchEventWatcher(TouchEventWatcher* watcher);
-  void RemoveTouchEventWatcher(TouchEventWatcher* watcher);
-
   const std::set<ui::Window*>& GetRoots() const;
 
  private:
@@ -81,7 +79,6 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
 
   // Returns true if there is one or more watchers for this client.
   bool HasPointerWatcher();
-  bool HasTouchEventWatcher();
 
   // ui::WindowTreeClientDelegate:
   void OnEmbed(ui::Window* root) override;
@@ -98,7 +95,7 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
   std::unique_ptr<ui::WindowTreeClient> client_;
   // Must be empty on destruction.
   base::ObserverList<PointerWatcher, true> pointer_watchers_;
-  base::ObserverList<TouchEventWatcher, true> touch_event_watchers_;
+  ui::EventPointerType event_pointer_type_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection);
 };