Adds ability for accelerators to add key/value pairs to KeyEvent

ash/mus/accelerators/accelerator_controller_registrar.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/accelerators/accelerator_controller_registrar.h"
 
 #include <limits>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/accelerator_router.h"
@@ skipping 38 matching lines @@
   // during shutdown, then this is unnecessary and results in a bunch of
   // messages that are dropped.
   for (uint16_t local_id : ids_) {
     window_manager_->window_manager_client()->RemoveAccelerator(
         ComputeAcceleratorId(id_namespace_, local_id));
   }
 }
 
 ui::mojom::EventResult AcceleratorControllerRegistrar::OnAccelerator(
     uint32_t id,
-    const ui::Event& event) {
-  // TODO: during startup a bunch of accelerators are registered, resulting in
-  // lots of IPC. We should optimize this to send a single IPC.
-  // http://crbug.com/632050
+    const ui::Event& event,
+    std::unordered_map<std::string, std::vector<uint8_t>>* properties) {
   const ui::Accelerator accelerator(*event.AsKeyEvent());
   auto iter = accelerator_to_ids_.find(accelerator);
   if (iter == accelerator_to_ids_.end()) {
     // Because of timing we may have unregistered the accelerator already,
     // ignore in that case.
     return ui::mojom::EventResult::UNHANDLED;
   }
 
   const Ids& ids = iter->second;
   AcceleratorController* accelerator_controller =
@@ skipping 100 matching lines @@
   // Common case is we never wrap once, so this is typically cheap. Additionally
   // we expect there not to be too many accelerators.
   while (ids_.count(next_id_) > 0)
     ++next_id_;
   ids_.insert(next_id_);
   return next_id_++;
 }
 
 }  // namespace mus
 }  // namespace ash