Make mash register initial batch of accelerators in single shot.

ash/mus/accelerators/accelerator_controller_registrar.cc

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 12df77c21a1df982aeb715dc7226fcf2f54ea6eb..e5f18b4e9f8bd477a3e44c1b9fc33754169c1429 100644
--- a/ash/mus/accelerators/accelerator_controller_registrar.cc
+++ b/ash/mus/accelerators/accelerator_controller_registrar.cc
@@ -28,7 +28,14 @@ void OnAcceleratorAdded(const ui::Accelerator& accelerator, bool added) {
                 << " modifiers=" << accelerator.modifiers();
 }
 
+// Callback from registering the accelerators.
+void OnAcceleratorsAdded(const std::vector<ui::Accelerator>& ui_accelerators,
+                         bool added) {
+  for (auto iter = ui_accelerators.begin(); iter != ui_accelerators.end();
+       ++iter)
+    OnAcceleratorAdded(*iter, added);
 }  // namespace
+}
 
 AcceleratorControllerRegistrar::AcceleratorControllerRegistrar(
     WindowManager* window_manager,
@@ -124,17 +131,12 @@ void AcceleratorControllerRegistrar::OnAcceleratorRegistered(
   post_event_matcher->accelerator_phase =
       ui::mojom::AcceleratorPhase::POST_TARGET;
 
-  window_manager_->window_manager_client()->AddAccelerators(
-      ui::CreateAcceleratorVector(
-          ComputeAcceleratorId(id_namespace_, ids.pre_id),
-          std::move(event_matcher)),
-      base::Bind(OnAcceleratorAdded, accelerator));
-
-  window_manager_->window_manager_client()->AddAccelerators(
-      ui::CreateAcceleratorVector(
-          ComputeAcceleratorId(id_namespace_, ids.post_id),
-          std::move(post_event_matcher)),
-      base::Bind(OnAcceleratorAdded, accelerator));
+  accelerator_ptrs_.push_back(

[mfomitchev, 2016/12/20 03:10:26]

We can't completely repurpose this method to just be a helper method for
OnAcceleratorsRegistered - registering a single accelerator still needs to work
by itself, and right now it doesn't - we are just putting accelerator in the
array which doesn't get used until OnAcceleratorsRegistered is called.

[thanhph, 2016/12/20 20:46:15]

Thanks, I added the window_manager_->window_manager_client()->AddAccelerators
back. The function void
AcceleratorControllerRegistrar::OnAcceleratorRegistered(const ui::Accelerator&
accelerator) now will require another argument bool add_accelerator_immediately
(default to true)

+      ui::CreateAccelerator(ComputeAcceleratorId(id_namespace_, ids.pre_id),
+                            std::move(event_matcher)));
+  accelerator_ptrs_.push_back(
+      ui::CreateAccelerator(ComputeAcceleratorId(id_namespace_, ids.post_id),
+                            std::move(post_event_matcher)));
 }
 
 void AcceleratorControllerRegistrar::OnAcceleratorUnregistered(
@@ -152,6 +154,24 @@ void AcceleratorControllerRegistrar::OnAcceleratorUnregistered(
       ComputeAcceleratorId(id_namespace_, ids.post_id));
 }
 
+void AcceleratorControllerRegistrar::OnAcceleratorsRegistered(
+    std::vector<ui::Accelerator>& accelerators) {
+  accelerator_ptrs_.clear();
+  for (auto iter = accelerators.begin(); iter != accelerators.end(); ++iter)
+    OnAcceleratorRegistered(*iter);
+
+  window_manager_->window_manager_client()->AddAccelerators(
+      std::move(accelerator_ptrs_),
+      base::Bind(OnAcceleratorsAdded, accelerators));
+}
+
+void AcceleratorControllerRegistrar::OnAcceleratorsUnregistered(
+    std::vector<ui::Accelerator>& accelerators) {
+  for (auto iter = accelerators.begin(); iter != accelerators.end(); ++iter) {
+    OnAcceleratorUnregistered(*iter);
+  }
+}
+
 bool AcceleratorControllerRegistrar::GenerateIds(Ids* ids) {
   if (ids_.size() + 2 >= std::numeric_limits<uint16_t>::max())
     return false;