WindowManagerClient::AddAccelerator() should take an array

services/ui/public/cpp/window_manager_delegate.h

Index: services/ui/public/cpp/window_manager_delegate.h
diff --git a/services/ui/public/cpp/window_manager_delegate.h b/services/ui/public/cpp/window_manager_delegate.h
index 2f724fc877fe9646be6ea52adc7f75ce30ea7b8d..a98fd24ac645c4d1702c114d1188db5c74200b9d 100644
--- a/services/ui/public/cpp/window_manager_delegate.h
+++ b/services/ui/public/cpp/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/11/29 01:55:46]

We don't need this anymore

[thanhph, 2016/11/29 16:50:17]

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/events/mojo/event.mojom.h"
@@ -46,9 +47,9 @@ class WindowManagerClient {
   virtual void SetNonClientCursor(Window* window,
                                   mojom::Cursor non_client_cursor) = 0;
 
-  virtual void AddAccelerator(uint32_t id,
-                              mojom::EventMatcherPtr event_matcher,
-                              const base::Callback<void(bool)>& callback) = 0;
+  virtual void AddAccelerators(
+      std::vector<mojom::AcceleratorTransportPtr> 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;