Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(720)

Unified Diff: ui/aura/mus/window_tree_client.cc

Issue 2520093003: WindowManagerClient::AddAccelerator() should take an array (Closed)
Patch Set: Create anonymous namespace helper for AcceleratorTransport mojom struct. Cleanup/format codes. Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..73259e67120f8700276924517d9b83aa1d174aed 100644
--- a/ui/aura/mus/window_tree_client.cc
+++ b/ui/aura/mus/window_tree_client.cc
@@ -1431,8 +1431,15 @@ 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::AcceleratorTransportPtr> multi_accelerators;
+ ui::mojom::AcceleratorTransportPtr accelerator_transport(
+ ui::mojom::AcceleratorTransport::New());
+ accelerator_transport->id = id;
+ accelerator_transport->event_matcher = std::move(event_matcher);
+ multi_accelerators.push_back(std::move(accelerator_transport));
+ window_manager_internal_client_->AddAccelerators(
+ std::move(multi_accelerators), callback);
+ ;
}
}
« services/ui/ws/event_dispatcher_unittest.cc ('K') | « services/ui/ws/window_tree.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698