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.
-  for (const auto& pair : accelerators_) {
-    if (pair.first == id || accelerator->EqualEventMatcher(pair.second.get()))
-      return false;
+bool EventDispatcher::AddAccelerators(
+    std::vector<ui::mojom::AcceleratorPtr> accelerators) {
+  bool all_new_accelerators = true;
+  for (auto iter = accelerators.begin(); iter != accelerators.end(); ++iter) {
+    std::unique_ptr<Accelerator> accelerator(
+        new Accelerator(iter->get()->id, *(iter->get()->event_matcher)));

[sky, 2016/12/01 22:17:04]

Use MakeUnique (see threads on chomium-dev).

[thanhph, 2016/12/01 23:32:41]

Done, thanks!

+
+    // If an accelerator with the same id or matcher already exists, skip it.
+    bool accelerator_exists = false;
+    for (const auto& pair : accelerators_) {
+      if (pair.first == iter->get()->id ||
+          accelerator->EqualEventMatcher(pair.second.get())) {
+        accelerator_exists = true;
+        break;
+      }
+    }
+    if (accelerator_exists)
+      all_new_accelerators = false;
+    else
+      accelerators_.insert(Entry(iter->get()->id, std::move(accelerator)));
   }
-  accelerators_.insert(Entry(id, std::move(accelerator)));
-  return true;
+  return all_new_accelerators;
 }
 
 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