| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/accelerators/accelerator_table.h" | 5 #include "ash/accelerators/accelerator_table.h" |
| 6 | 6 |
| 7 #include "ash/strings/grit/ash_strings.h" | 7 #include "ash/strings/grit/ash_strings.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 {true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, | 62 {true, ui::VKEY_OEM_2, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, |
| 63 OPEN_GET_HELP}, | 63 OPEN_GET_HELP}, |
| 64 {true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH}, | 64 {true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH}, |
| 65 {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 65 {true, ui::VKEY_I, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 66 TOUCH_HUD_MODE_CHANGE}, | 66 TOUCH_HUD_MODE_CHANGE}, |
| 67 {true, ui::VKEY_I, | 67 {true, ui::VKEY_I, |
| 68 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, | 68 ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN, |
| 69 TOUCH_HUD_CLEAR}, | 69 TOUCH_HUD_CLEAR}, |
| 70 {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 70 {true, ui::VKEY_P, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 71 TOUCH_HUD_PROJECTION_TOGGLE}, | 71 TOUCH_HUD_PROJECTION_TOGGLE}, |
| 72 {true, ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | 72 {true, ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN, |
| 73 TOGGLE_HIGH_CONTRAST}, | 73 TOGGLE_HIGH_CONTRAST}, |
| 74 {true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 74 {true, ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 75 TOGGLE_SPOKEN_FEEDBACK}, | 75 TOGGLE_SPOKEN_FEEDBACK}, |
| 76 {true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 76 {true, ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 77 SWITCH_TO_PREVIOUS_USER}, | 77 SWITCH_TO_PREVIOUS_USER}, |
| 78 {true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, | 78 {true, ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, |
| 79 SWITCH_TO_NEXT_USER}, | 79 SWITCH_TO_NEXT_USER}, |
| 80 // Single shift release turns off caps lock. | 80 // Single shift release turns off caps lock. |
| 81 {false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, | 81 {false, ui::VKEY_LSHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, |
| 82 {false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, | 82 {false, ui::VKEY_SHIFT, ui::EF_NONE, DISABLE_CAPS_LOCK}, |
| (...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 196 // - {true or false} whether the deprecated accelerator is still enabled (we | 196 // - {true or false} whether the deprecated accelerator is still enabled (we |
| 197 // don't disable a deprecated accelerator abruptly). | 197 // don't disable a deprecated accelerator abruptly). |
| 198 // 5- Don't forget to update the keyboard overlay. Find 'shortcut' in the file | 198 // 5- Don't forget to update the keyboard overlay. Find 'shortcut' in the file |
| 199 // keyboard_overlay_data.js. | 199 // keyboard_overlay_data.js. |
| 200 const AcceleratorData kDeprecatedAccelerators[] = { | 200 const AcceleratorData kDeprecatedAccelerators[] = { |
| 201 {true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN}, | 201 {true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN}, |
| 202 {true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER}, | 202 {true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER}, |
| 203 | 203 |
| 204 // Deprecated in M59. | 204 // Deprecated in M59. |
| 205 {true, ui::VKEY_K, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, | 205 {true, ui::VKEY_K, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN, |
| 206 SHOW_IME_MENU_BUBBLE}}; | 206 SHOW_IME_MENU_BUBBLE}, |
| 207 |
| 208 // Deprecated in M61. |
| 209 {true, ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, |
| 210 TOGGLE_HIGH_CONTRAST}}; |
| 207 | 211 |
| 208 const size_t kDeprecatedAcceleratorsLength = arraysize(kDeprecatedAccelerators); | 212 const size_t kDeprecatedAcceleratorsLength = arraysize(kDeprecatedAccelerators); |
| 209 | 213 |
| 210 const DeprecatedAcceleratorData kDeprecatedAcceleratorsData[] = { | 214 const DeprecatedAcceleratorData kDeprecatedAcceleratorsData[] = { |
| 211 { | 215 { |
| 212 LOCK_SCREEN, "Ash.Accelerators.Deprecated.LockScreen", | 216 LOCK_SCREEN, "Ash.Accelerators.Deprecated.LockScreen", |
| 213 IDS_DEPRECATED_LOCK_SCREEN_MSG, IDS_SHORTCUT_LOCK_SCREEN_OLD, | 217 IDS_DEPRECATED_LOCK_SCREEN_MSG, IDS_SHORTCUT_LOCK_SCREEN_OLD, |
| 214 IDS_SHORTCUT_LOCK_SCREEN_NEW, | 218 IDS_SHORTCUT_LOCK_SCREEN_NEW, |
| 215 false // Old accelerator was disabled in M56. | 219 false // Old accelerator was disabled in M56. |
| 216 }, | 220 }, |
| 217 {SHOW_TASK_MANAGER, "Ash.Accelerators.Deprecated.ShowTaskManager", | 221 {SHOW_TASK_MANAGER, "Ash.Accelerators.Deprecated.ShowTaskManager", |
| 218 IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG, IDS_SHORTCUT_TASK_MANAGER_OLD, | 222 IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG, IDS_SHORTCUT_TASK_MANAGER_OLD, |
| 219 IDS_SHORTCUT_TASK_MANAGER_NEW, true}, | 223 IDS_SHORTCUT_TASK_MANAGER_NEW, true}, |
| 220 {SHOW_IME_MENU_BUBBLE, "Ash.Accelerators.Deprecated.ShowImeMenuBubble", | 224 {SHOW_IME_MENU_BUBBLE, "Ash.Accelerators.Deprecated.ShowImeMenuBubble", |
| 221 IDS_DEPRECATED_SHOW_IME_BUBBLE_MSG, IDS_SHORTCUT_IME_BUBBLE_OLD, | 225 IDS_DEPRECATED_SHOW_IME_BUBBLE_MSG, IDS_SHORTCUT_IME_BUBBLE_OLD, |
| 222 IDS_SHORTCUT_IME_BUBBLE_NEW, true}}; | 226 IDS_SHORTCUT_IME_BUBBLE_NEW, true}, |
| 227 { |
| 228 TOGGLE_HIGH_CONTRAST, "Ash.Accelerators.Deprecated.ToggleHighContrast", |
| 229 IDS_DEPRECATED_TOGGLE_HIGH_CONTRAST_MSG, |
| 230 IDS_SHORTCUT_TOGGLE_HIGH_CONTRAST_OLD, |
| 231 IDS_SHORTCUT_TOGGLE_HIGH_CONTRAST_NEW, |
| 232 false // Old accelerator was disabled immediately upon deprecation. |
| 233 }}; |
| 223 | 234 |
| 224 const size_t kDeprecatedAcceleratorsDataLength = | 235 const size_t kDeprecatedAcceleratorsDataLength = |
| 225 arraysize(kDeprecatedAcceleratorsData); | 236 arraysize(kDeprecatedAcceleratorsData); |
| 226 | 237 |
| 227 const AcceleratorData kDebugAcceleratorData[] = { | 238 const AcceleratorData kDebugAcceleratorData[] = { |
| 228 {true, ui::VKEY_N, kDebugModifier, TOGGLE_WIFI}, | 239 {true, ui::VKEY_N, kDebugModifier, TOGGLE_WIFI}, |
| 229 {true, ui::VKEY_O, kDebugModifier, DEBUG_SHOW_TOAST}, | 240 {true, ui::VKEY_O, kDebugModifier, DEBUG_SHOW_TOAST}, |
| 230 {true, ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | 241 {true, ui::VKEY_P, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, |
| 231 DEBUG_TOGGLE_TOUCH_PAD}, | 242 DEBUG_TOGGLE_TOUCH_PAD}, |
| 232 {true, ui::VKEY_T, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, | 243 {true, ui::VKEY_T, ui::EF_COMMAND_DOWN | ui::EF_SHIFT_DOWN, |
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 506 TOGGLE_SPOKEN_FEEDBACK, | 517 TOGGLE_SPOKEN_FEEDBACK, |
| 507 TOGGLE_WIFI, | 518 TOGGLE_WIFI, |
| 508 VOLUME_DOWN, | 519 VOLUME_DOWN, |
| 509 VOLUME_MUTE, | 520 VOLUME_MUTE, |
| 510 VOLUME_UP, | 521 VOLUME_UP, |
| 511 }; | 522 }; |
| 512 | 523 |
| 513 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); | 524 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); |
| 514 | 525 |
| 515 } // namespace ash | 526 } // namespace ash |
| OLD | NEW |