| Index: ash/mus/accelerators/accelerator_controller_registrar.cc
|
| diff --git a/ash/mus/accelerators/accelerator_controller_registrar.cc b/ash/mus/accelerators/accelerator_controller_registrar.cc
|
| index f1cd5c0393192e31a8648c69bc20ec7308ac4c4a..17daec5bac2376c6cf7ac0947f722701c862dfeb 100644
|
| --- a/ash/mus/accelerators/accelerator_controller_registrar.cc
|
| +++ b/ash/mus/accelerators/accelerator_controller_registrar.cc
|
| @@ -56,10 +56,8 @@ AcceleratorControllerRegistrar::~AcceleratorControllerRegistrar() {
|
|
|
| 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()) {
|
|
|