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

Unified Diff: ash/mus/accelerator_registrar_impl.cc

Issue 1939133002: StructTraits to map mus::mojom::Event to unique_ptr<ui::Event> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed feedback. Created 4 years, 6 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/accelerator_registrar_impl.h ('k') | ash/mus/accelerator_registrar_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/accelerator_registrar_impl.cc
diff --git a/ash/mus/accelerator_registrar_impl.cc b/ash/mus/accelerator_registrar_impl.cc
index ee58053db02c4840f878d51de5fe52f1d8dc1a8d..db1ddb3d31c7353682d7e233e9ec58e25f6281b3 100644
--- a/ash/mus/accelerator_registrar_impl.cc
+++ b/ash/mus/accelerator_registrar_impl.cc
@@ -56,12 +56,13 @@ bool AcceleratorRegistrarImpl::OwnsAccelerator(uint32_t accelerator_id) const {
return !!accelerators_.count(accelerator_id);
}
-void AcceleratorRegistrarImpl::ProcessAccelerator(
- uint32_t accelerator_id,
- ::mus::mojom::EventPtr event) {
+void AcceleratorRegistrarImpl::ProcessAccelerator(uint32_t accelerator_id,
+ const ui::Event& event) {
DCHECK(OwnsAccelerator(accelerator_id));
+ // TODO(moshayedi): crbug.com/617167. Don't clone even once we map
+ // mojom::Event directly to ui::Event.
accelerator_handler_->OnAccelerator(accelerator_id & kAcceleratorIdMask,
- std::move(event));
+ ui::Event::Clone(event));
}
AcceleratorRegistrarImpl::~AcceleratorRegistrarImpl() {
« no previous file with comments | « ash/mus/accelerator_registrar_impl.h ('k') | ash/mus/accelerator_registrar_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698