WindowManagerClient::AddAccelerator() should take an array

services/ui/ws/event_dispatcher.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_WS_EVENT_DISPATCHER_H_
 #define SERVICES_UI_WS_EVENT_DISPATCHER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
 #include "services/ui/common/types.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/ws/drag_cursor_updater.h"
 #include "services/ui/ws/modal_window_controller.h"
 #include "services/ui/ws/server_window_observer.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 namespace ui {
 class Event;
 class KeyEvent;
 class LocatedEvent;
 
@@ skipping 91 matching lines @@
 
   // Possibly updates the cursor. If we aren't in an implicit capture, we take
   // the last known location of the mouse pointer, and look for the
   // ServerWindow* under it.
   void UpdateCursorProviderByLastKnownLocation();
 
   // Adds an accelerator with the given id and event-matcher. If an accelerator
   // already exists with the same id or the same matcher, then the accelerator
   // is not added. Returns whether adding the accelerator was successful or not.
   bool AddAccelerator(uint32_t id, mojom::EventMatcherPtr event_matcher);
+
+  // Adds the supplied accelerators and ignores any accelerators already
+  // defined with the same id or matcher. Returns true if all accelerators were
+  // added successfully.
+  // This function should only be used from WindowTreeClient.
+  bool AddAccelerators(std::vector<ui::mojom::AcceleratorPtr> accelerators);

[sky, 2016/12/02 17:25:42]

Sorry if I wasn't clear. I'm suggesting you do *not* add this function. Instead
WindowTreeClient iterates over the array calling AddAccelerator.

[thanhph, 2016/12/02 21:21:43]

Thanks for the explantion Scott. I removed function AddAccelerators out of
event_dispatcher.(cc|h) in the new cl. window_tree.cc still has
WindowTree::AddAccelerators function while window_tree_client.cc has
WindowTreeClient::AddAccelerators. I also leave out the unittest
EventDispatcherTest.AddMultipleAccelerators for now since the function
EventDispatcher::AddAccelerators no long exists, maybe it can be moved to the
next bug 632050. Let me know if this change works. Thanks!

+
   void RemoveAccelerator(uint32_t id);
 
   // Processes the supplied event, informing the delegate as approriate. This
   // may result in generating any number of events. If |match_phase| is
   // ANY and there is a matching accelerator with PRE_TARGET found, than only
   // OnAccelerator() is called. The expectation is after the PRE_TARGET has been
   // handled this is again called with an AcceleratorMatchPhase of POST_ONLY.
   void ProcessEvent(const ui::Event& event, AcceleratorMatchPhase match_phase);
 
  private:
@@ skipping 132 matching lines @@
       AcceleratorMatchPhase::ANY;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(EventDispatcher);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_EVENT_DISPATCHER_H_