| Index: ui/aura/mus/window_tree_client.cc
|
| diff --git a/ui/aura/mus/window_tree_client.cc b/ui/aura/mus/window_tree_client.cc
|
| index 9fbd03f3146a5073be224f61347b7fda5e2a2c63..e0ae18f1a5468efb0f4628d02b1bda78f754f6c8 100644
|
| --- a/ui/aura/mus/window_tree_client.cc
|
| +++ b/ui/aura/mus/window_tree_client.cc
|
| @@ -1453,8 +1453,15 @@ void WindowTreeClient::AddAccelerator(
|
| ui::mojom::EventMatcherPtr event_matcher,
|
| const base::Callback<void(bool)>& callback) {
|
| if (window_manager_internal_client_) {
|
| + mojo::Array<ui::mojom::AcceleratorEventPtr> multi_accelerators;
|
| + ui::mojom::AcceleratorEventPtr accelerator_event(
|
| + ui::mojom::AcceleratorEvent::New());
|
| + accelerator_event->id = id;
|
| + accelerator_event->event_matcher = std::move(event_matcher);
|
| + multi_accelerators.push_back(std::move(accelerator_event));
|
| window_manager_internal_client_->AddAccelerator(
|
| - id, std::move(event_matcher), callback);
|
| + std::move(multi_accelerators), callback);
|
| + ;
|
| }
|
| }
|
|
|
|
|