| 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);
|
| }
|
|
|
|
|