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

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

Issue 2552783002: In aura mus, WindowManagerClient::AddAccelerator() should take an array. (Closed)
Patch Set: Remove unused include. Created 4 years 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
« no previous file with comments | « ui/aura/mus/window_tree_client.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
}
« no previous file with comments | « ui/aura/mus/window_tree_client.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698