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

Unified Diff: ash/mus/window_manager.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 | « ash/mus/window_manager.h ('k') | services/ui/demo/mus_demo_internal.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager.cc
diff --git a/ash/mus/window_manager.cc b/ash/mus/window_manager.cc
index 3476cc5f50d21775db6d12b1fa4bf715074796a2..a57620912a70e46555cfb4a0d217019dcc01fec8 100644
--- a/ash/mus/window_manager.cc
+++ b/ash/mus/window_manager.cc
@@ -434,13 +434,15 @@ void WindowManager::OnWmCancelMoveLoop(aura::Window* window) {
handler->RevertDrag();
}
-ui::mojom::EventResult WindowManager::OnAccelerator(uint32_t id,
- const ui::Event& event) {
+ui::mojom::EventResult WindowManager::OnAccelerator(
+ uint32_t id,
+ const ui::Event& event,
+ std::unordered_map<std::string, std::vector<uint8_t>>* properties) {
auto iter = accelerator_handlers_.find(GetAcceleratorNamespaceId(id));
if (iter == accelerator_handlers_.end())
return ui::mojom::EventResult::HANDLED;
- return iter->second->OnAccelerator(id, event);
+ return iter->second->OnAccelerator(id, event, properties);
}
void WindowManager::OnWmSetClientArea(
« no previous file with comments | « ash/mus/window_manager.h ('k') | services/ui/demo/mus_demo_internal.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698