| Index: ash/accelerators/accelerator_table.h
|
| diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
|
| index 658cad5457071c633c9df7ca71ae23a633a28111..0d0e201eb271809cdc1dff0cc5fa50c532be2d70 100644
|
| --- a/ash/accelerators/accelerator_table.h
|
| +++ b/ash/accelerators/accelerator_table.h
|
| @@ -154,8 +154,8 @@ struct AcceleratorData {
|
|
|
| // Gathers the needed data to handle deprecated accelerators.
|
| struct DeprecatedAcceleratorData {
|
| - // The old deprecated accelerator.
|
| - AcceleratorData deprecated_accelerator;
|
| + // The action that has deprecated accelerators.
|
| + AcceleratorAction action;
|
|
|
| // The name of the UMA histogram that will be used to measure the deprecated
|
| // v.s. new accelerator usage.
|
| @@ -183,10 +183,14 @@ 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[];
|
| +// The list of the deprecated accelerators.
|
| +ASH_EXPORT extern const AcceleratorData kDeprecatedAccelerators[];
|
| ASH_EXPORT extern const size_t kDeprecatedAcceleratorsLength;
|
| +
|
| +// The list of the actions with deprecated accelerators and the needed data to
|
| +// handle them.
|
| +ASH_EXPORT extern const DeprecatedAcceleratorData kDeprecatedAcceleratorsData[];
|
| +ASH_EXPORT extern const size_t kDeprecatedAcceleratorsDataLength;
|
| #endif // defined(OS_CHROMEOS)
|
|
|
| // Debug accelerators. Debug accelerators are only enabled when the "Debugging
|
|
|