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

Unified Diff: chrome/browser/resources/chromeos/keyboard_overlay_data.js

Issue 17095007: Clean up keyboard overlay code for shortcut keys with Search modifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/resources/chromeos/keyboard_overlay_data.js
diff --git a/chrome/browser/resources/chromeos/keyboard_overlay_data.js b/chrome/browser/resources/chromeos/keyboard_overlay_data.js
index 097d891b34ae60fb3da1232428a5a090a8477219..235420ea4ed6c7242df0eb25264f388bc22c52a2 100644
--- a/chrome/browser/resources/chromeos/keyboard_overlay_data.js
+++ b/chrome/browser/resources/chromeos/keyboard_overlay_data.js
@@ -15767,31 +15767,44 @@ var keyboardOverlayData = {
'-<>ALT': 'keyboardOverlayMinimizeWindow',
'-<>CTRL': 'keyboardOverlayZoomOut',
'-<>CTRL<>SHIFT': 'keyboardOverlayZoomScreenOut',
+ '-<>SEARCH': 'keyboardOverlayF11',
'.<>CTRL<>SHIFT': 'keyboardOverlayToggleSpeechInput',
+ '.<>SEARCH': 'keyboardOverlayInsert',
'/<>ALT<>CTRL': 'keyboardOverlayViewKeyboardOverlay',
'/<>ALT<>CTRL<>SHIFT': 'keyboardOverlayViewKeyboardOverlay',
'/<>CTRL': 'keyboardOverlayHelp',
'/<>CTRL<>SHIFT': 'keyboardOverlayHelp',
'0<>CTRL': 'keyboardOverlayResetZoom',
'0<>CTRL<>SHIFT': 'keyboardOverlayResetScreenZoom',
+ '0<>SEARCH': 'keyboardOverlayF10',
'1<>ALT': 'keyboardOverlayActivateLauncherItem1',
'1<>CTRL': 'keyboardOverlayActivateTab1',
+ '1<>SEARCH': 'keyboardOverlayF1',
'2<>ALT': 'keyboardOverlayActivateLauncherItem2',
'2<>CTRL': 'keyboardOverlayActivateTab2',
+ '2<>SEARCH': 'keyboardOverlayF2',
'3<>ALT': 'keyboardOverlayActivateLauncherItem3',
'3<>CTRL': 'keyboardOverlayActivateTab3',
+ '3<>SEARCH': 'keyboardOverlayF3',
'4<>ALT': 'keyboardOverlayActivateLauncherItem4',
'4<>CTRL': 'keyboardOverlayActivateTab4',
+ '4<>SEARCH': 'keyboardOverlayF4',
'5<>ALT': 'keyboardOverlayActivateLauncherItem5',
'5<>CTRL': 'keyboardOverlayActivateTab5',
+ '5<>SEARCH': 'keyboardOverlayF5',
'6<>ALT': 'keyboardOverlayActivateLauncherItem6',
'6<>CTRL': 'keyboardOverlayActivateTab6',
+ '6<>SEARCH': 'keyboardOverlayF6',
'7<>ALT': 'keyboardOverlayActivateLauncherItem7',
'7<>CTRL': 'keyboardOverlayActivateTab7',
+ '7<>SEARCH': 'keyboardOverlayF7',
'8<>ALT': 'keyboardOverlayActivateLauncherItem8',
'8<>CTRL': 'keyboardOverlayActivateTab8',
+ '8<>SEARCH': 'keyboardOverlayF8',
'9<>ALT': 'keyboardOverlayActivateLastLauncherItem',
'9<>CTRL': 'keyboardOverlayActivateLastTab',
+ '9<>SEARCH': 'keyboardOverlayF9',
+ '=<>SEARCH': 'keyboardOverlayF12',
'ALT<>SEARCH': 'keyboardOverlayToggleCapsLock',
'ALT<>SHIFT': 'keyboardOverlayCycleThroughInputMethods',
'[<>ALT': 'keyboardOverlayDockWindowLeft',
@@ -15801,15 +15814,19 @@ var keyboardOverlayData = {
'b<>ALT<>SHIFT': 'keyboardOverlayFocusBookmarks',
'b<>CTRL<>SHIFT': 'keyboardOverlayToggleBookmarkBar',
'back<>CTRL': 'keyboardOverlayFocusPreviousPane',
+ 'back<>SEARCH': 'keyboardOverlayF1',
'backspace': 'keyboardOverlayGoBack',
'backspace<>ALT': 'keyboardOverlayDelete',
'backspace<>CTRL': 'keyboardOverlayDeleteWord',
'backspace<>CTRL<>SHIFT': 'keyboardOverlayClearBrowsingDataDialog',
+ 'backspace<>SEARCH': 'keyboardOverlayDelete',
'backspace<>SHIFT': 'keyboardOverlayGoForward',
'bright down<>ALT': 'keyboardOverlayDecreaseKeyBrightness',
'bright down<>ALT<>CTRL': 'keyboardOverlayMagnifierDecreaseZoom',
+ 'bright down<>SEARCH': 'keyboardOverlayF6',
'bright up<>ALT': 'keyboardOverlayIncreaseKeyBrightness',
'bright up<>ALT<>CTRL': 'keyboardOverlayMagnifierIncreaseZoom',
+ 'bright up<>SEARCH': 'keyboardOverlayF7',
'c<>CTRL': 'keyboardOverlayCopy',
'c<>CTRL<>SHIFT': 'keyboardOverlayDomInspector',
'd<>ALT': 'keyboardOverlayFocusAddressBar',
@@ -15817,6 +15834,7 @@ var keyboardOverlayData = {
'd<>CTRL<>SHIFT': 'keyboardOverlayBookmarkAllTabs',
'down<>ALT': 'keyboardOverlayPageDown',
'down<>ALT<>CTRL': 'keyboardOverlayEnd',
+ 'down<>SEARCH': 'keyboardOverlayPageDown',
'e<>ALT': 'keyboardOverlayShowWrenchMenu',
'e<>CTRL': 'keyboardOverlayFocusAddressBarInSearchMode',
'enter<>ALT': 'keyboardOverlayOpenAddressInNewTab',
@@ -15826,6 +15844,8 @@ var keyboardOverlayData = {
'f<>ALT': 'keyboardOverlayShowWrenchMenu',
'f<>CTRL': 'keyboardOverlayFindText',
'forward<>CTRL': 'keyboardOverlayFocusNextPane',
+ 'forward<>SEARCH': 'keyboardOverlayF2',
+ 'full screen<>SEARCH': 'keyboardOverlayF4',
'g<>CTRL': 'keyboardOverlayFindTextAgain',
'g<>CTRL<>SHIFT': 'keyboardOverlayFindPreviousText',
'h<>CTRL': 'keyboardOverlayHistory',
@@ -15840,11 +15860,13 @@ var keyboardOverlayData = {
'left<>ALT': 'keyboardOverlayGoBack',
'left<>CTRL': 'keyboardOverlayPreviousWord',
'left<>CTRL<>SHIFT': 'keyboardOverlaySelectWordAtATime',
+ 'left<>SEARCH': 'keyboardOverlayEnd',
'm<>ALT<>SHIFT': 'keyboardOverlayOpenFileManager',
'm<>CTRL': 'keyboardOverlayMinimizeWindow',
'maximize<>ALT': 'keyboardOverlaySwapPrimaryMonitor',
'maximize<>CTRL': 'keyboardOverlayMirrorMonitors',
'maximize<>SHIFT': 'keyboardOverlayFullScreen',
+ 'mute<>SEARCH': 'keyboardOverlayF8',
'n<>ALT<>SHIFT': 'keyboardOverlayShowMessageCenter',
'n<>CTRL': 'keyboardOverlayNewWindow',
'n<>CTRL<>SHIFT': 'keyboardOverlayNewIncognitoWindow',
@@ -15856,15 +15878,18 @@ var keyboardOverlayData = {
'r<>CTRL': 'keyboardOverlayReloadCurrentPage',
'r<>CTRL<>SHIFT': 'keyboardOverlayReloadIgnoringCache',
'reload<>CTRL<>SHIFT': 'keyboardOverlayRotateScreen',
+ 'reload<>SEARCH': 'keyboardOverlayF3',
'right<>ALT': 'keyboardOverlayGoForward',
'right<>CTRL': 'keyboardOverlayNextWord',
'right<>CTRL<>SHIFT': 'keyboardOverlaySelectWordAtATime',
+ 'right<>SEARCH': 'keyboardOverlayHome',
's<>ALT<>SHIFT': 'keyboardOverlayShowStatusMenu',
's<>CTRL': 'keyboardOverlaySave',
'space<>CTRL': 'keyboardOverlaySelectPreviousInputMethod',
'space<>SHIFT': 'keyboardOverlayScrollUpOnePage',
'switch window<>CTRL': 'keyboardOverlayTakeScreenshot',
'switch window<>CTRL<>SHIFT': 'keyboardOverlayScreenshotRegion',
+ 'switch window<>SEARCH': 'keyboardOverlayF5',
't<>ALT<>CTRL': 'keyboardOverlayNewTerminal',
't<>ALT<>SHIFT': 'keyboardOverlayFocusToolbar',
't<>CTRL': 'keyboardOverlayNewTab',
@@ -15877,8 +15902,11 @@ var keyboardOverlayData = {
'u<>CTRL<>SHIFT': 'keyboardOverlayInputUnicodeCharacters',
'up<>ALT': 'keyboardOverlayPageUp',
'up<>ALT<>CTRL': 'keyboardOverlayHome',
+ 'up<>SEARCH': 'keyboardOverlayPageUp',
'v<>CTRL': 'keyboardOverlayPaste',
'v<>CTRL<>SHIFT': 'keyboardOverlayPasteAsPlainText',
+ 'vol. down<>SEARCH': 'keyboardOverlayF9',
+ 'vol. up<>SEARCH': 'keyboardOverlayF10',
'w<>CTRL': 'keyboardOverlayCloseTab',
'w<>CTRL<>SHIFT': 'keyboardOverlayCloseWindow',
'x<>CTRL': 'keyboardOverlayCut',
« no previous file with comments | « chrome/browser/resources/chromeos/keyboard_overlay.js ('k') | chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698