WindowManagerClient::AddAccelerator() should take an array

services/ui/common/accelerator_util.h

Index: services/ui/common/accelerator_util.h
diff --git a/services/ui/common/event_matcher_util.h b/services/ui/common/accelerator_util.h
similarity index 55%
rename from services/ui/common/event_matcher_util.h
rename to services/ui/common/accelerator_util.h
index 6a6a07c06ac0e960f63ed6a402fba0f77cf9c78f..fa7717abc48bf780749955c5e316d1eff022f4ea 100644
--- a/services/ui/common/event_matcher_util.h
+++ b/services/ui/common/accelerator_util.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_UI_COMMON_EVENT_MATCHER_UTIL_H_
-#define SERVICES_UI_COMMON_EVENT_MATCHER_UTIL_H_
+#ifndef SERVICES_UI_COMMON_ACCELERATOR_UTIL_H_
+#define SERVICES_UI_COMMON_ACCELERATOR_UTIL_H_
 
 #include "services/ui/public/interfaces/event_matcher.mojom.h"
+#include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/events/mojo/event_constants.mojom.h"
 #include "ui/events/mojo/keyboard_codes.mojom.h"
 
@@ -16,6 +17,12 @@ namespace ui {
 mojom::EventMatcherPtr CreateKeyMatcher(ui::mojom::KeyboardCode code,
                                         int flags);
 
+// Construct accelerator from the provided |id| and |event_matcher| and add it
+// to an empty |accelerators| vector.
+std::vector<ui::mojom::AcceleratorTransportPtr> AddAcceleratorHelper(

[mfomitchev, 2016/11/29 19:21:19]

Call this CreateAcceleratorVector() or something like that to convey the
semantics better.

[thanhph, 2016/11/29 20:40:48]

Done.

+    uint32_t id,
+    ui::mojom::EventMatcherPtr event_matcher);
+
 }  // namespace ui
 
-#endif  // SERVICES_UI_COMMON_EVENT_MATCHER_UTIL_H_
+#endif  // SERVICES_UI_COMMON_ACCELERATOR_TRANSPORT_UTIL_H_