Chromium Code Reviews| Index: services/ui/public/cpp/window_tree_client.cc |
| diff --git a/services/ui/public/cpp/window_tree_client.cc b/services/ui/public/cpp/window_tree_client.cc |
| index bf8125ab53e9ff40baab353cb04f0ae1552be071..d4dce0f5268dfdb39c721cfbf0ce798b05f93d32 100644 |
| --- a/services/ui/public/cpp/window_tree_client.cc |
| +++ b/services/ui/public/cpp/window_tree_client.cc |
| @@ -1437,12 +1437,11 @@ void WindowTreeClient::SetNonClientCursor(Window* window, |
| } |
| void WindowTreeClient::AddAccelerator( |
|
mfomitchev
2016/11/22 22:44:16
nit: AddAccelerators
thanhph
2016/11/24 16:10:13
Done.
|
| - uint32_t id, |
| - mojom::EventMatcherPtr event_matcher, |
| + mojo::Array<mojom::AcceleratorEventPtr> multi_accelerators, |
|
mfomitchev
2016/11/22 22:44:16
Try to be consistent in naming: you are using acce
thanhph
2016/11/24 16:10:13
Done, I use multi_accelerators as the main name.
|
| const base::Callback<void(bool)>& callback) { |
| if (window_manager_internal_client_) { |
| window_manager_internal_client_->AddAccelerator( |
| - id, std::move(event_matcher), callback); |
| + std::move(multi_accelerators), callback); |
| } |
| } |