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

Unified Diff: services/ui/ws/window_tree.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_tree.cc
diff --git a/services/ui/ws/window_tree.cc b/services/ui/ws/window_tree.cc
index 9b6459540c5dd71d5ca6405db13a846b15f02e70..018c5a7a9f966b63ffb144dd1c10f19b562b35f3 100644
--- a/services/ui/ws/window_tree.cc
+++ b/services/ui/ws/window_tree.cc
@@ -1675,13 +1675,14 @@ void WindowTree::CancelWindowMove(Id window_id) {
window_server_->GetCurrentMoveLoopChangeId());
}
-void WindowTree::AddAccelerator(uint32_t id,
- mojom::EventMatcherPtr event_matcher,
- const AddAcceleratorCallback& callback) {
+void WindowTree::AddAccelerator(
+ mojo::Array<mojom::AcceleratorEventPtr> multi_accelerators,
+ const AddAcceleratorCallback& callback) {
DCHECK(window_manager_state_);
+
const bool success =
window_manager_state_->event_dispatcher()->AddAccelerator(
- id, std::move(event_matcher));
+ std::move(multi_accelerators));
callback.Run(success);
}

Powered by Google App Engine
This is Rietveld 408576698