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

Unified Diff: services/ui/public/cpp/lib/window_tree_client.cc

Issue 2125883003: Adds ability for pre-target accelerators to not consume events (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 5 months 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 | « services/ui/public/cpp/BUILD.gn ('k') | services/ui/public/cpp/tests/window_server_test_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/ui/public/cpp/lib/window_tree_client.cc
diff --git a/services/ui/public/cpp/lib/window_tree_client.cc b/services/ui/public/cpp/lib/window_tree_client.cc
index 570d3e10d63b5c0b8b3995c1b1dfd3e4a4e80204..8c135735b9a476c9071432d2c788cd3aee8cd0f1 100644
--- a/services/ui/public/cpp/lib/window_tree_client.cc
+++ b/services/ui/public/cpp/lib/window_tree_client.cc
@@ -1187,10 +1187,14 @@ void WindowTreeClient::WmCancelMoveLoop(uint32_t change_id) {
window_manager_delegate_->OnWmCancelMoveLoop(window);
}
-void WindowTreeClient::OnAccelerator(uint32_t id,
+void WindowTreeClient::OnAccelerator(uint32_t ack_id,
+ uint32_t accelerator_id,
std::unique_ptr<ui::Event> event) {
DCHECK(event);
- window_manager_delegate_->OnAccelerator(id, *event.get());
+ const mojom::EventResult result =
+ window_manager_delegate_->OnAccelerator(accelerator_id, *event.get());
+ if (ack_id && window_manager_internal_client_)
+ window_manager_internal_client_->OnAcceleratorAck(ack_id, result);
}
void WindowTreeClient::SetFrameDecorationValues(
« no previous file with comments | « services/ui/public/cpp/BUILD.gn ('k') | services/ui/public/cpp/tests/window_server_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698