Skip to content

GitLab

T
tangled
Commit 6f245b1e authored by mlcui's avatar mlcui Committed by Commit Bot
Browse files
Options

Shortcut viewer: Determine string to use based on shortcut 

Most shortcuts in the shortcut viewer use one of four strings,
representing a single key with 0-3 modifiers. This is currently
hard-coded with the shortcuts. This CL refactors that to automatically
determine the correct string based on the number of modifiers,
eliminating the need to specify the shortcut string for most shortcuts.

This refactor is intended to make way for having a runtime-determined
number of modifiers for a given shortcut, as #new-shortcut-mapping
changes shortcuts involving Shift - for those shortcuts, we need to
display the shifted key instead of Shift + unshifted key.

Bug: 1139080
Change-Id: I8bb2c71a31fb1eb546aee88d6690990afd6c2f92
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2494205
Commit-Queue: Michael Cui <mlcui@google.com>
Reviewed-by: default avatarTao Wu <wutao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820643}
parent 8f56e062
Show whitespace changes
Inline Side-by-side
Showing with 166 additions and 136 deletions
ash/shortcut_viewer/keyboard_shortcut_item.cc
View file @ 6f245b1e
......@@ -18,7 +18,7 @@ bool AcceleratorId::operator<(const AcceleratorId& other) const {
KeyboardShortcutItem::KeyboardShortcutItem(
const std::vector<ShortcutCategory>& categories,
int description_message_id,
int shortcut_message_id,
base::Optional<int> shortcut_message_id,
const std::vector<AcceleratorId>& accelerator_ids,
const std::vector<ui::KeyboardCode>& shortcut_key_codes)
: categories(categories),
......
ash/shortcut_viewer/keyboard_shortcut_item.h
View file @ 6f245b1e
......@@ -9,6 +9,7 @@
#include "ash/shortcut_viewer/ksv_export.h"
#include "base/macros.h"
#include "base/optional.h"
#include "ui/events/keycodes/keyboard_codes.h"
namespace keyboard_shortcut_viewer {
......@@ -56,7 +57,7 @@ struct KSV_EXPORT KeyboardShortcutItem {
KeyboardShortcutItem(
const std::vector<ShortcutCategory>& categories,
int description_message_id,
int shortcut_message_id,
base::Optional<int> shortcut_message_id,
const std::vector<AcceleratorId>& accelerator_ids = {},
const std::vector<ui::KeyboardCode>& shortcut_key_codes = {});
explicit KeyboardShortcutItem(const KeyboardShortcutItem& other);
......@@ -70,7 +71,9 @@ struct KSV_EXPORT KeyboardShortcutItem {
// Id of the message template resource used to list the keys making up the
// shortcut.
int shortcut_message_id;
// If missing, automatically determine the ID based on the number of
// `shortcut_key_codes`.
base::Optional<int> shortcut_message_id;
// Multiple accelerators can be mapped to the same KeyboardShortcutItem.
// |shortcut_key_codes| could be auto-generated from |accelerator_ids| to
......
ash/shortcut_viewer/keyboard_shortcut_viewer_metadata.cc
View file @ 6f245b1e
......@@ -213,35 +213,35 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_TOGGLE_DOCKED_MAGNIFIER,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_D, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_TOGGLE_FULLSCREEN_MAGNIFIER,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_M, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPopular},
IDS_KSV_DESCRIPTION_LOCK_SCREEN,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_L, ui::EF_COMMAND_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_DISPLAY_ZOOM_OUT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_DISPLAY_ZOOM_IN,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN}}},
......@@ -286,42 +286,42 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_FOCUS_SHELF,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_BOOKMARK_ALL_TABS,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_D, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_BOOKMARK_THIS_TAB,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_D, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_IDC_CLOSE_TAB,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_W, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_IDC_CLOSE_WINDOW,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_IDC_CONTENT_CONTEXT_SELECTALL,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -330,21 +330,21 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_DEV_TOOLS,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_I, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_DEV_TOOLS_CONSOLE,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_J, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_FIND,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_F, ui::EF_CONTROL_DOWN}}},
......@@ -370,7 +370,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPageAndBrowser, ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_IDC_FOCUS_BOOKMARKS,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN}}},
......@@ -396,63 +396,63 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_IDC_FOCUS_TOOLBAR,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_KEYBOARD_BRIGHTNESS_DOWN,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_BRIGHTNESS_DOWN, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_KEYBOARD_BRIGHTNESS_UP,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_BRIGHTNESS_UP, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_LAUNCH_LAST_APP,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_9, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_NEW_TAB,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_T, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_NEW_WINDOW,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_N, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_IDC_NEW_INCOGNITO_WINDOW,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_N, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_IDC_OPEN_FILE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_O, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_PRINT,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_P, ui::EF_CONTROL_DOWN}}},
......@@ -469,77 +469,77 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_RELOAD_BYPASSING_CACHE,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_R, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_IDC_RESTORE_TAB,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_T, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_BACK,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_LEFT, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_FORWARD,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_RIGHT, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_SAVE_PAGE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_S, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_IDC_SELECT_LAST_TAB,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_9, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPopular},
IDS_KSV_DESCRIPTION_IDC_SELECT_NEXT_TAB,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_TAB, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPopular},
IDS_KSV_DESCRIPTION_IDC_SELECT_PREVIOUS_TAB,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_TAB, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_SHOW_BOOKMARK_BAR,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_B, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_SHOW_HISTORY,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_H, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_CLOSE_FIND_OR_STOP,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -548,160 +548,160 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_VIEW_SOURCE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_U, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_ZOOM_MINUS,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_ZOOM_NORMAL,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_0, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_ZOOM_PLUS,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay, ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_SWITCH_TO_NEXT_IME,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_SPACE, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_OPEN_FILE_MANAGER,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay, ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_SWITCH_TO_LAST_USED_IME,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_SPACE, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_ROTATE_SCREEN,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_BROWSER_REFRESH, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_SCALE_UI_RESET,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_0, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_SWITCH_TO_NEXT_USER,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_PERIOD, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_SWITCH_TO_PREVIOUS_USER,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_COMMA, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kPopular},
IDS_KSV_DESCRIPTION_TAKE_PARTIAL_SCREENSHOT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPopular},
IDS_KSV_DESCRIPTION_TAKE_SCREENSHOT,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_TOGGLE_CAPS_LOCK,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_LWIN, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_TOGGLE_HIGH_CONTRAST,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_H, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_CARET_BROWSING_TOGGLE,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_7, ui::EF_COMMAND_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_TOGGLE_MESSAGE_CENTER_BUBBLE,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kPopular},
IDS_KSV_DESCRIPTION_TOGGLE_OVERVIEW,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_NONE}}},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_TOGGLE_SPOKEN_FEEDBACK,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_Z, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_TOGGLE_SYSTEM_TRAY_BUBBLE,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_S, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_WINDOW_CYCLE_SNAP_LEFT,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_4, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_WINDOW_CYCLE_SNAP_RIGHT,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_6, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_CLIPBOARD_HISTORY,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -709,7 +709,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_COPY,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -718,7 +718,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_PASTE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -736,7 +736,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPopular},
IDS_KSV_DESCRIPTION_KEYBOARD_SHORTCUT_HELPER,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN}}},
......@@ -786,7 +786,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_PAGE_UP,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -795,7 +795,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_PAGE_DOWN,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -804,7 +804,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_SCROLL_DOWN_PAGE,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -813,7 +813,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_GO_TO_TOP,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -823,7 +823,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_GO_TO_BOTTOM,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -849,7 +849,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_AUTO_COMPLETE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -858,7 +858,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_OPEN_DOWNLOADS_PAGE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_J, ui::EF_CONTROL_DOWN}}},
......@@ -874,7 +874,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_DISPLAY_HIDDEN_FILES,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -911,7 +911,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_SELECT_NEXT_WORD,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -921,7 +921,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_SELECT_TEXT_TO_END_OF_LINE,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -931,7 +931,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_SELECT_TEXT_TO_BEGINNING,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -941,7 +941,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_SELECT_PREVIOUS_WORD,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -951,7 +951,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_MOVE_TO_END_OF_WORD,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -960,7 +960,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_MOVE_TO_START_OF_PREVIOUS_WORD,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -969,7 +969,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_GO_TO_END_OF_DOCUMENT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -979,7 +979,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_GO_TO_END_OF_LINE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -988,7 +988,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_GO_TO_BEGINNING_OF_DOCUMENT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -998,7 +998,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_GO_TO_BEGINNING_OF_LINE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -1007,7 +1007,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_PASTE_CONTENT_AS_TEXT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -1017,7 +1017,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_CUT,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -1026,7 +1026,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_DELETE_PREVIOUS_WORD,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -1035,7 +1035,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_DELETE_NEXT_WORD,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -1044,7 +1044,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_UNDO,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -1053,7 +1053,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_REDO,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -1105,7 +1105,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_OPEN_RIGHT_CLICK_MENU_FOR_HIGHLIGHTED_ITEM,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{},
// |shortcut_key_codes|
......@@ -1115,154 +1115,154 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_TOGGLE_MIRROR_MODE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_SWAP_PRIMARY_DISPLAY,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_BRIGHTNESS_DOWN,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_BRIGHTNESS_DOWN, ui::EF_NONE}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_BRIGHTNESS_UP,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_BRIGHTNESS_UP, ui::EF_NONE}}},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_MAGNIFY_SCREEN_ZOOM_OUT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_BRIGHTNESS_DOWN, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_MAGNIFY_SCREEN_ZOOM_IN,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_BRIGHTNESS_UP, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_VOLUME_MUTE,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_VOLUME_MUTE, ui::EF_NONE}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_VOLUME_DOWN,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_VOLUME_DOWN, ui::EF_NONE}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_VOLUME_UP,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_VOLUME_UP, ui::EF_NONE}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_SHOW_TASK_MANAGER,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_ESCAPE, ui::EF_COMMAND_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_TOGGLE_FULLSCREEN,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_MEDIA_LAUNCH_APP2, ui::EF_NONE}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_WINDOW_MINIMIZE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_MINUS, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_FOCUS_NEXT_PANE,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_BROWSER_BACK, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_FOCUS_PREVIOUS_PANE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_BROWSER_BACK, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_MOVE_ACTIVE_WINDOW_BETWEEN_DISPLAYS,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_M, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_TOGGLE_APP_LIST,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_LWIN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_TOGGLE_APP_LIST_FULLSCREEN,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_LWIN, ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_TAKE_WINDOW_SCREENSHOT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_MEDIA_LAUNCH_APP1, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_SUSPEND,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_L, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_OPEN_GET_HELP,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_2, ui::EF_CONTROL_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_OPEN_FEEDBACK_PAGE,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_I, ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_ROTATE_WINDOW,
IDS_KSV_SHORTCUT_THREE_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_BROWSER_REFRESH,
ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN}}},
......@@ -1270,123 +1270,123 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_SHOW_STYLUS_TOOLS,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_P, ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_TOGGLE_MAXIMIZED,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_PLUS, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_OPEN_CROSH,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_EXIT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_Q, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_UNPIN,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_SHOW_IME_MENU_BUBBLE,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_K, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_DESKS_NEW_DESK,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_DESKS_REMOVE_CURRENT_DESK,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_MINUS, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_DESKS_ACTIVATE_LEFT_DESK,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_4, ui::EF_COMMAND_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_DESKS_ACTIVATE_RIGHT_DESK,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_6, ui::EF_COMMAND_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_DESKS_MOVE_ACTIVE_ITEM_LEFT_DESK,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_4, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_DESKS_MOVE_ACTIVE_ITEM_RIGHT_DESK,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_OEM_6, ui::EF_SHIFT_DOWN | ui::EF_COMMAND_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_SHOW_IDC_FOCUS_MENU_BAR,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_F10}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_SHOW_IDC_HOME,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_HOME, ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_SHOW_IDC_CLEAR_BROWSING_DATA,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_BACK, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_SHOW_IDC_SHOW_BOOKMARK_MANAGER,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_O, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_DEV_TOOLS_INSPECT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_C, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN}}},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_A, ui::EF_ALT_DOWN | ui::EF_SHIFT_DOWN}}},
......@@ -1402,7 +1402,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kPopular},
IDS_KSV_DESCRIPTION_OPEN_GOOGLE_ASSISTANT,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_A, ui::EF_COMMAND_DOWN}}},
......@@ -1429,7 +1429,7 @@ const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_PRIVACY_SCREEN_TOGGLE,
IDS_KSV_SHORTCUT_ONE_KEY,
{},
// |accelerator_ids|
{{ui::VKEY_PRIVACY_SCREEN_TOGGLE, ui::EF_NONE}}},
});
......
ash/shortcut_viewer/views/keyboard_shortcut_item_view.cc
View file @ 6f245b1e
......@@ -14,6 +14,7 @@
#include "ash/shortcut_viewer/views/bubble_view.h"
#include "base/i18n/rtl.h"
#include "base/no_destructor.h"
#include "base/notreached.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/accessibility/ax_node_data.h"
#include "ui/base/l10n/l10n_util.h"
......@@ -100,18 +101,44 @@ KeyboardShortcutItemView::KeyboardShortcutItemView(
: accessible_name);
}
int shortcut_message_id;
if (item.shortcut_message_id) {
shortcut_message_id = *item.shortcut_message_id;
} else {
// Automatically determine the shortcut message based on the number of
// shortcut_key_codes.
// As there are separators inserted between the modifiers, a shortcut with
// N modifiers has 2*N + 1 shortcut_key_codes.
switch (item.shortcut_key_codes.size()) {
case 1:
shortcut_message_id = IDS_KSV_SHORTCUT_ONE_KEY;
break;
case 3:
shortcut_message_id = IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY;
break;
case 5:
shortcut_message_id = IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY;
break;
case 7:
shortcut_message_id = IDS_KSV_SHORTCUT_THREE_MODIFIERS_ONE_KEY;
break;
default:
NOTREACHED() << "Automatically determined shortcut has "
<< item.shortcut_key_codes.size() << " key codes.";
}
}
base::string16 shortcut_string;
base::string16 accessible_string;
if (replacement_strings.empty()) {
shortcut_string = l10n_util::GetStringUTF16(has_invalid_dom_key
? IDS_KSV_KEY_NO_MAPPING
: item.shortcut_message_id);
shortcut_string = l10n_util::GetStringUTF16(
has_invalid_dom_key ? IDS_KSV_KEY_NO_MAPPING : shortcut_message_id);
accessible_string = shortcut_string;
} else {
shortcut_string = l10n_util::GetStringFUTF16(item.shortcut_message_id,
shortcut_string = l10n_util::GetStringFUTF16(shortcut_message_id,
replacement_strings, &offsets);
accessible_string = l10n_util::GetStringFUTF16(
item.shortcut_message_id, accessible_names, /*offsets=*/nullptr);
shortcut_message_id, accessible_names, /*offsets=*/nullptr);
}
shortcut_label_view_ = AddChildView(std::make_unique<views::StyledLabel>());
shortcut_label_view_->SetText(shortcut_string);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment