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

Unified Diff: services/ui/ws/window_manager_state_unittest.cc

Issue 2685883003: chromeos: converts observed pointer events to DIPs (Closed)
Patch Set: merge Created 3 years, 10 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 | « services/ui/ws/window_manager_state.cc ('k') | services/ui/ws/window_server.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/ws/window_manager_state_unittest.cc
diff --git a/services/ui/ws/window_manager_state_unittest.cc b/services/ui/ws/window_manager_state_unittest.cc
index 7a502a9fc947cadaefb348ef7257c2726865c920..d9910245dd7a5a53683d23a9ba46588882609873 100644
--- a/services/ui/ws/window_manager_state_unittest.cc
+++ b/services/ui/ws/window_manager_state_unittest.cc
@@ -239,7 +239,7 @@ TEST_F(WindowManagerStateTest, PreTargetConsumed) {
// Send an ensure only the pre accelerator is called.
ui::KeyEvent key(ui::ET_KEY_PRESSED, ui::VKEY_W, ui::EF_CONTROL_DOWN);
- window_manager_state()->ProcessEvent(key);
+ window_manager_state()->ProcessEvent(key, 0);
EXPECT_TRUE(window_manager()->on_accelerator_called());
EXPECT_EQ(accelerator_id, window_manager()->on_accelerator_id());
EXPECT_TRUE(tracker->changes()->empty());
@@ -254,7 +254,7 @@ TEST_F(WindowManagerStateTest, PreTargetConsumed) {
window_manager()->ClearAcceleratorCalled();
// Repeat, but respond with UNHANDLED.
- window_manager_state()->ProcessEvent(key);
+ window_manager_state()->ProcessEvent(key, 0);
EXPECT_TRUE(window_manager()->on_accelerator_called());
EXPECT_EQ(accelerator_id, window_manager()->on_accelerator_id());
EXPECT_TRUE(tracker->changes()->empty());
@@ -583,7 +583,7 @@ TEST_F(WindowManagerStateTest, CursorResetOverNoTarget) {
ui::ET_POINTER_MOVED, gfx::Point(25, 25), gfx::Point(25, 25), 0, 0, 0,
ui::PointerDetails(EventPointerType::POINTER_TYPE_MOUSE),
base::TimeTicks());
- window_manager_state()->ProcessEvent(move);
+ window_manager_state()->ProcessEvent(move, 0);
// The event isn't over a valid target, which should trigger resetting the
// cursor to POINTER.
EXPECT_EQ(ui::mojom::Cursor::POINTER, display_test_api.last_cursor());
« no previous file with comments | « services/ui/ws/window_manager_state.cc ('k') | services/ui/ws/window_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698