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

Unified Diff: ash/pointer_watcher_delegate_aura.cc

Issue 2183163002: mus: Change PointerWatcher to observe all pointer events, with moves optional. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 4 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
« no previous file with comments | « ash/mus/window_manager_unittest.cc ('k') | ash/sysui/pointer_watcher_delegate_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/pointer_watcher_delegate_aura.cc
diff --git a/ash/pointer_watcher_delegate_aura.cc b/ash/pointer_watcher_delegate_aura.cc
index d70720d5a1932395559a707fb2e3defc33ac896f..9e72178a25cf0e6ce1550a8d28801a9bd6f6fd6f 100644
--- a/ash/pointer_watcher_delegate_aura.cc
+++ b/ash/pointer_watcher_delegate_aura.cc
@@ -34,17 +34,27 @@ void PointerWatcherDelegateAura::RemovePointerWatcher(
}
void PointerWatcherDelegateAura::OnMouseEvent(ui::MouseEvent* event) {
- if (event->type() == ui::ET_MOUSE_PRESSED)
- FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_,
- OnMousePressed(*event, GetLocationInScreen(*event),
- GetTargetWidget(*event)));
+ // For compatibility with the mus version, don't send moves.
+ if (event->type() != ui::ET_MOUSE_PRESSED &&
+ event->type() != ui::ET_MOUSE_RELEASED)
+ return;
+ ui::PointerEvent mouse_pointer_event(*event);
+ FOR_EACH_OBSERVER(
+ views::PointerWatcher, pointer_watchers_,
+ OnPointerEventObserved(mouse_pointer_event, GetLocationInScreen(*event),
+ GetTargetWidget(*event)));
}
void PointerWatcherDelegateAura::OnTouchEvent(ui::TouchEvent* event) {
- if (event->type() == ui::ET_TOUCH_PRESSED)
- FOR_EACH_OBSERVER(views::PointerWatcher, pointer_watchers_,
- OnTouchPressed(*event, GetLocationInScreen(*event),
- GetTargetWidget(*event)));
+ // For compatibility with the mus version, don't send moves.
+ if (event->type() != ui::ET_TOUCH_PRESSED &&
+ event->type() != ui::ET_TOUCH_RELEASED)
+ return;
+ ui::PointerEvent touch_pointer_event(*event);
+ FOR_EACH_OBSERVER(
+ views::PointerWatcher, pointer_watchers_,
+ OnPointerEventObserved(touch_pointer_event, GetLocationInScreen(*event),
+ GetTargetWidget(*event)));
}
gfx::Point PointerWatcherDelegateAura::GetLocationInScreen(
« no previous file with comments | « ash/mus/window_manager_unittest.cc ('k') | ash/sysui/pointer_watcher_delegate_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698