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

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

Issue 2761233003: Adds ability for accelerators to add key/value pairs to KeyEvent (Closed)
Patch Set: feedback and compile Created 3 years, 9 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 | « ui/aura/mus/window_manager_delegate.cc ('k') | ui/aura/test/aura_test_base.h » ('j') | 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 5f5ff4cdcd67425d3d866a12fb5003153b24ad81..b872edb24cfd1c9e5e37866563b9381d4e7aabbd 100644
--- a/ui/aura/mus/window_tree_client.cc
+++ b/ui/aura/mus/window_tree_client.cc
@@ -1591,10 +1591,12 @@ void WindowTreeClient::OnAccelerator(uint32_t ack_id,
uint32_t accelerator_id,
std::unique_ptr<ui::Event> event) {
DCHECK(event);
- const ui::mojom::EventResult result =
- window_manager_delegate_->OnAccelerator(accelerator_id, *event.get());
+ std::unordered_map<std::string, std::vector<uint8_t>> properties;
+ const ui::mojom::EventResult result = window_manager_delegate_->OnAccelerator(
+ accelerator_id, *event.get(), &properties);
if (ack_id && window_manager_internal_client_)
- window_manager_internal_client_->OnAcceleratorAck(ack_id, result);
+ window_manager_internal_client_->OnAcceleratorAck(ack_id, result,
+ properties);
}
void WindowTreeClient::SetFrameDecorationValues(
« no previous file with comments | « ui/aura/mus/window_manager_delegate.cc ('k') | ui/aura/test/aura_test_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698