Chromium Code Reviews| 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/common/accelerators/accelerator_table.h" | 5 #include "ash/common/accelerators/accelerator_table.h" |
| 6 | 6 |
| 7 #include "ash/common/strings/grit/ash_strings.h" | 7 #include "ash/common/strings/grit/ash_strings.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 | 9 |
| 10 namespace ash { | 10 namespace ash { |
| (...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 195 // - The IDs of the localized old and new shortcut text to be used to fill | 195 // - The IDs of the localized old and new shortcut text to be used to fill |
| 196 // the notification text. Also found in |ash_chromeos_strings.grdp|. | 196 // the notification text. Also found in |ash_chromeos_strings.grdp|. |
| 197 // - {true or false} whether the deprecated accelerator is still enabled (we | 197 // - {true or false} whether the deprecated accelerator is still enabled (we |
| 198 // don't disable a deprecated accelerator abruptly). | 198 // don't disable a deprecated accelerator abruptly). |
| 199 // 5- Don't forget to update the keyboard overlay. Find 'shortcut' in the file | 199 // 5- Don't forget to update the keyboard overlay. Find 'shortcut' in the file |
| 200 // keyboard_overlay_data.js. | 200 // keyboard_overlay_data.js. |
| 201 #if defined(OS_CHROMEOS) | 201 #if defined(OS_CHROMEOS) |
| 202 | 202 |
| 203 const AcceleratorData kDeprecatedAccelerators[] = { | 203 const AcceleratorData kDeprecatedAccelerators[] = { |
| 204 {true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN}, | 204 {true, ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, LOCK_SCREEN}, |
| 205 {true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER}, | 205 {true, ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN, SHOW_TASK_MANAGER}}; |
| 206 {false, ui::VKEY_LMENU, ui::EF_SHIFT_DOWN, NEXT_IME}, | |
| 207 {false, ui::VKEY_MENU, ui::EF_SHIFT_DOWN, NEXT_IME}, | |
| 208 {false, ui::VKEY_RMENU, ui::EF_SHIFT_DOWN, NEXT_IME}, | |
| 209 {false, ui::VKEY_LSHIFT, ui::EF_ALT_DOWN, NEXT_IME}, | |
| 210 {false, ui::VKEY_SHIFT, ui::EF_ALT_DOWN, NEXT_IME}, | |
| 211 {false, ui::VKEY_RSHIFT, ui::EF_ALT_DOWN, NEXT_IME}, | |
| 212 }; | |
| 213 | 206 |
| 214 const size_t kDeprecatedAcceleratorsLength = arraysize(kDeprecatedAccelerators); | 207 const size_t kDeprecatedAcceleratorsLength = arraysize(kDeprecatedAccelerators); |
| 215 | 208 |
| 216 const DeprecatedAcceleratorData kDeprecatedAcceleratorsData[] = { | 209 const DeprecatedAcceleratorData kDeprecatedAcceleratorsData[] = { |
| 217 { | 210 { |
| 218 LOCK_SCREEN, "Ash.Accelerators.Deprecated.LockScreen", | 211 LOCK_SCREEN, "Ash.Accelerators.Deprecated.LockScreen", |
| 219 IDS_DEPRECATED_LOCK_SCREEN_MSG, IDS_SHORTCUT_LOCK_SCREEN_OLD, | 212 IDS_DEPRECATED_LOCK_SCREEN_MSG, IDS_SHORTCUT_LOCK_SCREEN_OLD, |
| 220 IDS_SHORTCUT_LOCK_SCREEN_NEW, | 213 IDS_SHORTCUT_LOCK_SCREEN_NEW, |
| 221 false // Old accelerator was disabled in M56. | 214 false // Old accelerator was disabled in M56. |
| 222 }, | 215 }, |
| 223 {SHOW_TASK_MANAGER, "Ash.Accelerators.Deprecated.ShowTaskManager", | 216 {SHOW_TASK_MANAGER, "Ash.Accelerators.Deprecated.ShowTaskManager", |
| 224 IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG, IDS_SHORTCUT_TASK_MANAGER_OLD, | 217 IDS_DEPRECATED_SHOW_TASK_MANAGER_MSG, IDS_SHORTCUT_TASK_MANAGER_OLD, |
| 225 IDS_SHORTCUT_TASK_MANAGER_NEW, true}, | 218 IDS_SHORTCUT_TASK_MANAGER_NEW, true}}; |
| 226 { | |
| 227 NEXT_IME, "Ash.Accelerators.Deprecated.NextIME", | |
|
James Cook
2017/01/26 22:24:52
Does this need to be marked obsolete in histograms
afakhry
2017/01/27 03:35:06
Done.
| |
| 228 IDS_DEPRECATED_NEXT_IME_MSG, IDS_SHORTCUT_NEXT_IME_OLD, | |
| 229 IDS_SHORTCUT_NEXT_IME_NEW, | |
| 230 false // Old accelerator has been disabled. | |
| 231 }}; | |
| 232 | 219 |
| 233 const size_t kDeprecatedAcceleratorsDataLength = | 220 const size_t kDeprecatedAcceleratorsDataLength = |
| 234 arraysize(kDeprecatedAcceleratorsData); | 221 arraysize(kDeprecatedAcceleratorsData); |
| 235 | 222 |
| 236 #endif // defined(OS_CHROMEOS) | 223 #endif // defined(OS_CHROMEOS) |
| 237 | 224 |
| 238 const AcceleratorData kDebugAcceleratorData[] = { | 225 const AcceleratorData kDebugAcceleratorData[] = { |
| 239 #if defined(OS_CHROMEOS) | 226 #if defined(OS_CHROMEOS) |
| 240 {true, ui::VKEY_N, kDebugModifier, TOGGLE_WIFI}, | 227 {true, ui::VKEY_N, kDebugModifier, TOGGLE_WIFI}, |
| 241 {true, ui::VKEY_O, kDebugModifier, DEBUG_SHOW_TOAST}, | 228 {true, ui::VKEY_O, kDebugModifier, DEBUG_SHOW_TOAST}, |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 540 TOGGLE_WIFI, | 527 TOGGLE_WIFI, |
| 541 VOLUME_DOWN, | 528 VOLUME_DOWN, |
| 542 VOLUME_MUTE, | 529 VOLUME_MUTE, |
| 543 VOLUME_UP, | 530 VOLUME_UP, |
| 544 #endif // defined(OS_CHROMEOS) | 531 #endif // defined(OS_CHROMEOS) |
| 545 }; | 532 }; |
| 546 | 533 |
| 547 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); | 534 const size_t kActionsKeepingMenuOpenLength = arraysize(kActionsKeepingMenuOpen); |
| 548 | 535 |
| 549 } // namespace ash | 536 } // namespace ash |
| OLD | NEW |