Changes accelerators registered by mus to not interfere with those of client

ash/mus/accelerators/accelerator_controller_registrar.cc

 // Copyright 2016 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 "ash/mus/accelerators/accelerator_controller_registrar.h"
 
 #include <limits>
 
 #include "ash/common/accelerators/accelerator_controller.h"
 #include "ash/common/accelerators/accelerator_router.h"
 #include "ash/common/wm_shell.h"
 #include "ash/mus/accelerators/accelerator_ids.h"
 #include "ash/mus/bridge/wm_window_mus.h"
 #include "ash/mus/window_manager.h"
 #include "base/logging.h"
 #include "services/ui/common/event_matcher_util.h"
 #include "services/ui/public/cpp/window_manager_delegate.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "ui/base/accelerators/accelerator_history.h"
 
 namespace ash {
 namespace mus {
 namespace {
 
-// Callback from registering the accelerator. All our accelerators should be
-// registered, so we expect |added| to be true.
-void OnAcceleratorAdded(bool added) {
-  DCHECK(added);
+// Callback from registering the accelerator.
+void OnAcceleratorAdded(const ui::Accelerator& accelerator, bool added) {
+  // All our accelerators should be registered, so we expect |added| to be true.
+  DCHECK(added) << "duplicate accelerator key_code=" << accelerator.key_code()
+                << " type=" << accelerator.type()
+                << " modifiers=" << accelerator.modifiers();
 }
 
 }  // namespace
 
 AcceleratorControllerRegistrar::AcceleratorControllerRegistrar(
     WindowManager* window_manager,
     uint16_t id_namespace)
     : window_manager_(window_manager),
       id_namespace_(id_namespace),
       next_id_(0),
@@ skipping 80 matching lines @@
   event_matcher->type_matcher->type = accelerator.type() == ui::ET_KEY_PRESSED
                                           ? ui::mojom::EventType::KEY_PRESSED
                                           : ui::mojom::EventType::KEY_RELEASED;
 
   ui::mojom::EventMatcherPtr post_event_matcher = event_matcher.Clone();
   post_event_matcher->accelerator_phase =
       ui::mojom::AcceleratorPhase::POST_TARGET;
 
   window_manager_->window_manager_client()->AddAccelerator(
       ComputeAcceleratorId(id_namespace_, ids.pre_id), std::move(event_matcher),
-      base::Bind(OnAcceleratorAdded));
+      base::Bind(OnAcceleratorAdded, accelerator));
   window_manager_->window_manager_client()->AddAccelerator(
       ComputeAcceleratorId(id_namespace_, ids.post_id),
-      std::move(post_event_matcher), base::Bind(OnAcceleratorAdded));
+      std::move(post_event_matcher),
+      base::Bind(OnAcceleratorAdded, accelerator));
 }
 
 void AcceleratorControllerRegistrar::OnAcceleratorUnregistered(
     const ui::Accelerator& accelerator) {
   auto iter = accelerator_to_ids_.find(accelerator);
   DCHECK(iter != accelerator_to_ids_.end());
   Ids ids = iter->second;
   accelerator_to_ids_.erase(iter);
   ids_.erase(ids.pre_id);
   ids_.erase(ids.post_id);
@@ skipping 17 matching lines @@
   // Common case is we never wrap once, so this is typically cheap. Additionally
   // we expect there not to be too many accelerators.
   while (ids_.count(next_id_) > 0)
     ++next_id_;
   ids_.insert(next_id_);
   return next_id_++;
 }
 
 }  // namespace mus
 }  // namespace ash