Skip to content

GitLab

T
tangled
Commit 5f7ab7ba authored by wutao's avatar wutao Committed by Commit Bot
Browse files
Options

cros: Add shortcuts metadata and strings. KSV - part 8. 

This cl adds all shortcuts metadata and strings for Keyboard Shortcut
Viewer (KSV).

Bug: 768932
Test: KeyboardShortcutViewerMetadataTest and Manually tested on device
Change-Id: I0dc85fa4bffb5a9a1f19b86e991faf7b13b75a93
Reviewed-on: https://chromium-review.googlesource.com/922389
Commit-Queue: Tao Wu <wutao@chromium.org>
Reviewed-by: default avatarRobert Flack <flackr@chromium.org>
Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537415}
parent 5e8d978c
Hide whitespace changes
Inline Side-by-side
Showing with 1447 additions and 43 deletions
tools/gritsettings/resource_ids
View file @ 5f7ab7ba
......@@ -338,53 +338,53 @@
"messages": [25920],
},
"ui/file_manager/file_manager_resources.grd": {
"includes": [26150],
"includes": [26650],
},
"ui/keyboard/keyboard_resources.grd": {
"includes": [26400],
"includes": [26900],
},
"ui/login/login_resources.grd": {
"includes": [26500],
"includes": [27000],
},
"ui/resources/ui_resources.grd": {
"structures": [26600],
"structures": [27100],
},
"ui/resources/ui_unscaled_resources.grd": {
"includes": [26850],
"includes": [27350],
},
"ui/strings/app_locale_settings.grd": {
"messages": [26900],
"messages": [27400],
},
"ui/strings/ui_strings.grd": {
"messages": [26950],
"messages": [27450],
},
"ui/views/resources/views_resources.grd": {
"structures": [27150],
"structures": [27650],
},
"ui/webui/resources/webui_resources.grd": {
"includes": [27450],
"structures": [27650],
"includes": [27950],
"structures": [28150],
},
# This file is generated during the build.
"<(SHARED_INTERMEDIATE_DIR)/devtools/devtools_resources.grd": {
"includes": [28450],
"includes": [28950],
},
"devtools_resources.grd": {
"includes": [28450],
"includes": [28950],
},
"cloud_print/virtual_driver/win/install/virtual_driver_setup_resources.grd": {
"includes": [28600],
"messages": [28650],
"includes": [29100],
"messages": [29150],
},
"third_party/libaddressinput/chromium/address_input_strings.grd": {
"messages": [28700],
"messages": [29200],
},
"mojo/public/js/mojo_bindings_resources.grd": {
"includes": [28800],
"includes": [29300],
},
# END "everything else" section.
# Everything but chrome/, components/, content/, and ios/
......
ui/chromeos/keyboard_shortcut_viewer_strings.grdp
View file @ 5f7ab7ba
<?xml version="1.0" encoding="utf-8"?>
<grit-part>
<!-- Accessibility -->
<message name="IDS_KSV_SEARCH_BOX_ACCESSIBILITY_NAME" desc="Accessibility name for the search box.">
Search for shortcuts
</message>
<message name="IDS_KSV_BACK_ACCESSIBILITY_NAME" desc="Accessibility name for the button that goes to the previous screen.">
Back
</message>
<message name="IDS_KSV_CLEAR_SEARCHBOX_ACCESSIBILITY_NAME" desc="Accessibility name for the button that clears all text from the search box.">
Clear searchbox text
</message>
<!-- Search box placeholder text -->
<message name="IDS_KSV_SEARCH_BOX_PLACEHOLDER" desc="Placeholder text for search box.">
Search for shortcuts
......@@ -18,7 +30,7 @@
Popular Shortcuts
</message>
<message name="IDS_KSV_CATEGORY_TAB_WINDOW" desc="Category of the keyboard shortcut.">
Tab And Windows
Tabs And Windows
</message>
<message name="IDS_KSV_CATEGORY_PAGE_BROWSER" desc="Category of the keyboard shortcut.">
Page and Web Browser
......@@ -50,34 +62,475 @@
Launcher
</message>
<!-- Keys with special meaning -->
<message name="IDS_KSV_KEY_SPACE" desc="Name of [Space] key.">
Space
</message>
<message name="IDS_KSV_KEY_OVERVIEW" desc="Name of the key on a Chromebook keyboard that triggers the overview mode.">
Overview mode key
</message>
<message name="IDS_KSV_KEY_FULLSCREEN" desc="Name of the key on a Chromebook keyboard that triggers the fullscreen.">
Fullscreen key
</message>
<!-- Generic shortcut strings -->
<message name="IDS_KSV_SHORTCUT_ONE_KEY" desc="Human readable version of the keyboard shortcut. This is for all single key shortcuts.">
<ph name="key">$1<ex>Overview Mode Key</ex></ph>
</message>
<message name="IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY" desc="Human readable version of the keyboard shortcut. This is for all single modifier shortcuts.">
<ph name="modifier">$1<ex>Ctrl</ex></ph><ph name="separator">$2<ex>+</ex></ph><ph name="key">$3<ex>V</ex></ph>
</message>
<message name="IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY" desc="Human readable version of the keyboard shortcut. This is for all two modifiers shortcuts.">
<ph name="modifier1">$1<ex>Ctrl</ex></ph><ph name="separator1">$2<ex>+</ex></ph><ph name="modifier2">$3<ex>Alt</ex></ph><ph name="separator2">$4<ex>+</ex></ph><ph name="key">$5<ex>V</ex></ph>
</message>
<!-- Shortcuts descriptions -->
<message name="IDS_KSV_DESCRIPTION_LOCK_SCREEN" desc="Description of the command in keyboard shortcut viewer.">
Lock your screen
Lock screen
</message>
<message name="IDS_KSV_DESCRIPTION_CHANGE_SCREEN_RESOLUTION" desc="Description of the command in keyboard shortcut viewer.">
Change screen resolution
</message>
<message name="IDS_KSV_SHORTCUT_CHANGE_SCREEN_RESOLUTION" desc="Human readable version of the keyboard shortcut.">
<ph name="ctrl">$1</ph><ph name="separator">$2</ph><ph name="shift">$3</ph> and + or -
<ph name="ctrl">$1</ph><ph name="separator1">$2</ph><ph name="shift">$3</ph><ph name="separator2">$4</ph><ph name="plus">$5</ph> or <ph name="minus">$6</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_DRAG_LINK_IN_SAME_TAB" desc="Description of the command in keyboard shortcut viewer.">
Open the link in the tab
</message>
<message name="IDS_KSV_SHORTCUT_DRAG_LINK_IN_SAME_TAB" desc="Human readable version of the keyboard shortcut.">
Drag the link to the tab's address bar
</message>
<message name="IDS_KSV_DESCRIPTION_HIGHLIGHT_NEXT_ITEM" desc="Description of the command in keyboard shortcut viewer.">
<message name="IDS_KSV_DESCRIPTION_HIGHLIGHT_NEXT_ITEM_ON_SHELF" desc="Description of the command in keyboard shortcut viewer.">
Highlight the next item on your shelf
</message>
<message name="IDS_KSV_SHORTCUT_HIGHLIGHT_NEXT_ITEM" desc="Human readable version of the keyboard shortcut.">
<message name="IDS_KSV_SHORTCUT_HIGHLIGHT_NEXT_ITEM_ON_SHELF" desc="Human readable version of the keyboard shortcut.">
<ph name="shift">$1</ph><ph name="separator1">$2</ph><ph name="alt">$3</ph><ph name="separator2">$4</ph><ph name="l">$5</ph>, then <ph name="tab">$6</ph> or <ph name="right">$7</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_PREVIOUS_IME" desc="Description of the command in keyboard shortcut viewer.">
Switch to the previous keyboard language you were using.
</message>
<message name="IDS_KSV_DESCRIPTION_CYCLE_FORWARD_MRU" desc="Description of the command in keyboard shortcut viewer.">
Switch quickly between windows
</message>
<message name="IDS_KSV_SHORTCUT_CYCLE_FORWARD_MRU" desc="Human readable version of the keyboard shortcut.">
Press and hold <ph name="alt">$1</ph>, tap <ph name="tab">$2</ph> until you get to the window you want to open, then release.
</message>
<message name="IDS_KSV_DESCRIPTION_CYCLE_BACKWARD_MRU" desc="Description of the command in keyboard shortcut viewer.">
Open the window you used least recently
</message>
<message name="IDS_KSV_SHORTCUT_CYCLE_BACKWARD_MRU" desc="Human readable version of the keyboard shortcut.">
Press and hold <ph name="alt">$1</ph><ph name="separator">$2</ph><ph name="shift">$3</ph>, tap <ph name="tab">$4</ph> until you get to the window you want to open, then release.
</message>
<message name="IDS_KSV_DESCRIPTION_TOGGLE_OVERVIEW" desc="Description of the command in keyboard shortcut viewer.">
Overview Mode
</message>
<message name="IDS_KSV_DESCRIPTION_KEYBOARD_BRIGHTNESS_DOWN" desc="Description of the command in keyboard shortcut viewer.">
Dim keyboard (for backlit keyboards only)
</message>
<message name="IDS_KSV_DESCRIPTION_KEYBOARD_BRIGHTNESS_UP" desc="Description of the command in keyboard shortcut viewer.">
Make keyboard brighter (for backlit keyboards only)
</message>
<message name="IDS_KSV_DESCRIPTION_TAKE_SCREENSHOT" desc="Description of the command in keyboard shortcut viewer.">
Take screenshot
</message>
<message name="IDS_KSV_DESCRIPTION_TAKE_PARTIAL_SCREENSHOT" desc="Description of the command in keyboard shortcut viewer.">
Take partial screenshot
</message>
<message name="IDS_KSV_DESCRIPTION_OPEN_FILE_MANAGER" desc="Description of the command in keyboard shortcut viewer.">
Open the Files app
</message>
<message name="IDS_KSV_DESCRIPTION_TOGGLE_HIGH_CONTRAST" desc="Description of the command in keyboard shortcut viewer.">
Turn on high contrast mode
</message>
<message name="IDS_KSV_DESCRIPTION_TOGGLE_SPOKEN_FEEDBACK" desc="Description of the command in keyboard shortcut viewer.">
Turn ChromeVox (spoken feedback) on or off
</message>
<message name="IDS_KSV_DESCRIPTION_SWITCH_TO_PREVIOUS_USER" desc="Description of the command in keyboard shortcut viewer.">
Switch to the previous user
</message>
<message name="IDS_KSV_DESCRIPTION_SWITCH_TO_NEXT_USER" desc="Description of the command in keyboard shortcut viewer.">
Switch to the next user
</message>
<message name="IDS_KSV_DESCRIPTION_TOGGLE_CAPS_LOCK" desc="Description of the command in keyboard shortcut viewer.">
Turn Caps Lock on and off
</message>
<message name="IDS_KSV_DESCRIPTION_NEXT_IME" desc="Description of the command in keyboard shortcut viewer.">
Switch between the keyboard languages you've set. Learn how to choose your keyboard language.
</message>
<message name="IDS_KSV_DESCRIPTION_NEW_WINDOW" desc="Description of the command in keyboard shortcut viewer.">
Open new window
</message>
<message name="IDS_KSV_DESCRIPTION_NEW_TAB" desc="Description of the command in keyboard shortcut viewer.">
Open new tab
</message>
<message name="IDS_KSV_DESCRIPTION_SCALE_UI_RESET" desc="Description of the command in keyboard shortcut viewer.">
Reset screen resolution to default
</message>
<message name="IDS_KSV_DESCRIPTION_ROTATE_SCREEN" desc="Description of the command in keyboard shortcut viewer.">
Rotate screen 90 degrees
</message>
<message name="IDS_KSV_DESCRIPTION_FOCUS_SHELF" desc="Description of the command in keyboard shortcut viewer.">
Highlight the launcher button on your shelf
</message>
<message name="IDS_KSV_DESCRIPTION_TOGGLE_MESSAGE_CENTER_BUBBLE" desc="Description of the command in keyboard shortcut viewer.">
See your notifications
</message>
<message name="IDS_KSV_DESCRIPTION_TOGGLE_SYSTEM_TRAY_BUBBLE" desc="Description of the command in keyboard shortcut viewer.">
Open the status area (where your account picture appears)
</message>
<message name="IDS_KSV_DESCRIPTION_LAUNCH_LAST_APP" desc="Description of the command in keyboard shortcut viewer.">
Click the last icon on your shelf
</message>
<message name="IDS_KSV_DESCRIPTION_WINDOW_CYCLE_SNAP_LEFT" desc="Description of the command in keyboard shortcut viewer.">
Dock a window on the left
</message>
<message name="IDS_KSV_DESCRIPTION_WINDOW_CYCLE_SNAP_RIGHT" desc="Description of the command in keyboard shortcut viewer.">
Dock a window on the right
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_BOOKMARK_PAGE" desc="Description of the command in keyboard shortcut viewer.">
Save your current webpage as a bookmark
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_BOOKMARK_ALL_TABS" desc="Description of the command in keyboard shortcut viewer.">
Save all open pages in your current window as bookmarks in a new folder
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_CLOSE_TAB" desc="Description of the command in keyboard shortcut viewer.">
Close the current tab
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_CLOSE_WINDOW" desc="Description of the command in keyboard shortcut viewer.">
Close the current window
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_FIND" desc="Description of the command in keyboard shortcut viewer.">
Search the current page
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_FIND_NEXT" desc="Description of the command in keyboard shortcut viewer.">
Go to the next match for your search
</message>
<message name="IDS_KSV_SHORTCUT_IDC_FIND_NEXT" desc="Human readable version of the keyboard shortcut.">
<ph name="ctrl">$1</ph><ph name="separator">$2</ph><ph name="g">$3</ph> or <ph name="enter">$4</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_FIND_PREVIOUS" desc="Description of the command in keyboard shortcut viewer.">
Go to the previous match for your search
</message>
<message name="IDS_KSV_SHORTCUT_IDC_FIND_PREVIOUS" desc="Human readable version of the keyboard shortcut.">
<ph name="ctrl">$1</ph><ph name="separator1">$2</ph><ph name="shift1">$3</ph><ph name="separator2">$4</ph><ph name="g">$5</ph> or <ph name="shift2">$6</ph><ph name="separator3">$7</ph><ph name="enter">$8</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_FOCUS_LOCATION" desc="Description of the command in keyboard shortcut viewer.">
Focus address bar
</message>
<message name="IDS_KSV_SHORTCUT_IDC_FOCUS_LOCATION" desc="Description of the command in keyboard shortcut viewer.">
<ph name="ctrl">$1</ph><ph name="separator1">$2</ph><ph name="l">$3</ph> or <ph name="alt">$4</ph><ph name="separator2">$5</ph><ph name="d">$6</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_OPEN_FILE" desc="Description of the command in keyboard shortcut viewer.">
Open a file in the browser
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_PRINT" desc="Description of the command in keyboard shortcut viewer.">
Print your current page
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_RELOAD" desc="Description of the command in keyboard shortcut viewer.">
Reload your current page
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_RELOAD_BYPASSING_CACHE" desc="Description of the command in keyboard shortcut viewer.">
Reload your current page without using cached content
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_SAVE_PAGE" desc="Description of the command in keyboard shortcut viewer.">
Save your current page
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_SELECT_LAST_TAB" desc="Description of the command in keyboard shortcut viewer.">
Go to the last tab in the window
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_SELECT_NEXT_TAB" desc="Description of the command in keyboard shortcut viewer.">
Go to next tab
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_SELECT_PREVIOUS_TAB" desc="Description of the command in keyboard shortcut viewer.">
Go to previous tab
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_SHOW_BOOKMARK_BAR" desc="Description of the command in keyboard shortcut viewer.">
Show or hide the bookmarks bar
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_STOP" desc="Description of the command in keyboard shortcut viewer.">
Stop the loading of your current page
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_ZOOM_MINUS" desc="Description of the command in keyboard shortcut viewer.">
Zoom out on the page
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_ZOOM_NORMAL" desc="Description of the command in keyboard shortcut viewer.">
Reset zoom level
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_ZOOM_PLUS" desc="Description of the command in keyboard shortcut viewer.">
Zoom in on the page
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_NEW_INCOGNITO_WINDOW" desc="Description of the command in keyboard shortcut viewer.">
Open a new window in incognito mode
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_RESTORE_TAB" desc="Description of the command in keyboard shortcut viewer.">
Reopen the last tab or window you closed
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_DEV_TOOLS" desc="Description of the command in keyboard shortcut viewer.">
Show or hide the Developer Tools panel
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_DEV_TOOLS_CONSOLE" desc="Description of the command in keyboard shortcut viewer.">
Show or hide the DOM Inspector
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_FOCUS_BOOKMARKS" desc="Description of the command in keyboard shortcut viewer.">
Highlight the bookmarks bar (if shown)
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_FOCUS_SEARCH" desc="Description of the command in keyboard shortcut viewer.">
Focus address bar on search
</message>
<message name="IDS_KSV_SHORTCUT_IDC_FOCUS_SEARCH" desc="Description of the command in keyboard shortcut viewer.">
<ph name="ctrl">$1</ph><ph name="separator">$2</ph><ph name="k">$3</ph> or <ph name="e">$4</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_FOCUS_TOOLBAR" desc="Description of the command in keyboard shortcut viewer.">
Highlight the row with the address bar
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_SHOW_HISTORY" desc="Description of the command in keyboard shortcut viewer.">
Open the History page
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_VIEW_SOURCE" desc="Description of the command in keyboard shortcut viewer.">
View page source
</message>
<message name="IDS_KSV_DESCRIPTION_IDC_CONTENT_CONTEXT_SELECTALL" desc="Description of the command in keyboard shortcut viewer.">
Select everything on the page
</message>
<message name="IDS_KSV_DESCRIPTION_COPY" desc="Description of the command in keyboard shortcut viewer.">
Copy selected content to the clipboard
</message>
<message name="IDS_KSV_DESCRIPTION_PASTE" desc="Description of the command in keyboard shortcut viewer.">
Paste content from the clipboard
</message>
<message name="IDS_KSV_DESCRIPTION_SELECT_NUMBERED_TAB" desc="Description of the command in keyboard shortcut viewer.">
Go to numbered tab
</message>
<message name="IDS_KSV_SHORTCUT_SELECT_NUMBERED_TAB" desc="Human readable version of the keyboard shortcut.">
<ph name="ctrl">$1</ph><ph name="separator">$2</ph> 1 through 8
</message>
<message name="IDS_KSV_DESCRIPTION_KEYBOARD_SHORTCUT_HELPER" desc="Description of the command in keyboard shortcut viewer.">
See Keyboard Shortcut Helper
</message>
<message name="IDS_KSV_DESCRIPTION_OPEN_LINK_IN_TAB_BACKGROUND" desc="Description of the command in keyboard shortcut viewer.">
Open the link in a new tab in the background
</message>
<message name="IDS_KSV_SHORTCUT_OPEN_LINK_IN_TAB_BACKGROUND" desc="Human readable version of the keyboard shortcut.">
Press <ph name="ctrl">$1</ph> and click a link
</message>
<message name="IDS_KSV_DESCRIPTION_OPEN_LINK_IN_TAB" desc="Description of the command in keyboard shortcut viewer.">
Open the link in a new tab and switch to the new tab
</message>
<message name="IDS_KSV_SHORTCUT_OPEN_LINK_IN_TAB" desc="Human readable version of the keyboard shortcut.">
Press <ph name="ctrl">$1</ph><ph name="separator">$2</ph><ph name="shift">$3</ph> and click a link
</message>
<message name="IDS_KSV_DESCRIPTION_OPEN_LINK_IN_WINDOW" desc="Description of the command in keyboard shortcut viewer.">
Open the link in a new window
</message>
<message name="IDS_KSV_SHORTCUT_OPEN_LINK_IN_WINDOW" desc="Human readable version of the keyboard shortcut.">
Press <ph name="shift">$1</ph> and click a link
</message>
<message name="IDS_KSV_DESCRIPTION_DRAG_LINK_IN_NEW_TAB" desc="Description of the command in keyboard shortcut viewer.">
Open the link in a new tab
</message>
<message name="IDS_KSV_SHORTCUT_DRAG_LINK_IN_NEW_TAB" desc="Human readable version of the keyboard shortcut.">
Drag the link to a blank area on the tab strip
</message>
<message name="IDS_KSV_DESCRIPTION_OPEN_PAGE_IN_NEW_TAB" desc="Description of the command in keyboard shortcut viewer.">
Open the webpage in a new tab
</message>
<message name="IDS_KSV_SHORTCUT_OPEN_PAGE_IN_NEW_TAB" desc="Human readable version of the keyboard shortcut.">
Type a web address (URL) in the address bar, then press <ph name="alt">$1</ph><ph name="separator">$2</ph><ph name="enter">$3</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_STOP_DRAG_TAB" desc="Description of the command in keyboard shortcut viewer.">
Return the tab to its original position
</message>
<message name="IDS_KSV_SHORTCUT_STOP_DRAG_TAB" desc="Human readable version of the keyboard shortcut.">
While dragging the tab, press <ph name="esc">$1</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_PAGE_UP" desc="Description of the command in keyboard shortcut viewer.">
Page up
</message>
<message name="IDS_KSV_SHORTCUT_PAGE_UP" desc="Human readable version of the keyboard shortcut.">
<ph name="alt">$1</ph> or <ph name="search">$2</ph><ph name="separator">$3</ph><ph name="up">$4</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_PAGE_DOWN" desc="Description of the command in keyboard shortcut viewer.">
Page down
</message>
<message name="IDS_KSV_SHORTCUT_PAGE_DOWN" desc="Human readable version of the keyboard shortcut.">
<ph name="alt">$1</ph> or <ph name="search">$2</ph><ph name="separator">$3</ph><ph name="down">$4</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_SCROLL_DOWN_PAGE" desc="Description of the command in keyboard shortcut viewer.">
Scroll down the web page
</message>
<message name="IDS_KSV_DESCRIPTION_GO_TO_TOP" desc="Description of the command in keyboard shortcut viewer.">
Go to top of page
</message>
<message name="IDS_KSV_DESCRIPTION_GO_TO_BOTTOM" desc="Description of the command in keyboard shortcut viewer.">
Go to bottom of page
</message>
<message name="IDS_KSV_DESCRIPTION_RIGHT_CLICK" desc="Description of the command in keyboard shortcut viewer.">
Right-click a link
</message>
<message name="IDS_KSV_SHORTCUT_RIGHT_CLICK" desc="Human readable version of the keyboard shortcut.">
Press <ph name="alt">$1</ph> and click a link
</message>
<message name="IDS_KSV_DESCRIPTION_SAVE_LINK_AS_BOOKMARK" desc="Description of the command in keyboard shortcut viewer.">
Save the link as a bookmark
</message>
<message name="IDS_KSV_SHORTCUT_SAVE_LINK_AS_BOOKMARK" desc="Human readable version of the keyboard shortcut.">
Drag link to bookmarks bar
</message>
<message name="IDS_KSV_DESCRIPTION_AUTO_COMPLETE" desc="Description of the command in keyboard shortcut viewer.">
Add www. and .com to your input in the address bar, then open the page
</message>
<message name="IDS_KSV_DESCRIPTION_OPEN_DOWNLOADS_PAGE" desc="Description of the command in keyboard shortcut viewer.">
Open the Downloads page
</message>
<message name="IDS_KSV_DESCRIPTION_OPEN_FILE" desc="Description of the command in keyboard shortcut viewer.">
Preview a file in the Files app
</message>
<message name="IDS_KSV_SHORTCUT_OPEN_FILE" desc="Human readable version of the keyboard shortcut.">
Select the file, then press <ph name="space">$1</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_DISPLAY_HIDDEN_FILES" desc="Description of the command in keyboard shortcut viewer.">
Display hidden files in the Files app
</message>
<message name="IDS_KSV_DESCRIPTION_LAUNCH_NUMBERED_APP" desc="Description of the command in keyboard shortcut viewer.">
Click icons 1-8 on your shelf
</message>
<message name="IDS_KSV_SHORTCUT_LAUNCH_NUMBERED_APP" desc="Human readable version of the keyboard shortcut.">
<ph name="alt">$1</ph><ph name="separator">$2</ph> 1 through 8
</message>
<message name="IDS_KSV_DESCRIPTION_USE_F_KEYS" desc="Description of the command in keyboard shortcut viewer.">
Use F keys (F1 to F12)
</message>
<message name="IDS_KSV_SHORTCUT_USE_F_KEYS" desc="Human readable version of the keyboard shortcut.">
<ph name="search">$1</ph><ph name="separator">$2</ph> 1 through =
</message>
<message name="IDS_KSV_DESCRIPTION_SELECT_ADDRESS_BAR" desc="Description of the command in keyboard shortcut viewer.">
Select the content in the address bar
</message>
<message name="IDS_KSV_SHORTCUT_SELECT_ADDRESS_BAR" desc="Human readable version of the keyboard shortcut.">
<ph name="ctrl">$1</ph><ph name="separator1">$2</ph><ph name="l">$3</ph> or <ph name="alt">$4</ph><ph name="separator2">$5</ph><ph name="d">$6</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_SELECT_NEXT_WORD" desc="Description of the command in keyboard shortcut viewer.">
Select the next word or letter
</message>
<message name="IDS_KSV_DESCRIPTION_SELECT_TEXT_TO_END_OF_LINE" desc="Description of the command in keyboard shortcut viewer.">
Select text to the end of the line
</message>
<message name="IDS_KSV_DESCRIPTION_SELECT_TEXT_TO_BEGINNING" desc="Description of the command in keyboard shortcut viewer.">
Select text to the beginning of the line
</message>
<message name="IDS_KSV_DESCRIPTION_SELECT_PREVIOUS_WORD" desc="Description of the command in keyboard shortcut viewer.">
Select previous word or letter
</message>
<message name="IDS_KSV_DESCRIPTION_MOVE_TO_END_OF_WORD" desc="Description of the command in keyboard shortcut viewer.">
Move to the end of the next word
</message>
<message name="IDS_KSV_DESCRIPTION_MOVE_TO_START_OF_PREVIOUS_WORD" desc="Description of the command in keyboard shortcut viewer.">
Move to the start of the previous word
</message>
<message name="IDS_KSV_DESCRIPTION_GO_TO_END_OF_DOCUMENT" desc="Description of the command in keyboard shortcut viewer.">
Go to end of document
</message>
<message name="IDS_KSV_DESCRIPTION_GO_TO_BEGINNING_OF_DOCUMENT" desc="Description of the command in keyboard shortcut viewer.">
Go to beginning of document
</message>
<message name="IDS_KSV_DESCRIPTION_PASTE_CONTENT_AS_TEXT" desc="Description of the command in keyboard shortcut viewer.">
Paste content from the clipboard as plain text
</message>
<message name="IDS_KSV_DESCRIPTION_CUT" desc="Description of the command in keyboard shortcut viewer.">
Cut
</message>
<message name="IDS_KSV_DESCRIPTION_DELETE_PREVIOUS_WORD" desc="Description of the command in keyboard shortcut viewer.">
Delete the previous word
</message>
<message name="IDS_KSV_DESCRIPTION_DELETE_NEXT_WORD" desc="Description of the command in keyboard shortcut viewer.">
Delete the next letter (forward delete)
</message>
<message name="IDS_KSV_DESCRIPTION_UNDO" desc="Description of the command in keyboard shortcut viewer.">
Undo your last action
</message>
<message name="IDS_KSV_DESCRIPTION_REDO" desc="Description of the command in keyboard shortcut viewer.">
Redo your last action
</message>
<message name="IDS_KSV_DESCRIPTION_HIGHLIGHT_PREVIOUS_ITEM_ON_SHELF" desc="Description of the command in keyboard shortcut viewer.">
Highlight the previous item on your shelf
</message>
<message name="IDS_KSV_SHORTCUT_HIGHLIGHT_PREVIOUS_ITEM_ON_SHELF" desc="Human readable version of the keyboard shortcut.">
<ph name="shift1">$1</ph><ph name="separator1">$2</ph><ph name="alt">$3</ph><ph name="separator2">$4</ph><ph name="l">$5</ph>, then <ph name="shift2">$6</ph><ph name="separator3">$7</ph><ph name="tab">$8</ph> or <ph name="left">$9</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_OPEN_HIGHLIGHTED_ITEM_ON_SHELF" desc="Description of the command in keyboard shortcut viewer.">
Open the highlighted button on your shelf
</message>
<message name="IDS_KSV_SHORTCUT_OPEN_HIGHLIGHTED_ITEM_ON_SHELF" desc="Human readable version of the keyboard shortcut.">
<ph name="shift">$1</ph><ph name="separator1">$2</ph><ph name="alt">$3</ph><ph name="separator2">$4</ph><ph name="l">$5</ph>, then <ph name="space">$6</ph> or <ph name="enter">$7</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_REMOVE_HIGHLIGHT_ON_SHELF" desc="Description of the command in keyboard shortcut viewer.">
Remove the highlight from a button on your shelf
</message>
<message name="IDS_KSV_SHORTCUT_REMOVE_HIGHLIGHT_ON_SHELF" desc="Human readable version of the keyboard shortcut.">
<ph name="shift">$1</ph><ph name="separator1">$2</ph><ph name="alt">$3</ph><ph name="separator2">$4</ph><ph name="l">$5</ph>, then <ph name="esc">$6</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_SWITCH_FOCUS" desc="Description of the command in keyboard shortcut viewer.">
Switch focus between: Status area (where your account picture appears) Launcher Address bar Bookmarks bar (if visible) The webpage that's open Downloads bar (if visible)
</message>
<message name="IDS_KSV_SHORTCUT_SWITCH_FOCUS" desc="Human readable version of the keyboard shortcut.">
<ph name="ctrl1">$1</ph><ph name="separator1">$2</ph><ph name="left">$3</ph> or <ph name="ctrl2">$4</ph><ph name="separator2">$5</ph><ph name="right">$6</ph>
</message>
<message name="IDS_KSV_DESCRIPTION_OPEN_RIGHT_CLICK_MENU_FOR_HIGHLIGHTED_ITEM" desc="Description of the command in keyboard shortcut viewer.">
Open right-click menu for highlighted item
</message>
<message name="IDS_KSV_DESCRIPTION_TOGGLE_MIRROR_MODE" desc="Description of the command in keyboard shortcut viewer.">
Mirror monitors
</message>
<message name="IDS_KSV_DESCRIPTION_SWAP_PRIMARY_DISPLAY" desc="Description of the command in keyboard shortcut viewer.">
Swap primary monitor
</message>
<message name="IDS_KSV_DESCRIPTION_BRIGHTNESS_DOWN" desc="Description of the command in keyboard shortcut viewer.">
Turn brightness down
</message>
<message name="IDS_KSV_DESCRIPTION_BRIGHTNESS_UP" desc="Description of the command in keyboard shortcut viewer.">
Turn brightness up
</message>
<message name="IDS_KSV_DESCRIPTION_MAGNIFY_SCREEN_ZOOM_OUT" desc="Description of the command in keyboard shortcut viewer.">
Zoom Out
</message>
<message name="IDS_KSV_DESCRIPTION_MAGNIFY_SCREEN_ZOOM_IN" desc="Description of the command in keyboard shortcut viewer.">
Zoom In
</message>
<message name="IDS_KSV_DESCRIPTION_VOLUME_MUTE" desc="Description of the command in keyboard shortcut viewer.">
Mute vlume
</message>
<message name="IDS_KSV_DESCRIPTION_VOLUME_DOWN" desc="Description of the command in keyboard shortcut viewer.">
Volume down
</message>
<message name="IDS_KSV_DESCRIPTION_VOLUME_UP" desc="Description of the command in keyboard shortcut viewer.">
Volume up
</message>
<message name="IDS_KSV_DESCRIPTION_SHOW_TASK_MANAGER" desc="Description of the command in keyboard shortcut viewer.">
Bring up task manager
</message>
<message name="IDS_KSV_DESCRIPTION_TOGGLE_FULLSCREEN" desc="Description of the command in keyboard shortcut viewer.">
Toggle fullscreen
</message>
<message name="IDS_KSV_DESCRIPTION_WINDOW_MINIMIZE" desc="Description of the command in keyboard shortcut viewer.">
Minimize window
</message>
<message name="IDS_KSV_DESCRIPTION_FOCUS_NEXT_PANE" desc="Description of the command in keyboard shortcut viewer.">
Next pane
</message>
<message name="IDS_KSV_DESCRIPTION_FOCUS_PREVIOUS_PANE" desc="Description of the command in keyboard shortcut viewer.">
Previous pane
</message>
<message name="IDS_KSV_DESCRIPTION_MOVE_WINDOW_TO_ABOVE_DISPLAY" desc="Description of the command in keyboard shortcut viewer.">
Move window to external display above main display
</message>
<message name="IDS_KSV_DESCRIPTION_MOVE_WINDOW_TO_BELOW_DISPLAY" desc="Description of the command in keyboard shortcut viewer.">
Move window to external display below main display
</message>
<message name="IDS_KSV_DESCRIPTION_MOVE_WINDOW_TO_LEFT_DISPLAY" desc="Description of the command in keyboard shortcut viewer.">
Move window to external display to the left of main display
</message>
<message name="IDS_KSV_DESCRIPTION_MOVE_WINDOW_TO_RIGHT_DISPLAY" desc="Description of the command in keyboard shortcut viewer.">
Move window to external display to the right of main display
</message>
</grit-part>
ui/chromeos/ksv/keyboard_shortcut_viewer_metadata.cc
View file @ 5f7ab7ba
......@@ -11,6 +11,7 @@
#include "ui/base/l10n/l10n_util.h"
#include "ui/chromeos/events/keyboard_layout_util.h"
#include "ui/chromeos/ksv/keyboard_shortcut_item.h"
#include "ui/chromeos/ksv/vector_icons/vector_icons.h"
#include "ui/chromeos/strings/grit/ui_chromeos_strings.h"
#include "ui/events/event_constants.h"
#include "ui/events/keycodes/dom/dom_code.h"
......@@ -62,12 +63,22 @@ base::Optional<base::string16> GetSpecialStringForKeyboardCode(
msg_id = ui::DeviceUsesKeyboardLayout2() ? IDS_KSV_MODIFIER_LAUNCHER
: IDS_KSV_MODIFIER_SEARCH;
break;
case ui::VKEY_SPACE:
msg_id = IDS_KSV_KEY_SPACE;
break;
case ui::VKEY_MEDIA_LAUNCH_APP1:
msg_id = IDS_KSV_KEY_OVERVIEW;
break;
case ui::VKEY_MEDIA_LAUNCH_APP2:
msg_id = IDS_KSV_KEY_FULLSCREEN;
break;
case ui::VKEY_UNKNOWN:
// TODO(wutao): make this reliable.
// If this is VKEY_UNKNOWN, it indicates to insert a "+" separator. Use
// one space to replace the string resourece's placeholder so that the
// separator is not searchable. This does not conflict with the
// replacement string for "VKEY_SPACE", which is "Space".
return base::ASCIIToUTF16(" ");
// one plus and one space to replace the string resourece's placeholder so
// that the separator will not conflict with the replacement string for
// "VKEY_OEM_PLUS", which is "+" and "VKEY_SPACE", which is "Space".
return base::ASCIIToUTF16("+ ");
default:
return base::nullopt;
}
......@@ -128,44 +139,978 @@ base::string16 GetStringForKeyboardCode(ui::KeyboardCode key_code) {
const std::vector<KeyboardShortcutItem>& GetKeyboardShortcutItemList() {
CR_DEFINE_STATIC_LOCAL(
std::vector<KeyboardShortcutItem>, item_list,
// TODO(crbug.com/793997): These are two examples how we organize the
// metadata. Full metadata will be provided.
({
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kSystemAndDisplay},
{ShortcutCategory::kPopular},
IDS_KSV_DESCRIPTION_LOCK_SCREEN,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{{ui::VKEY_L, ui::EF_COMMAND_DOWN}}},
// Some accelerators are grouped into one metadata for the
// KeyboardShortcutViewer due to the similarity. E.g. the shortcut for
// "Change screen resolution" is "Ctrl + Shift and + or -", which
// groups
// two accelerators.
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_CHANGE_SCREEN_RESOLUTION,
IDS_KSV_SHORTCUT_CHANGE_SCREEN_RESOLUTION,
// |accelerator_ids|
{{ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN},
{ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN}}},
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_SHIFT,
ui::VKEY_UNKNOWN, ui::VKEY_OEM_PLUS, ui::VKEY_OEM_MINUS}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_DRAG_LINK_IN_SAME_TAB,
IDS_KSV_SHORTCUT_DRAG_LINK_IN_SAME_TAB},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_DRAG_LINK_IN_NEW_TAB,
IDS_KSV_SHORTCUT_DRAG_LINK_IN_NEW_TAB},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_HIGHLIGHT_NEXT_ITEM,
IDS_KSV_SHORTCUT_HIGHLIGHT_NEXT_ITEM,
IDS_KSV_DESCRIPTION_HIGHLIGHT_NEXT_ITEM_ON_SHELF,
IDS_KSV_SHORTCUT_HIGHLIGHT_NEXT_ITEM_ON_SHELF,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_SHIFT, ui::VKEY_UNKNOWN, ui::VKEY_LMENU, ui::VKEY_UNKNOWN,
ui::VKEY_L, ui::VKEY_TAB, ui::VKEY_RIGHT}},
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_CYCLE_BACKWARD_MRU,
IDS_KSV_SHORTCUT_CYCLE_BACKWARD_MRU,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_LMENU, ui::VKEY_UNKNOWN, ui::VKEY_SHIFT, ui::VKEY_TAB}},
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_CYCLE_FORWARD_MRU,
IDS_KSV_SHORTCUT_CYCLE_FORWARD_MRU,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_LMENU, ui::VKEY_TAB}},
{// |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_PAGE,
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|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_A}},
{// |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}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_FIND_NEXT,
IDS_KSV_SHORTCUT_IDC_FIND_NEXT,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_G, ui::VKEY_RETURN}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_FIND_PREVIOUS,
IDS_KSV_SHORTCUT_IDC_FIND_PREVIOUS,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_SHIFT,
ui::VKEY_UNKNOWN, ui::VKEY_G, ui::VKEY_SHIFT, ui::VKEY_UNKNOWN,
ui::VKEY_RETURN}},
{// |categories|
{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}}},
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_IDC_FOCUS_LOCATION,
IDS_KSV_SHORTCUT_IDC_FOCUS_LOCATION,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_L, ui::VKEY_LMENU,
ui::VKEY_UNKNOWN, ui::VKEY_D}},
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_FOCUS_SEARCH,
IDS_KSV_SHORTCUT_IDC_FOCUS_SEARCH,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_K, ui::VKEY_E}},
{// |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}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_RELOAD,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{{ui::VKEY_R, ui::EF_CONTROL_DOWN}}},
{// |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_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_STOP,
IDS_KSV_SHORTCUT_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_ESCAPE}},
{// |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::kTextEditing},
IDS_KSV_DESCRIPTION_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::kTextEditing},
IDS_KSV_DESCRIPTION_PREVIOUS_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::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_COPY,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_C}},
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_PASTE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_V}},
{// |categories|
{ShortcutCategory::kPopular},
IDS_KSV_DESCRIPTION_SELECT_NUMBERED_TAB,
IDS_KSV_SHORTCUT_SELECT_NUMBERED_TAB,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN}},
{// |categories|
{ShortcutCategory::kPopular, ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_IDC_RELOAD,
IDS_KSV_SHORTCUT_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_BROWSER_REFRESH}},
{// |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}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_OPEN_LINK_IN_TAB_BACKGROUND,
IDS_KSV_SHORTCUT_OPEN_LINK_IN_TAB_BACKGROUND,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_OPEN_LINK_IN_TAB,
IDS_KSV_SHORTCUT_OPEN_LINK_IN_TAB,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_SHIFT}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_OPEN_LINK_IN_WINDOW,
IDS_KSV_SHORTCUT_OPEN_LINK_IN_WINDOW,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_SHIFT}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_OPEN_PAGE_IN_NEW_TAB,
IDS_KSV_SHORTCUT_OPEN_PAGE_IN_NEW_TAB,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_LMENU, ui::VKEY_UNKNOWN, ui::VKEY_RETURN}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_STOP_DRAG_TAB,
IDS_KSV_SHORTCUT_STOP_DRAG_TAB,
// |accelerator_ids|
{{ui::VKEY_ESCAPE, ui::EF_NONE}}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_PAGE_UP,
IDS_KSV_SHORTCUT_PAGE_UP,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_LMENU, ui::VKEY_COMMAND, ui::VKEY_UNKNOWN, ui::VKEY_UP}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_PAGE_DOWN,
IDS_KSV_SHORTCUT_PAGE_DOWN,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_LWIN, ui::VKEY_COMMAND, ui::VKEY_UNKNOWN, ui::VKEY_DOWN}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_SCROLL_DOWN_PAGE,
IDS_KSV_SHORTCUT_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_SPACE}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_GO_TO_TOP,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_LMENU,
ui::VKEY_UNKNOWN, ui::VKEY_UP}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_GO_TO_BOTTOM,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_LMENU,
ui::VKEY_UNKNOWN, ui::VKEY_DOWN}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_RIGHT_CLICK,
IDS_KSV_SHORTCUT_RIGHT_CLICK,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_LMENU}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_SAVE_LINK_AS_BOOKMARK,
IDS_KSV_SHORTCUT_SAVE_LINK_AS_BOOKMARK,
// |accelerator_ids|
{}},
{// |categories|
{ShortcutCategory::kPageAndBrowser},
IDS_KSV_DESCRIPTION_AUTO_COMPLETE,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_RETURN}},
{// |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}}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_OPEN_FILE,
IDS_KSV_SHORTCUT_OPEN_FILE,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_SPACE}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_DISPLAY_HIDDEN_FILES,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_OEM_PERIOD}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_LAUNCH_NUMBERED_APP,
IDS_KSV_SHORTCUT_LAUNCH_NUMBERED_APP,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_LMENU, ui::VKEY_UNKNOWN}},
{// |categories|
{ShortcutCategory::kSystemAndDisplay},
IDS_KSV_DESCRIPTION_USE_F_KEYS,
IDS_KSV_SHORTCUT_USE_F_KEYS,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_COMMAND, ui::VKEY_UNKNOWN}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_SELECT_ADDRESS_BAR,
IDS_KSV_SHORTCUT_SELECT_ADDRESS_BAR,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_L, ui::VKEY_LMENU,
ui::VKEY_UNKNOWN, ui::VKEY_D}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_SELECT_NEXT_WORD,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_SHIFT,
ui::VKEY_UNKNOWN, ui::VKEY_RIGHT}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_SELECT_TEXT_TO_END_OF_LINE,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_SHIFT, ui::VKEY_UNKNOWN, ui::VKEY_COMMAND,
ui::VKEY_UNKNOWN, ui::VKEY_RIGHT}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_SELECT_TEXT_TO_BEGINNING,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_SHIFT, ui::VKEY_UNKNOWN, ui::VKEY_COMMAND,
ui::VKEY_UNKNOWN, ui::VKEY_LEFT}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_SELECT_PREVIOUS_WORD,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_SHIFT,
ui::VKEY_UNKNOWN, ui::VKEY_LEFT}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_MOVE_TO_END_OF_WORD,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_RIGHT}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_MOVE_TO_START_OF_PREVIOUS_WORD,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_LEFT}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_GO_TO_END_OF_DOCUMENT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_COMMAND,
ui::VKEY_UNKNOWN, ui::VKEY_RIGHT}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_GO_TO_BEGINNING_OF_DOCUMENT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_COMMAND,
ui::VKEY_UNKNOWN, ui::VKEY_LEFT}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_PASTE_CONTENT_AS_TEXT,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_SHIFT,
ui::VKEY_UNKNOWN, ui::VKEY_V}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_CUT,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_X}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_DELETE_PREVIOUS_WORD,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_BACK}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_DELETE_NEXT_WORD,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_LMENU, ui::VKEY_UNKNOWN, ui::VKEY_BACK}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_UNDO,
IDS_KSV_SHORTCUT_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_Z}},
{// |categories|
{ShortcutCategory::kTextEditing},
IDS_KSV_DESCRIPTION_REDO,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_SHIFT,
ui::VKEY_UNKNOWN, ui::VKEY_Z}},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_HIGHLIGHT_PREVIOUS_ITEM_ON_SHELF,
IDS_KSV_SHORTCUT_HIGHLIGHT_PREVIOUS_ITEM_ON_SHELF,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_SHIFT, ui::VKEY_UNKNOWN, ui::VKEY_LMENU, ui::VKEY_UNKNOWN,
ui::VKEY_L, ui::VKEY_SHIFT, ui::VKEY_UNKNOWN, ui::VKEY_TAB,
ui::VKEY_LEFT}},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_OPEN_HIGHLIGHTED_ITEM_ON_SHELF,
IDS_KSV_SHORTCUT_OPEN_HIGHLIGHTED_ITEM_ON_SHELF,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_SHIFT, ui::VKEY_UNKNOWN, ui::VKEY_LMENU, ui::VKEY_UNKNOWN,
ui::VKEY_L, ui::VKEY_SPACE, ui::VKEY_RETURN}},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_REMOVE_HIGHLIGHT_ON_SHELF,
IDS_KSV_SHORTCUT_REMOVE_HIGHLIGHT_ON_SHELF,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_SHIFT, ui::VKEY_UNKNOWN, ui::VKEY_LMENU, ui::VKEY_UNKNOWN,
ui::VKEY_L, ui::VKEY_ESCAPE}},
{// |categories|
{ShortcutCategory::kAccessibility},
IDS_KSV_DESCRIPTION_SWITCH_FOCUS,
IDS_KSV_SHORTCUT_SWITCH_FOCUS,
// |accelerator_ids|
{},
// |shortcut_key_codes|
{ui::VKEY_CONTROL, ui::VKEY_UNKNOWN, ui::VKEY_LEFT, ui::VKEY_CONTROL,
ui::VKEY_UNKNOWN, ui::VKEY_RIGHT}},
{// |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|
{ui::VKEY_SHIFT, ui::VKEY_UNKNOWN, ui::VKEY_COMMAND,
ui::VKEY_UNKNOWN, ui::VKEY_VOLUME_UP}},
{// |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::kSystemAndDisplay},
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::kSystemAndDisplay},
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_ONE_MODIFIER_ONE_KEY,
// |accelerator_ids|
{{ui::VKEY_BROWSER_FORWARD, 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_WINDOW_TO_ABOVE_DISPLAY,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{{ui::VKEY_UP, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_MOVE_WINDOW_TO_BELOW_DISPLAY,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{{ui::VKEY_DOWN, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_MOVE_WINDOW_TO_LEFT_DISPLAY,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{{ui::VKEY_LEFT, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN}}},
{// |categories|
{ShortcutCategory::kTabAndWindow},
IDS_KSV_DESCRIPTION_MOVE_WINDOW_TO_RIGHT_DISPLAY,
IDS_KSV_SHORTCUT_TWO_MODIFIERS_ONE_KEY,
// |accelerator_ids|
{{ui::VKEY_RIGHT, ui::EF_COMMAND_DOWN | ui::EF_ALT_DOWN}}},
}));
CR_DEFINE_STATIC_LOCAL(bool, is_initialized, (false));
......
ui/chromeos/ksv/views/keyboard_shortcut_item_view.cc
View file @ 5f7ab7ba
......@@ -89,8 +89,9 @@ KeyboardShortcutItemView::KeyboardShortcutItemView(
shortcut_label_view_->SetHorizontalAlignment(
base::i18n::IsRTL() ? gfx::ALIGN_LEFT : gfx::ALIGN_RIGHT);
DCHECK_EQ(replacement_strings.size(), offsets.size());
// If the replacement string is " ", it indicates to insert a seperator view.
const base::string16 separator_string = base::ASCIIToUTF16(" ");
// TODO(wutao): make this reliable.
// If the replacement string is "+ ", it indicates to insert a seperator view.
const base::string16 separator_string = base::ASCIIToUTF16("+ ");
for (size_t i = 0; i < offsets.size(); ++i) {
views::StyledLabel::RangeStyleInfo style_info;
style_info.disable_line_wrapping = true;
......
ui/chromeos/ksv/views/ksv_search_box_view.cc
View file @ 5f7ab7ba
......@@ -35,6 +35,8 @@ KSVSearchBoxView::KSVSearchBoxView(search_box::SearchBoxViewDelegate* delegate)
search_box()->set_placeholder_text(
l10n_util::GetStringUTF16(IDS_KSV_SEARCH_BOX_PLACEHOLDER));
search_box()->set_placeholder_text_draw_flags(gfx::Canvas::TEXT_ALIGN_CENTER);
search_box()->SetAccessibleName(
l10n_util::GetStringUTF16(IDS_KSV_SEARCH_BOX_ACCESSIBILITY_NAME));
constexpr SkColor kSearchBarIconColor =
SkColorSetARGBMacro(0xFF, 0x3C, 0x40, 0x43);
......@@ -77,19 +79,22 @@ void KSVSearchBoxView::SetupCloseButton() {
close->SetSize(gfx::Size(kIconSize, kIconSize));
close->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
views::ImageButton::ALIGN_MIDDLE);
close->SetAccessibleName(
l10n_util::GetStringUTF16(IDS_KSV_CLEAR_SEARCHBOX_ACCESSIBILITY_NAME));
close->SetVisible(false);
}
void KSVSearchBoxView::SetupBackButton() {
constexpr SkColor kBackIconColor =
SkColorSetARGBMacro(0xFF, 0x42, 0x85, 0xF4);
views::ImageButton* back = back_button();
back->SetImage(views::ImageButton::STATE_NORMAL,
gfx::CreateVectorIcon(kKsvSearchBackIcon, kBackIconColor));
back->SetSize(gfx::Size(kIconSize, kIconSize));
back->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
views::ImageButton::ALIGN_MIDDLE);
back->SetAccessibleName(
l10n_util::GetStringUTF16(IDS_KSV_BACK_ACCESSIBILITY_NAME));
back->SetVisible(false);
}
......
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