Chromium Code Reviews| 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..da9e81e938c7d563c7c0dcd1fb24da3e71bf8824 100644 |
| --- a/ash/common/system/tray/tray_event_filter.cc |
| +++ b/ash/common/system/tray/tray_event_filter.cc |
| @@ -34,16 +34,12 @@ 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::OnPointerWatcherEvent( |
| + const ui::PointerEvent& event, |
| + const gfx::Point& location_in_screen, |
| + views::Widget* target) { |
| + if (event.type() == ui::ET_POINTER_DOWN) |
| + ProcessPressedEvent(location_in_screen, target); |
|
James Cook
2016/07/27 01:54:01
(BTW, this should fix my bug with the system tray
riajiang
2016/07/27 22:39:16
Tested and added that to the bug list.
|
| } |
| void TrayEventFilter::ProcessPressedEvent(const gfx::Point& location_in_screen, |