Make mash register initial batch of accelerators in single shot.

ash/mus/accelerators/accelerator_controller_registrar.h

 // 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.
 
 #ifndef ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_REGISTRAR_H_
 #define ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_REGISTRAR_H_
 
 #include <stdint.h>
 
 #include <map>
+#include <vector>
 
 #include "ash/mus/accelerators/accelerator_handler.h"
 #include "base/macros.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/accelerators/accelerator_manager_delegate.h"
 #include "ui/events/mojo/event_constants.mojom.h"
 
 namespace ash {
 
 class AcceleratorRouter;
@@ skipping 10 matching lines @@
                                        public ui::AcceleratorManagerDelegate {
  public:
   AcceleratorControllerRegistrar(WindowManager* window_manager,
                                  uint16_t id_namespace);
   ~AcceleratorControllerRegistrar() override;
 
   // 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;
 
- 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;
 
   // The flow of accelerators in ash is:
   // . wm::AcceleratorFilter() sees events first as it's a pre-target handler.
   // . AcceleratorFilter forwards to its delegate, which indirectly is
   //   implemented by AcceleratorRouter.
   // . AcceleratorRouter may early out, if not it calls through to
   //   AcceleratorController. This stop may stop propagation entirely.
   // . If focus is on a Widget, then NativeWidgetAura gets the key event, calls
   //   to Widget::OnKeyEvent(), which calls to FocusManager::OnKeyEvent(), which
@@ skipping 23 matching lines @@
 
   WindowManager* window_manager_;
 
   const uint16_t id_namespace_;
 
   // Id to use for the next accelerator.
   uint16_t next_id_;
 
   std::unique_ptr<AcceleratorRouter> router_;
 
+  std::vector<ui::mojom::AcceleratorPtr> accelerator_ptrs_;

[mfomitchev, 2017/01/24 21:00:30]

remove

[thanhph1, 2017/01/24 21:17:06]

good catch, thanks!

+
   // Set of registered local ids.
   std::set<uint16_t> ids_;
 
   // Maps from accelerator to the two ids registered for it.
   std::map<ui::Accelerator, Ids> accelerator_to_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(AcceleratorControllerRegistrar);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_ACCELERATORS_ACCELERATOR_CONTROLLER_REGISTRAR_H_