mus: Change PointerWatcher to watch for all events.

ui/views/pointer_event_watcher.h

Index: ui/views/pointer_event_watcher.h
diff --git a/ui/views/touch_event_watcher.h b/ui/views/pointer_event_watcher.h
similarity index 55%
rename from ui/views/touch_event_watcher.h
rename to ui/views/pointer_event_watcher.h
index e1647de0dd068ee590df122390e82f494c1068d3..1514ccb87afe09bf52932754f45eef3090bbdb72 100644
--- a/ui/views/touch_event_watcher.h
+++ b/ui/views/pointer_event_watcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef UI_VIEWS_TOUCH_EVENT_WATCHER_H_
-#define UI_VIEWS_TOUCH_EVENT_WATCHER_H_
+#ifndef UI_VIEWS_POINTER_EVENT_WATCHER_H_
+#define UI_VIEWS_POINTER_EVENT_WATCHER_H_
 
 #include "base/macros.h"
 #include "ui/views/views_export.h"
@@ -19,25 +19,28 @@ class LocatedEvent;
 namespace views {
 class Widget;
 
-// An interface for read-only observation of touch events (in particular, the
-// events cannot be marked as handled). Only touch pointer kind are supported.
-// The |target| is the top-level widget that will receive the event, if any.
+// An interface for read-only observation of pointer events (in particular, the
+// events cannot be marked as handled). Only touch pointer kind and mouse
+// pointer kind are supported. The |target| is the top-level widget that will
+// receive the event, if any.
 // NOTE: On mus this allows observation of events outside of windows owned
 // by the current process, in which case the |target| will be null. On mus
 // event.target() is always null.
-class VIEWS_EXPORT TouchEventWatcher {
+class VIEWS_EXPORT PointerEventWatcher {

[sadrul, 2016/07/19 00:18:03]

This is going to be fairly confusing with PointerWatcher. Let's rename that one
to PointerDownWatcher.

[riajiang, 2016/07/19 18:46:34]

Will do the renaming in another cl.

  public:
-  TouchEventWatcher() {}
+  PointerEventWatcher() {}
   virtual void OnTouchEventObserved(const ui::LocatedEvent& event,
                                     Widget* target) = 0;
+  virtual void OnMouseEventObserved(const ui::LocatedEvent& event,
+                                    Widget* target) = 0;

[sadrul, 2016/07/19 00:18:03]

Let's go with a single OnPointerEventObserved(). If the watcher wants to treat
mouse vs. touch separately, it can easily do that.

[riajiang, 2016/07/19 18:46:34]

Done.

 
  protected:
-  virtual ~TouchEventWatcher() {}
+  virtual ~PointerEventWatcher() {}
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(TouchEventWatcher);
+  DISALLOW_COPY_AND_ASSIGN(PointerEventWatcher);
 };
 
 }  // namespace views
 
-#endif  // UI_VIEWS_TOUCH_EVENT_WATCHER_H_
+#endif  // UI_VIEWS_POINTER_EVENT_WATCHER_H_