Deprecating high-conflict accelerators

ash/accelerators/accelerator_controller.h

Index: ash/accelerators/accelerator_controller.h
diff --git a/ash/accelerators/accelerator_controller.h b/ash/accelerators/accelerator_controller.h
index de9608ecb4acd4a8e1616f4e66596bc14003b0d1..a6c0a152d2096d2e274034b8a0288eeb8cc07f89 100644
--- a/ash/accelerators/accelerator_controller.h
+++ b/ash/accelerators/accelerator_controller.h
@@ -88,6 +88,10 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
   // is always handled and will never be passed to an window/web contents.
   bool IsReserved(const ui::Accelerator& accelerator) const;
 
+  // Returns true if the |accelerator| is deprecated. Deprecated accelerators
+  // can be consumed by web contents if needed.
+  bool IsDeprecated(const ui::Accelerator& accelerator) const;
+
   // Performs the specified action if it is enabled. Returns whether the action
   // was performed successfully.
   bool PerformActionIfEnabled(AcceleratorAction action);
@@ -133,6 +137,9 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
   void RegisterAccelerators(const AcceleratorData accelerators[],
                             size_t accelerators_length);
 
+  // Registers the deprecated accelerators and their replacing new ones.
+  void RegisterDeprecatedAccelerators();
+
   // Returns whether |action| can be performed. The |accelerator| may provide
   // additional data the action needs.
   bool CanPerformAction(AcceleratorAction action,
@@ -176,6 +183,10 @@ class ASH_EXPORT AcceleratorController : public ui::AcceleratorTarget {
   // the implementation.
   std::map<ui::Accelerator, AcceleratorAction> accelerators_;
 
+  std::map<AcceleratorAction, const DeprecatedAcceleratorData*>
+      actions_with_deprecations_;
+  std::set<ui::Accelerator> deprecated_accelerators_;
+
   // Actions allowed when the user is not signed in.
   std::set<int> actions_allowed_at_login_screen_;
   // Actions allowed when the screen is locked.