Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2388)

Unified Diff: ash/accelerators/accelerator_table.h

Issue 1414483011: Deprecate Shift+Alt to switch IME and use Ctrl+Shift+Space instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: ensure no line breaks in the middle of shortcuts texts Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/accelerators/accelerator_table.h
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index 658cad5457071c633c9df7ca71ae23a633a28111..2b7bfeb6155709d8fb8650b384537735f596dea2 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.
@@ -165,6 +165,12 @@ struct DeprecatedAcceleratorData {
// them about the deprecation.
int notification_message_id;
+ // The ID of the localized old deprecated shortcut key.
+ int old_shortcut_id;
+
+ // The ID of the localized new shortcut key.
+ int new_shortcut_id;
+
// Specifies whether the deprecated accelerator is still enabled to do its
// associated action.
bool deprecated_enabled;
@@ -183,10 +189,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

Powered by Google App Engine
This is Rietveld 408576698