WindowManagerClient::AddAccelerator() should take an array

ash/mus/accelerators/accelerator_controller_registrar.cc

 // 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.
 
 #include "ash/mus/accelerators/accelerator_controller_registrar.h"
 
 #include <limits>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/accelerator_router.h"
 #include "ash/common/wm_shell.h"
 #include "ash/mus/accelerators/accelerator_ids.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/window_manager.h"
 #include "base/logging.h"
-#include "services/ui/common/event_matcher_util.h"
+#include "services/ui/common/accelerator_util.h"
 #include "services/ui/public/cpp/window_manager_delegate.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "ui/base/accelerators/accelerator_history.h"
 
 namespace ash {
 namespace mus {
 namespace {
 
 // Callback from registering the accelerator.
 void OnAcceleratorAdded(const ui::Accelerator& accelerator, bool added) {
@@ skipping 92 matching lines @@
   DCHECK(accelerator.type() == ui::ET_KEY_PRESSED ||
          accelerator.type() == ui::ET_KEY_RELEASED);
   event_matcher->type_matcher->type = accelerator.type() == ui::ET_KEY_PRESSED
                                           ? ui::mojom::EventType::KEY_PRESSED
                                           : ui::mojom::EventType::KEY_RELEASED;
 
   ui::mojom::EventMatcherPtr post_event_matcher = event_matcher.Clone();
   post_event_matcher->accelerator_phase =
       ui::mojom::AcceleratorPhase::POST_TARGET;
 
-  window_manager_->window_manager_client()->AddAccelerator(
-      ComputeAcceleratorId(id_namespace_, ids.pre_id), std::move(event_matcher),
+  window_manager_->window_manager_client()->AddAccelerators(

[sky, 2016/12/01 22:17:04]

Is this only the first change you're intending to do? As the way you have it now
you only call add with a single vector, so that in effect this change makes the
call have more overhead.

[thanhph, 2016/12/01 23:32:41]

To change this I need to change the callback function OnAcceleratorAdded to
handle multiple accelerators. I can create another bug which is to reduce
overhead of registering accelerators. This seems relate to this one I'm working
on next https://bugs.chromium.org/p/chromium/issues/detail?id=632050.

[sky, 2016/12/02 00:11:16]

I don't think that would help as registration adds accelerators one at a time.
Instead I think you need a function to be called on
AcceleratorControllerRegistrar after AcceleratorController::Init has been
called. Something like OnAcceleratorsRegistered(). This function would then
iterate over the internal structure and make the request to register the
accelerators as a single array.

You should do this separately. I just wanted to make sure you were going to make
use of the function that takes an array.

[thanhph, 2016/12/02 15:11:18]

Thanks Scott, I'll keep this in mind. Should I put this comment thread also in
this bug https://bugs.chromium.org/p/chromium/issues/detail?id=632050 ? 

For what I understand, bug 63250 is to resolve what you mention here.
Alternatively, we can merge these 2 bugs into bug 63249 and I can proceed with
the refactor. Thanks!
 

+      ui::CreateAcceleratorVector(
+          ComputeAcceleratorId(id_namespace_, ids.pre_id),
+          std::move(event_matcher)),
       base::Bind(OnAcceleratorAdded, accelerator));
-  window_manager_->window_manager_client()->AddAccelerator(
-      ComputeAcceleratorId(id_namespace_, ids.post_id),
-      std::move(post_event_matcher),
+
+  window_manager_->window_manager_client()->AddAccelerators(
+      ui::CreateAcceleratorVector(
+          ComputeAcceleratorId(id_namespace_, ids.post_id),
+          std::move(post_event_matcher)),
       base::Bind(OnAcceleratorAdded, accelerator));
 }
 
 void AcceleratorControllerRegistrar::OnAcceleratorUnregistered(
     const ui::Accelerator& accelerator) {
   auto iter = accelerator_to_ids_.find(accelerator);
   DCHECK(iter != accelerator_to_ids_.end());
   Ids ids = iter->second;
   accelerator_to_ids_.erase(iter);
   ids_.erase(ids.pre_id);
@@ skipping 18 matching lines @@
   // Common case is we never wrap once, so this is typically cheap. Additionally
   // we expect there not to be too many accelerators.
   while (ids_.count(next_id_) > 0)
     ++next_id_;
   ids_.insert(next_id_);
   return next_id_++;
 }
 
 }  // namespace mus
 }  // namespace ash