| 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 d8c702fe34e4d3bff12e4276fe18a1d653b8a8c0..fbd55f4a436bc8f0bd4411d3ccdd8a7748f0bf41 100644
|
| --- a/ui/aura/mus/window_tree_client.cc
|
| +++ b/ui/aura/mus/window_tree_client.cc
|
| @@ -1432,13 +1432,12 @@ void WindowTreeClient::SetNonClientCursor(Window* window,
|
| WindowMus::Get(window)->server_id(), cursor_id);
|
| }
|
|
|
| -void WindowTreeClient::AddAccelerator(
|
| - uint32_t id,
|
| - ui::mojom::EventMatcherPtr event_matcher,
|
| +void WindowTreeClient::AddAccelerators(
|
| + std::vector<ui::mojom::AcceleratorPtr> accelerators,
|
| const base::Callback<void(bool)>& callback) {
|
| if (window_manager_internal_client_) {
|
| - window_manager_internal_client_->AddAccelerators(
|
| - ui::CreateAcceleratorVector(id, std::move(event_matcher)), callback);
|
| + window_manager_internal_client_->AddAccelerators(std::move(accelerators),
|
| + callback);
|
| }
|
| }
|
|
|
|
|