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 52%
rename from services/ui/common/event_matcher_util.h
rename to services/ui/common/accelerator_util.h
index 6a6a07c06ac0e960f63ed6a402fba0f77cf9c78f..beaf2b50d69f73ec6553df7b243da88ee63183f1 100644
--- a/services/ui/common/event_matcher_util.h
+++ b/services/ui/common/accelerator_util.h
@@ -2,13 +2,26 @@
 // 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"
 
+namespace ash {

[mfomitchev, 2016/11/29 17:37:26]

This file is in ui/common, so this shouldn't be in ash::mus namespace, just put
it into ui namespace like CreateKeyMatcher. They are very close semantically -
that's why we are putting them into the same file.

[thanhph, 2016/11/29 19:06:41]

Done, thanks!

+namespace mus {
+
+// Construct accelerator from the provided |id| and |event_matcher| and add it
+// to an empty |accelerators| vector.
+std::vector<ui::mojom::AcceleratorTransportPtr> AddAcceleratorHelper(
+    uint32_t id,
+    ui::mojom::EventMatcherPtr event_matcher);
+
+}  // namespace mus
+}  // namespace ash
+
 namespace ui {
 
 // |flags| is a bitfield of kEventFlag* and kMouseEventFlag* values in
@@ -18,4 +31,4 @@ mojom::EventMatcherPtr CreateKeyMatcher(ui::mojom::KeyboardCode code,
 
 }  // namespace ui
 
-#endif  // SERVICES_UI_COMMON_EVENT_MATCHER_UTIL_H_
+#endif  // SERVICES_UI_COMMON_ACCELERATOR_TRANSPORT_UTIL_H_

[mfomitchev, 2016/11/29 18:23:15]

update comment