NOSUBMIT: PointerWatcher observes all pointer events, with moves optional

ash/common/system/tray/tray_event_filter.cc

Index: ash/common/system/tray/tray_event_filter.cc
diff --git a/ash/common/system/tray/tray_event_filter.cc b/ash/common/system/tray/tray_event_filter.cc
index 3b277ccf184456965bfa1ee9e23c71eec44d9635..2e87f2cdaa8d7d44ab5ca8af79ee8d10d5c84d0e 100644
--- a/ash/common/system/tray/tray_event_filter.cc
+++ b/ash/common/system/tray/tray_event_filter.cc
@@ -34,16 +34,13 @@ void TrayEventFilter::RemoveWrapper(TrayBubbleWrapper* wrapper) {
     WmShell::Get()->RemovePointerWatcher(this);
 }
 
-void TrayEventFilter::OnMousePressed(const ui::MouseEvent& event,
-                                     const gfx::Point& location_in_screen,
-                                     views::Widget* target) {
-  ProcessPressedEvent(location_in_screen, target);
-}
-
-void TrayEventFilter::OnTouchPressed(const ui::TouchEvent& event,
-                                     const gfx::Point& location_in_screen,
-                                     views::Widget* target) {
-  ProcessPressedEvent(location_in_screen, target);
+void TrayEventFilter::OnPointerEventObserved(
+    const ui::LocatedEvent& event,
+    const gfx::Point& location_in_screen,
+    views::Widget* target) {
+  if (event.type() == ui::ET_MOUSE_PRESSED ||
+      event.type() == ui::ET_TOUCH_PRESSED)
+    ProcessPressedEvent(location_in_screen, target);
 }
 
 void TrayEventFilter::ProcessPressedEvent(const gfx::Point& location_in_screen,