In aura mus, WindowManagerClient::AddAccelerator() should take an array.

ui/aura/mus/window_manager_delegate.h

Index: ui/aura/mus/window_manager_delegate.h
diff --git a/ui/aura/mus/window_manager_delegate.h b/ui/aura/mus/window_manager_delegate.h
index 4d1353974717514b37be5c4137ac106a42744260..bb6f8a2c7ef51d0452b80661d41105991dc0552f 100644
--- a/ui/aura/mus/window_manager_delegate.h
+++ b/ui/aura/mus/window_manager_delegate.h
@@ -15,6 +15,7 @@
 #include "base/callback_forward.h"
 #include "services/ui/public/interfaces/cursor.mojom.h"
 #include "services/ui/public/interfaces/event_matcher.mojom.h"

[mfomitchev, 2016/12/05 20:08:32]

no longer needed I think?

[thanhph, 2016/12/05 20:19:45]

Done, thanks!

+#include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/public/interfaces/window_manager_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree_constants.mojom.h"
 #include "ui/aura/aura_export.h"
@@ -48,9 +49,9 @@ class AURA_EXPORT WindowManagerClient {
   virtual void SetNonClientCursor(Window* window,
                                   ui::mojom::Cursor non_client_cursor) = 0;
 
-  virtual void AddAccelerator(uint32_t id,
-                              ui::mojom::EventMatcherPtr event_matcher,
-                              const base::Callback<void(bool)>& callback) = 0;
+  virtual void AddAccelerators(
+      std::vector<ui::mojom::AcceleratorPtr> accelerators,
+      const base::Callback<void(bool)>& callback) = 0;
   virtual void RemoveAccelerator(uint32_t id) = 0;
   virtual void AddActivationParent(Window* window) = 0;
   virtual void RemoveActivationParent(Window* window) = 0;