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..fa48c16404b9289d2203f8045ef59df805f3bbf0 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();

[mfomitchev, 2017/01/03 19:54:35]

We still need the DCHECK here, even though we don't know which accelerator
caused the failure. The logging you added on Mus side is simply logging and not
a DCHECK (as it should be), so if we remove the DCHECK here, we lose error
detection.

+       ++iter)
+    OnAcceleratorAdded(*iter, added);
 }  // namespace
+}
 
 AcceleratorControllerRegistrar::AcceleratorControllerRegistrar(
     WindowManager* window_manager,
@@ -99,8 +106,9 @@ ui::mojom::EventResult AcceleratorControllerRegistrar::OnAccelerator(
              : ui::mojom::EventResult::UNHANDLED;
 }
 
-void AcceleratorControllerRegistrar::OnAcceleratorRegistered(
-    const ui::Accelerator& accelerator) {
+void AcceleratorControllerRegistrar::AddAcceleratorToVector(
+    const ui::Accelerator& accelerator,
+    std::vector<ui::mojom::AcceleratorPtr>& accelerator_vector) {
   Ids ids;
   if (!GenerateIds(&ids)) {
     DVLOG(1) << "max number of accelerators registered, dropping request";
@@ -124,16 +132,36 @@ void AcceleratorControllerRegistrar::OnAcceleratorRegistered(
   post_event_matcher->accelerator_phase =
       ui::mojom::AcceleratorPhase::POST_TARGET;
 
+  accelerator_vector.push_back(
+      ui::CreateAccelerator(ComputeAcceleratorId(id_namespace_, ids.pre_id),
+                            std::move(event_matcher)));
+
+  accelerator_vector.push_back(
+      ui::CreateAccelerator(ComputeAcceleratorId(id_namespace_, ids.post_id),
+                            std::move(post_event_matcher)));
+}
+
+void AcceleratorControllerRegistrar::OnAcceleratorsRegistered(
+    const std::vector<ui::Accelerator>& accelerators) {
+  std::vector<ui::mojom::AcceleratorPtr> accelerator_vector;
+
+  for (auto iter = accelerators.begin(); iter != accelerators.end(); ++iter)
+    AddAcceleratorToVector(*iter, accelerator_vector);
+
   window_manager_->window_manager_client()->AddAccelerators(
-      ui::CreateAcceleratorVector(
-          ComputeAcceleratorId(id_namespace_, ids.pre_id),
-          std::move(event_matcher)),
-      base::Bind(OnAcceleratorAdded, accelerator));
+      std::move(accelerator_vector),
+      base::Bind(OnAcceleratorsAdded, accelerators));
+}
+
+// add_accelerator_immediately default set to true.
+void AcceleratorControllerRegistrar::OnAcceleratorRegistered(
+    const ui::Accelerator& accelerator) {
+  std::vector<ui::mojom::AcceleratorPtr> accelerator_vector;
+
+  AddAcceleratorToVector(accelerator, accelerator_vector);
 
   window_manager_->window_manager_client()->AddAccelerators(
-      ui::CreateAcceleratorVector(
-          ComputeAcceleratorId(id_namespace_, ids.post_id),
-          std::move(post_event_matcher)),
+      std::move(accelerator_vector),
       base::Bind(OnAcceleratorAdded, accelerator));
 }