Enable Search-key modifiers for extended key shortcuts.

chrome/browser/resources/chromeos/keyboard_overlay.js

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 <include src="keyboard_overlay_data.js"/>
 <include src="keyboard_overlay_accessibility_helper.js"/>
 
 var BASE_KEYBOARD = {
   top: 0,
   left: 0,
@@ skipping 100 matching lines @@
 var identifierMap = {};
 
 /**
  * Returns layouts data.
  * @return {Object} Keyboard layout data.
  */
 function getLayouts() {
   return keyboardOverlayData['layouts'];
 }
 
-// Cache the shortcut data after it is constructed.
-var shortcutDataCache;
-
 /**
  * Returns shortcut data.
  * @return {Object} Keyboard shortcut data.
  */
 function getShortcutData() {
-  if (shortcutDataCache)
-    return shortcutDataCache;
-
-  shortcutDataCache = keyboardOverlayData['shortcut'];
-
-  var searchKeyIsModifier =
-      loadTimeData.getString('keyboardSearchKeyActsAsFunctionKey') == 'true';
-  if (searchKeyIsModifier) {
-    // TODO(mazda): Clean this up and move these out to the data js.
-    var searchModifierRemoveShortcuts = {
-      'backspace<>ALT': 'keyboardOverlayDelete',
-      'down<>ALT': 'keyboardOverlayPageDown',
-      'down<>ALT<>CTRL': 'keyboardOverlayEnd',
-      'up<>ALT': 'keyboardOverlayPageUp',
-      'up<>ALT<>CTRL': 'keyboardOverlayHome'
-    };
-    var searchModifierAddShortcuts = {

[mazda, 2012/12/17 18:27:51]

Could you keep these shortcuts data separated from other shrotcuts for now?
I'll enable these shortcuts to be generated by a script as other shortcuts.

[danakj, 2012/12/17 18:30:48]

Ah, right ok! I'll move them back here and just have them always appended.

[danakj, 2012/12/17 20:01:29]

Done.

-      '1<>SEARCH': 'keyboardOverlayF1',
-      '2<>SEARCH': 'keyboardOverlayF2',
-      '3<>SEARCH': 'keyboardOverlayF3',
-      '4<>SEARCH': 'keyboardOverlayF4',
-      '5<>SEARCH': 'keyboardOverlayF5',
-      '6<>SEARCH': 'keyboardOverlayF6',
-      '7<>SEARCH': 'keyboardOverlayF7',
-      '8<>SEARCH': 'keyboardOverlayF8',
-      '9<>SEARCH': 'keyboardOverlayF9',
-      '0<>SEARCH': 'keyboardOverlayF10',
-      '-<>SEARCH': 'keyboardOverlayF11',
-      '=<>SEARCH': 'keyboardOverlayF12',
-      'F1<>SEARCH': 'keyboardOverlayF1',
-      'F2<>SEARCH': 'keyboardOverlayF2',
-      'F3<>SEARCH': 'keyboardOverlayF3',
-      'F4<>SEARCH': 'keyboardOverlayF4',
-      'F5<>SEARCH': 'keyboardOverlayF5',
-      'F6<>SEARCH': 'keyboardOverlayF6',
-      'F7<>SEARCH': 'keyboardOverlayF7',
-      'F8<>SEARCH': 'keyboardOverlayF8',
-      'F9<>SEARCH': 'keyboardOverlayF9',
-      'F10<>SEARCH': 'keyboardOverlayF10',
-      'F11<>SEARCH': 'keyboardOverlayF11',
-      'F12<>SEARCH': 'keyboardOverlayF12',
-      'back<>SEARCH': 'keyboardOverlayF1',
-      'forward<>SEARCH': 'keyboardOverlayF2',
-      'reload<>SEARCH': 'keyboardOverlayF3',
-      'maximize<>SEARCH': 'keyboardOverlayF4',
-      'switch window<>SEARCH': 'keyboardOverlayF5',
-      'bright down<>SEARCH': 'keyboardOverlayF6',
-      'bright up<>SEARCH': 'keyboardOverlayF7',
-      'mute<>SEARCH': 'keyboardOverlayF8',
-      'vol. down<>SEARCH': 'keyboardOverlayF9',
-      'vol. up<>SEARCH': 'keyboardOverlayF10',
-      'backspace<>SEARCH': 'keyboardOverlayDelete',
-      'down<>SEARCH': 'keyboardOverlayPageDown',
-      'right<>SEARCH': 'keyboardOverlayEnd',
-      'up<>SEARCH': 'keyboardOverlayPageUp',
-      'left<>SEARCH': 'keyboardOverlayHome',
-      '.<>SEARCH': 'keyboardOverlayInsert'
-    };
-
-    for (var key in searchModifierRemoveShortcuts)
-      delete shortcutDataCache[key];
-    for (var key in searchModifierAddShortcuts)
-      shortcutDataCache[key] = searchModifierAddShortcuts[key];
-  }
-
-  return shortcutDataCache;
+  return keyboardOverlayData['shortcut'];
 }
 
 /**
  * Returns the keyboard overlay ID.
  * @return {string} Keyboard overlay ID.
  */
 function getKeyboardOverlayId() {
   return keyboardOverlayId;
 }
 
@@ skipping 381 matching lines @@
   instructions.style.top = ((BASE_INSTRUCTIONS.top - BASE_KEYBOARD.top) *
                             height / BASE_KEYBOARD.height + minY) + 'px';
   instructions.style.width = (width * BASE_INSTRUCTIONS.width /
                               BASE_KEYBOARD.width) + 'px';
   instructions.style.height = (height * BASE_INSTRUCTIONS.height /
                                BASE_KEYBOARD.height) + 'px';
 
   var instructionsText = document.createElement('div');
   instructionsText.id = 'instructions-text';
   instructionsText.className = 'keyboard-overlay-instructions-text';
-  var searchKeyIsModifier =
-      loadTimeData.getString('keyboardSearchKeyActsAsFunctionKey') == 'true';
-  if (searchKeyIsModifier) {
-    instructionsText.innerHTML =
-        loadTimeData.getString('keyboardOverlayInstructionsWithSearch');
-  } else {
-    instructionsText.innerHTML =
-        loadTimeData.getString('keyboardOverlayInstructions');
-  }
+  instructionsText.innerHTML =
+      loadTimeData.getString('keyboardOverlayInstructions');
   instructions.appendChild(instructionsText);
   var instructionsHideText = document.createElement('div');
   instructionsHideText.id = 'instructions-hide-text';
   instructionsHideText.className = 'keyboard-overlay-instructions-hide-text';
   instructionsHideText.innerHTML =
       loadTimeData.getString('keyboardOverlayInstructionsHide');
   instructions.appendChild(instructionsHideText);
   var learnMoreLinkText = document.createElement('div');
   learnMoreLinkText.id = 'learn-more-text';
   learnMoreLinkText.className = 'keyboard-overlay-learn-more-text';
@@ skipping 69 matching lines @@
  * Handles click events of the learn more link.
  * @param {Event} e Mouse click event.
  */
 function learnMoreClicked(e) {
   chrome.send('openLearnMorePage');
   chrome.send('DialogClose');
   e.preventDefault();
 }
 
 document.addEventListener('DOMContentLoaded', init);