Make mash register initial batch of accelerators in single shot.

ash/mus/accelerators/accelerator_controller_registrar.h

Index: ash/mus/accelerators/accelerator_controller_registrar.h
diff --git a/ash/mus/accelerators/accelerator_controller_registrar.h b/ash/mus/accelerators/accelerator_controller_registrar.h
index da2841f6979bc5b64bcfcb49f710e495ba346a34..7f3506014db54d04b83e3682a9b8b06acf680fde 100644
--- a/ash/mus/accelerators/accelerator_controller_registrar.h
+++ b/ash/mus/accelerators/accelerator_controller_registrar.h
@@ -8,6 +8,7 @@
 #include <stdint.h>
 
 #include <map>
+#include <vector>
 
 #include "ash/mus/accelerators/accelerator_handler.h"
 #include "base/macros.h"
@@ -38,11 +39,21 @@ class AcceleratorControllerRegistrar : public AcceleratorHandler,
   ui::mojom::EventResult OnAccelerator(uint32_t id,
                                        const ui::Event& event) override;
 
+ private:
   // ui::AcceleratorManagerDelegate:
   void OnAcceleratorRegistered(const ui::Accelerator& accelerator) override;
   void OnAcceleratorUnregistered(const ui::Accelerator& accelerator) override;
 

[mfomitchev, 2017/01/24 22:56:02]

Remove whitespace since OnAcceleratorVectorRegistered is part of
ui::AcceleratorManagerDelegate implementation.

[thanhph1, 2017/01/25 20:12:37]

Done.

- private:
+  void OnAcceleratorVectorRegistered(
+      const std::vector<ui::Accelerator>& accelerators) override;
+
+  // Generate id and add the corresponding accelerator to accelerator vector.
+  // Creates a PRE_TARGET and POST_TARGET mojom accelerators for the provided
+  // |accelerator| and adds them to the provided |accelerator_vector|.
+  void AddAcceleratorToVector(
+      const ui::Accelerator& accelerator,
+      std::vector<ui::mojom::AcceleratorPtr>& accelerator_vector);
+
   friend class AcceleratorControllerRegistrarTestApi;

[mfomitchev, 2017/01/24 22:56:02]

Friend declaration should be in the beginning of the private: section.

[thanhph1, 2017/01/25 20:12:37]

Done.

 
   // The flow of accelerators in ash is: