Revert "Deprecating high-conflict accelerators"

ash/accelerators/accelerator_table.h

 // Copyright (c) 2012 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.
 
 #ifndef ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
 #define ASH_ACCELERATORS_ACCELERATOR_TABLE_H_
 
 #include "ash/ash_export.h"
 #include "base/basictypes.h"
 #include "ui/events/event_constants.h"
@@ skipping 135 matching lines @@
 #endif
 };
 
 struct AcceleratorData {
   bool trigger_on_press;
   ui::KeyboardCode keycode;
   int modifiers;
   AcceleratorAction action;
 };
 
-// Gathers the needed data to handle deprecated accelerators.
-struct DeprecatedAcceleratorData {
-  // The old deprecated accelerator.
-  AcceleratorData deprecated_accelerator;
-
-  // The name of the UMA histogram that will be used to measure the deprecated
-  // v.s. new accelerator usage.
-  const char* uma_histogram_name;
-
-  // The ID of the localized notification message to show to users informing
-  // them about the deprecation.
-  int notification_message_id;
-
-  // Specifies whether the deprecated accelerator is still enabled to do its
-  // associated action.
-  bool deprecated_enabled;
-};
-
-// The ID of the MessageCenter notifications of deprecated accelerators.
-const char kDeprecatedAcceleratorNotificationId[] = "deprecated_accelerator";
-
-// This will be used for the UMA stats to measure the how many users are using
-// the old v.s. new accelerators.
-enum DeprecatedAcceleratorUsage {
-  DEPRECATED_USED = 0,     // The deprecated accelerator is used.
-  NEW_USED,                // The new accelerator is used.
-  DEPRECATED_USAGE_COUNT,  // Maximum value of this enum for histogram use.
-};
-
 // Accelerators handled by AcceleratorController.
 ASH_EXPORT extern const AcceleratorData kAcceleratorData[];
 ASH_EXPORT extern const size_t kAcceleratorDataLength;
 
-#if defined(OS_CHROMEOS)
-// The list of the deprecated accelerators along with their new replacing ones
-// and how to handle them.
-ASH_EXPORT extern const DeprecatedAcceleratorData kDeprecatedAccelerators[];
-ASH_EXPORT extern const size_t kDeprecatedAcceleratorsLength;
-#endif  // defined(OS_CHROMEOS)
-
 // Debug accelerators. Debug accelerators are only enabled when the "Debugging
 // keyboard shortcuts" flag (--ash-debug-shortcuts) is enabled. Debug actions
 // are always run (similar to reserved actions).
 ASH_EXPORT extern const AcceleratorData kDebugAcceleratorData[];
 ASH_EXPORT extern const size_t kDebugAcceleratorDataLength;
 
 // Actions that should be handled very early in Ash unless the current target
 // window is full-screen.
 ASH_EXPORT extern const AcceleratorAction kPreferredActions[];
 ASH_EXPORT extern const size_t kPreferredActionsLength;
@@ skipping 23 matching lines @@
 ASH_EXPORT extern const AcceleratorAction kActionsAllowedInAppMode[];
 ASH_EXPORT extern const size_t kActionsAllowedInAppModeLength;
 
 // Actions that require at least 1 window.
 ASH_EXPORT extern const AcceleratorAction kActionsNeedingWindow[];
 ASH_EXPORT extern const size_t kActionsNeedingWindowLength;
 
 }  // namespace ash
 
 #endif  // ASH_ACCELERATORS_ACCELERATOR_TABLE_H_