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 11 matching lines @@
  public:
   AcceleratorControllerRegistrar(WindowManager* window_manager,
                                  uint16_t id_namespace);
   ~AcceleratorControllerRegistrar() override;
 
   // AcceleratorHandler:
   ui::mojom::EventResult OnAccelerator(uint32_t id,
                                        const ui::Event& event) override;
 
   // ui::AcceleratorManagerDelegate:
-  void OnAcceleratorRegistered(const ui::Accelerator& accelerator) override;
+  // default add_accelerator_immediately = true

[mfomitchev, 2016/12/22 01:04:50]

The comment doesn't add value - this is clear from signature.

[thanhph, 2016/12/22 20:36:01]

Done.

+  void OnAcceleratorRegistered(
+      const ui::Accelerator& accelerator,
+      bool add_accelerator_immediately = true) override;
   void OnAcceleratorUnregistered(const ui::Accelerator& accelerator) override;
 
+  void OnAcceleratorsRegistered(
+      const std::vector<ui::Accelerator>& accelerators) override;
+  void OnAcceleratorsUnregistered(

[mfomitchev, 2016/12/22 01:04:50]

Where is this actually called from?

[thanhph, 2016/12/22 20:36:01]

This is called in accelerator_manager_unittest.cc (line 99 for this patch). Test
case AcceleratorManagerTest.UnregisterAll (in the same file) will fail if this
function is not probably implemented.

[mfomitchev, 2016/12/22 21:18:55]

Line 99 is an implementation of OnAcceleratorsUnregistered from
AcceleratorManagerDelegate interface. OnAcceleratorsUnregistered is never
actually called in this CL as far as I can see. You could call it from
AcceleratorManager::UnregisterAll if you want - then this would make sense.
Personally, I'd just remove it as well - I don't think we are going to save much
by adding it.

[thanhph, 2016/12/24 18:52:16]

Done, thanks! I've removed it for now because it seems, as you mention, no
function calls it. Hope the bots don't complain.

+      std::vector<ui::Accelerator>& accelerators) override;
+
  private:
   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
@@ skipping 24 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_;
+
   // 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_