WindowManagerClient::AddAccelerator() should take an array

services/ui/ws/event_dispatcher.cc

 // 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.
 
 #include "services/ui/ws/event_dispatcher.h"
 
 #include <algorithm>
 
 #include "base/time/time.h"
 #include "services/ui/ws/accelerator.h"
@@ skipping 226 matching lines @@
     gfx::Point location = mouse_pointer_last_location_;
     mouse_cursor_source_window_ = FindDeepestVisibleWindowForEvents(&location);
 
     mouse_cursor_in_non_client_area_ =
         mouse_cursor_source_window_
             ? IsLocationInNonclientArea(mouse_cursor_source_window_, location)
             : false;
   }
 }
 
-bool EventDispatcher::AddAccelerator(uint32_t id,
-                                     mojom::EventMatcherPtr event_matcher) {
-  std::unique_ptr<Accelerator> accelerator(new Accelerator(id, *event_matcher));
-  // If an accelerator with the same id or matcher already exists, then abort.

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

Update the comment, but don't remove it please

-  for (const auto& pair : accelerators_) {
-    if (pair.first == id || accelerator->EqualEventMatcher(pair.second.get()))
-      return false;
+bool EventDispatcher::AddAccelerator(
+    mojo::Array<ui::mojom::AcceleratorEventPtr> multi_accelerators) {
+  for (auto iter = multi_accelerators.begin(); iter != multi_accelerators.end();
+       ++iter) {
+    std::unique_ptr<Accelerator> accelerator(
+        new Accelerator(iter->get()->id, *(iter->get()->event_matcher)));
+
+    bool does_accelerator_exist = false;

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

accelerator_exists

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

Done.

+    for (const auto& pair : accelerators_)

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

You need braces for multi-line body

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

Done, thanks!

+      if (pair.first == iter->get()->id ||
+          accelerator->EqualEventMatcher(pair.second.get())) {
+        does_accelerator_exist = true;
+        break;
+      }
+
+    if (!does_accelerator_exist) {
+      accelerators_.insert(Entry(iter->get()->id, std::move(accelerator)));
+      return true;

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

This is a bit too early to return - you've just inserted one accelerator, you
need to iterate through all of them.

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

Done, thanks!

+    }
   }
-  accelerators_.insert(Entry(id, std::move(accelerator)));
-  return true;
+  return false;
 }
 
 void EventDispatcher::RemoveAccelerator(uint32_t id) {
   auto it = accelerators_.find(id);
   // Clients may pass bogus ids.
   if (it != accelerators_.end())
     accelerators_.erase(it);
 }
 
 void EventDispatcher::ProcessEvent(const ui::Event& event,
@@ skipping 349 matching lines @@
   if (mouse_cursor_source_window_ == window)
     mouse_cursor_source_window_ = nullptr;
 }
 
 void EventDispatcher::OnDragCursorUpdated() {
   delegate_->UpdateNativeCursorFromDispatcher();
 }
 
 }  // namespace ws
 }  // namespace ui