Make mash register initial batch of accelerators in single shot.

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/memory/ptr_util.h"
 #include "base/time/time.h"
@@ skipping 234 matching lines @@
     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));
+  bool is_duplicate;

[mfomitchev, 2017/01/26 16:03:36]

Nit: Move the declarations below the comment.

[thanhph1, 2017/01/26 19:33:38]

Done.

+  std::string error_message;
+
   // 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()))
+    if (pair.first == id) {
+      error_message = "duplicate accelerator id.";

[mfomitchev, 2017/01/26 16:03:36]

Nit: Capitalize the first letter. Same for below error_msg.

[thanhph1, 2017/01/26 19:33:38]

Done.

+      is_duplicate = true;
+    } else if (accelerator->EqualEventMatcher(pair.second.get())) {
+      error_message = "duplicate accelerator matcher.";
+      is_duplicate = true;
+    }
+    if (is_duplicate) {
+      DVLOG(1) << error_message << " accelerator id=" << accelerator->id()

[mfomitchev, 2017/01/26 16:03:36]

Maybe use LOG(ERROR) instead of DVLOG(1) - we probably don't expect this to
happen, and it is useful to have this in the log without running chrome with a
special set of flags.

[thanhph1, 2017/01/26 19:33:38]

Done.

+               << " type=" << event_matcher->type_matcher->type
+               << " flags=" << event_matcher->flags_matcher->flags;
       return false;
+    }
   }
   accelerators_.insert(Entry(id, std::move(accelerator)));
   return true;
 }
 
 void EventDispatcher::RemoveAccelerator(uint32_t id) {
   auto it = accelerators_.find(id);
   // Clients may pass bogus ids.
   if (it != accelerators_.end())
     accelerators_.erase(it);
@@ skipping 369 matching lines @@
   if (mouse_cursor_source_window_ == window)
     mouse_cursor_source_window_ = nullptr;
 }
 
 void EventDispatcher::OnDragCursorUpdated() {
   delegate_->UpdateNativeCursorFromDispatcher();
 }
 
 }  // namespace ws
 }  // namespace ui