WindowManagerClient::AddAccelerator() should take an array

services/ui/public/cpp/window_manager_delegate.h

 // Copyright 2015 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.
 
 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_MANAGER_DELEGATE_H_
 #define SERVICES_UI_PUBLIC_CPP_WINDOW_MANAGER_DELEGATE_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "services/ui/public/interfaces/cursor.mojom.h"
 #include "services/ui/public/interfaces/event_matcher.mojom.h"
+#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"
 
 namespace display {
 class Display;
 }
 
 namespace gfx {
 class Insets;
@@ skipping 11 matching lines @@
 
 // See the mojom with the same name for details on the functions in this
 // interface.
 class WindowManagerClient {
  public:
   virtual void SetFrameDecorationValues(
       mojom::FrameDecorationValuesPtr values) = 0;
   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 AddAccelerator(
+      mojo::Array<mojom::AcceleratorEventPtr> accelerator_event,

[mfomitchev, 2016/11/22 22:44:16]

nit: Use plural form to make it a bit more clear what the var stands for:
AddAccelerators, accelerator_events, etc.

[thanhph, 2016/11/24 16:10:12]

Done. I forgot to rename  this to multi_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;
   virtual void ActivateNextWindow() = 0;
   virtual void SetUnderlaySurfaceOffsetAndExtendedHitArea(
       Window* window,
       const gfx::Vector2d& offset,
       const gfx::Insets& hit_area) = 0;
 
  protected:
@@ skipping 60 matching lines @@
 
   virtual void OnWmCancelMoveLoop(Window* window) = 0;
 
  protected:
   virtual ~WindowManagerDelegate() {}
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_MANAGER_DELEGATE_H_