| 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 5b2cd4c304b8a336c95413b38e2ea031c8a4875b..3c59b334136659cbc1ace5093b214995cfd9f9a0 100644
|
| --- a/ui/aura/mus/window_tree_client.cc
|
| +++ b/ui/aura/mus/window_tree_client.cc
|
| @@ -14,6 +14,7 @@
|
| #include "base/bind.h"
|
| #include "base/memory/ptr_util.h"
|
| #include "services/service_manager/public/cpp/connector.h"
|
| +#include "services/ui/common/accelerator_util.h"
|
| #include "services/ui/public/cpp/property_type_converters.h"
|
| #include "services/ui/public/interfaces/constants.mojom.h"
|
| #include "services/ui/public/interfaces/window_manager.mojom.h"
|
| @@ -1431,8 +1432,11 @@ void WindowTreeClient::AddAccelerator(
|
| ui::mojom::EventMatcherPtr event_matcher,
|
| const base::Callback<void(bool)>& callback) {
|
| if (window_manager_internal_client_) {
|
| - window_manager_internal_client_->AddAccelerator(
|
| - id, std::move(event_matcher), callback);
|
| + std::vector<ui::mojom::AcceleratorPtr> accelerators =
|
| + ui::CreateAcceleratorVector(id, std::move(event_matcher));
|
| + window_manager_internal_client_->AddAccelerators(std::move(accelerators),
|
| + callback);
|
| + ;
|
| }
|
| }
|
|
|
|
|