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

Unified Diff: ui/views/mus/pointer_watcher_event_router_unittest.cc

Issue 2256343003: Update ui::PointerEvent to support mouse wheel and capture change events. (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 | « ui/views/mus/pointer_watcher_event_router.cc ('k') | ui/views/pointer_watcher.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/pointer_watcher_event_router_unittest.cc
diff --git a/ui/views/mus/pointer_watcher_event_router_unittest.cc b/ui/views/mus/pointer_watcher_event_router_unittest.cc
index d7e0115e4764d7792b9cb7e6345e36919103b028..ba6cec938a1486bbcfcdeca83dd965ec1f29d068 100644
--- a/ui/views/mus/pointer_watcher_event_router_unittest.cc
+++ b/ui/views/mus/pointer_watcher_event_router_unittest.cc
@@ -131,6 +131,14 @@ TEST_F(PointerWatcherEventRouterTest, PointerWatcherNoMove) {
ui::ET_POINTER_UP, gfx::Point(), gfx::Point(), ui::EF_NONE, 1, 0,
ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
base::TimeTicks());
+ ui::PointerEvent pointer_event_wheel(
+ ui::ET_POINTER_WHEEL_CHANGED, gfx::Point(), gfx::Point(), ui::EF_NONE, 1,
+ 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+ base::TimeTicks());
+ ui::PointerEvent pointer_event_capture(
+ ui::ET_POINTER_CAPTURE_CHANGED, gfx::Point(), gfx::Point(), ui::EF_NONE,
+ 1, 0, ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_MOUSE),
+ base::TimeTicks());
// PointerWatchers receive pointer down events.
TestPointerWatcher watcher1;
@@ -144,6 +152,18 @@ TEST_F(PointerWatcherEventRouterTest, PointerWatcherNoMove) {
EXPECT_EQ(ui::ET_POINTER_UP, watcher1.last_event_observed()->type());
watcher1.Reset();
+ // PointerWatchers receive pointer wheel changed events.
+ OnPointerEventObserved(pointer_event_wheel);
+ EXPECT_EQ(ui::ET_POINTER_WHEEL_CHANGED,
+ watcher1.last_event_observed()->type());
+ watcher1.Reset();
+
+ // PointerWatchers receive pointer capture changed events.
+ OnPointerEventObserved(pointer_event_capture);
+ EXPECT_EQ(ui::ET_POINTER_CAPTURE_CHANGED,
+ watcher1.last_event_observed()->type());
+ watcher1.Reset();
+
// Two PointerWatchers can both receive a single observed event.
TestPointerWatcher watcher2;
pointer_watcher_event_router->AddPointerWatcher(&watcher2, false);
« no previous file with comments | « ui/views/mus/pointer_watcher_event_router.cc ('k') | ui/views/pointer_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698