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

Unified Diff: components/mus/ws/window_manager_state_unittest.cc

Issue 1891413002: mash: Convert OnWindowInputEventAck to use an enum for handled status (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: missed a file Created 4 years, 8 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 | « components/mus/ws/window_manager_state.cc ('k') | components/mus/ws/window_tree.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/mus/ws/window_manager_state_unittest.cc
diff --git a/components/mus/ws/window_manager_state_unittest.cc b/components/mus/ws/window_manager_state_unittest.cc
index c803d0ffc4d84fa016a171fac965b3c47a202949..65fb48648e1e93e6a4a22abb096bd4dc93dce44f 100644
--- a/components/mus/ws/window_manager_state_unittest.cc
+++ b/components/mus/ws/window_manager_state_unittest.cc
@@ -203,7 +203,7 @@ TEST_F(WindowManagerStateTest, NullAccelerator) {
EXPECT_EQ("InputEvent window=1,1 event_action=1",
ChangesToDescription1(*tracker->changes())[0]);
- state->OnEventAck(target_tree, false);
+ state->OnEventAck(target_tree, mojom::EventResult::UNHANDLED);
EXPECT_FALSE(window_manager()->on_accelerator_called());
}
@@ -220,7 +220,7 @@ TEST_F(WindowManagerStateTest, PostTargetAccelerator) {
EXPECT_EQ("InputEvent window=1,1 event_action=1",
ChangesToDescription1(*tracker->changes())[0]);
- window_manager_state()->OnEventAck(tree(), false);
+ window_manager_state()->OnEventAck(tree(), mojom::EventResult::UNHANDLED);
EXPECT_TRUE(window_manager()->on_accelerator_called());
EXPECT_EQ(accelerator->id(), window_manager()->on_accelerator_id());
}
@@ -238,7 +238,7 @@ TEST_F(WindowManagerStateTest, ClientHandlesEvent) {
EXPECT_EQ("InputEvent window=1,1 event_action=1",
ChangesToDescription1(*tracker->changes())[0]);
- window_manager_state()->OnEventAck(tree(), true);
+ window_manager_state()->OnEventAck(tree(), mojom::EventResult::HANDLED);
EXPECT_FALSE(window_manager()->on_accelerator_called());
}
@@ -256,7 +256,7 @@ TEST_F(WindowManagerStateTest, AcceleratorDeleted) {
ChangesToDescription1(*tracker->changes())[0]);
accelerator.reset();
- window_manager_state()->OnEventAck(tree(), false);
+ window_manager_state()->OnEventAck(tree(), mojom::EventResult::UNHANDLED);
EXPECT_FALSE(window_manager()->on_accelerator_called());
}
@@ -288,7 +288,7 @@ TEST_F(WindowManagerStateTest, EnqueuedAccelerators) {
WindowTree* target_tree = tree();
WindowTreeTestApi(target_tree).ClearAck();
- state->OnEventAck(target_tree, false);
+ state->OnEventAck(target_tree, mojom::EventResult::UNHANDLED);
EXPECT_EQ(1u, tracker->changes()->size());
EXPECT_EQ("InputEvent window=1,1 event_action=1",
ChangesToDescription1(*tracker->changes())[0]);
« no previous file with comments | « components/mus/ws/window_manager_state.cc ('k') | components/mus/ws/window_tree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698