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

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

Issue 2520093003: WindowManagerClient::AddAccelerator() should take an array (Closed)
Patch Set: Forget to add these files to previous patch. Created 4 years, 1 month 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: 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 fd3c5a286807c7ba1e2668229d254dc8f092f435..28dace56cc19bfde6ce74ac8dd2cefcf2945b4a5 100644
--- a/services/ui/ws/window_manager_state_unittest.cc
+++ b/services/ui/ws/window_manager_state_unittest.cc
@@ -232,8 +232,16 @@ TEST_F(WindowManagerStateTest, PreTargetConsumed) {
{
mojom::EventMatcherPtr matcher = ui::CreateKeyMatcher(
ui::mojom::KeyboardCode::W, ui::mojom::kEventFlagControlDown);
+
+ ui::mojom::AcceleratorEventPtr accelerator_event(
+ ui::mojom::AcceleratorEvent::New());
+ accelerator_event->id = accelerator_id;
+ accelerator_event->event_matcher = std::move(matcher);
+
+ mojo::Array<ui::mojom::AcceleratorEventPtr> multi_accelerators;
+ multi_accelerators.push_back(std::move(accelerator_event));
ASSERT_TRUE(window_manager_state()->event_dispatcher()->AddAccelerator(
- accelerator_id, std::move(matcher)));
+ std::move(multi_accelerators)));
}
TestChangeTracker* tracker = wm_client()->tracker();
tracker->changes()->clear();

Powered by Google App Engine
This is Rietveld 408576698