Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Unified Diff: ash/common/system/tray/tray_event_filter.cc

Issue 2163453002: mus: Change PointerWatcher to watch for all events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add back location Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..5086c64fe973c0162b9e1cef4fb10c4d37afa6ab 100644
--- a/ash/common/system/tray/tray_event_filter.cc
+++ b/ash/common/system/tray/tray_event_filter.cc
@@ -34,15 +34,10 @@ 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) {
+void TrayEventFilter::OnPointerEventObserved(
+ const ui::LocatedEvent& event,
+ const gfx::Point& location_in_screen,
+ views::Widget* target) {
ProcessPressedEvent(location_in_screen, target);
}

Powered by Google App Engine
This is Rietveld 408576698