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 ea9619ea287a2db3e0047678724d4fb60c73d6ef..fd5dc4d06013eb06ae070954fcd0156796fc38fc 100644
--- a/ui/views/mus/window_manager_connection.h
+++ b/ui/views/mus/window_manager_connection.h
@@ -27,8 +27,8 @@ class Connector;
 namespace views {
 class ClipboardMus;
 class NativeWidget;
+class PointerEventWatcher;
 class PointerWatcher;
-class TouchEventWatcher;
 class ScreenMus;
 namespace internal {
 class NativeWidgetDelegate;
@@ -68,8 +68,10 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
   void AddPointerWatcher(PointerWatcher* watcher);
   void RemovePointerWatcher(PointerWatcher* watcher);
 
-  void AddTouchEventWatcher(TouchEventWatcher* watcher);
-  void RemoveTouchEventWatcher(TouchEventWatcher* watcher);
+  void AddPointerEventWatcher(PointerEventWatcher* watcher,
+                              ui::EventPointerType type);
+  void RemovePointerEventWatcher(PointerEventWatcher* watcher,
+                                 ui::EventPointerType type);
 
   const std::set<ui::Window*>& GetRoots() const;
 
@@ -82,6 +84,7 @@ class VIEWS_MUS_EXPORT WindowManagerConnection
   // Returns true if there is one or more watchers for this client.
   bool HasPointerWatcher();
   bool HasTouchEventWatcher();
+  bool HasMouseEventWatcher();
 
   // ui::WindowTreeClientDelegate:
   void OnEmbed(ui::Window* root) override;
@@ -98,7 +101,8 @@ 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_;
+  base::ObserverList<PointerEventWatcher, true> touch_event_watchers_;
+  base::ObserverList<PointerEventWatcher, true> mouse_event_watchers_;

[sadrul, 2016/07/20 16:14:54]

Can this be an ObserverList<> pointer_event_watchers_, and a
ui::EventPointerType, instead of two observer lists?

 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerConnection);
 };