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

Unified Diff: services/ui/ws/window_tree.cc

Issue 2520093003: WindowManagerClient::AddAccelerator() should take an array (Closed)
Patch Set: Adding 1 test that has two unique and one duped accelerators. 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
Index: services/ui/ws/window_tree.cc
diff --git a/services/ui/ws/window_tree.cc b/services/ui/ws/window_tree.cc
index b75af49bd5a53f81d357dec13b367f902cab3220..613f7e7430281fff10182e3ffc62eb5c913ca95c 100644
--- a/services/ui/ws/window_tree.cc
+++ b/services/ui/ws/window_tree.cc
@@ -1705,13 +1705,13 @@ void WindowTree::CancelWindowMove(Id window_id) {
window_server_->GetCurrentMoveLoopChangeId());
}
-void WindowTree::AddAccelerator(uint32_t id,
- mojom::EventMatcherPtr event_matcher,
- const AddAcceleratorCallback& callback) {
+void WindowTree::AddAccelerators(
+ std::vector<mojom::AcceleratorPtr> accelerators,
+ const AddAcceleratorsCallback& callback) {
DCHECK(window_manager_state_);
const bool success =
- window_manager_state_->event_dispatcher()->AddAccelerator(
- id, std::move(event_matcher));
+ window_manager_state_->event_dispatcher()->AddAccelerators(
+ std::move(accelerators));
callback.Run(success);
}

Powered by Google App Engine
This is Rietveld 408576698