Fix the bug of the keyboard overlay not showing shortcut descriptions on the space key.

BUG=chromium-os:14965
TEST=manual


Review URL: http://codereview.chromium.org/6999010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84952 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 160 insertions, 0 deletions

diff --git a/chrome/browser/resources/keyboard_overlay.js b/chrome/browser/resources/keyboard_overlay.js
index c9487e0..4a6119e 100644
--- a/chrome/browser/resources/keyboard_overlay.js
+++ b/chrome/browser/resources/keyboard_overlay.js
@@ -235,6 +235,10 @@ function getAction(keycode, modifiers) {
  */
 function getKeyTextValue(keyData) {
   if (keyData.label) {
+    // Do not show text on the space key.
+    if (keyData.label == 'space') {
+      return '';
+    }
     return keyData.label;
   }
 
diff --git a/chrome/browser/resources/keyboard_overlay_data.js b/chrome/browser/resources/keyboard_overlay_data.js
index d947412..eac1870 100644
--- a/chrome/browser/resources/keyboard_overlay_data.js
+++ b/chrome/browser/resources/keyboard_overlay_data.js
@@ -268,6 +268,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -585,6 +588,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -898,6 +904,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -1172,6 +1181,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -1477,6 +1489,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -1754,6 +1769,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -2031,6 +2049,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -2331,6 +2352,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -2607,6 +2631,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "Alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -2874,6 +2901,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -3136,6 +3166,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -3396,6 +3429,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -3652,6 +3688,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -3909,6 +3948,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -4174,6 +4216,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -4438,6 +4483,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -4735,6 +4783,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -5008,6 +5059,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -5273,6 +5327,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -5541,6 +5598,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -5817,6 +5877,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -6087,6 +6150,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -6363,6 +6429,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -6647,6 +6716,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -7002,6 +7074,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -7288,6 +7363,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -7580,6 +7658,9 @@ var keyboardOverlayData = {
         "38": {
           "format": "left"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -7847,6 +7928,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -8117,6 +8201,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -8410,6 +8497,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -8724,6 +8814,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -9033,6 +9126,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -9312,6 +9408,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -9574,6 +9673,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -9843,6 +9945,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -10107,6 +10212,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -10401,6 +10509,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -10670,6 +10781,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -10949,6 +11063,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -11239,6 +11356,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -11551,6 +11671,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -11858,6 +11981,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -12150,6 +12276,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -12431,6 +12560,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "\u0430\u043b\u0442"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -12706,6 +12838,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -13069,6 +13204,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -13332,6 +13470,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -13648,6 +13789,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -13898,6 +14042,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -14165,6 +14312,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
@@ -14488,6 +14638,9 @@ var keyboardOverlayData = {
           "format": "left",
           "label": "alt"
         },
+        "39": {
+          "label": "space"
+        },
         "3B": {
           "label": "back"
         },
diff --git a/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py b/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py
index 85cd0d2..904420c 100755
--- a/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py
+++ b/tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py
@@ -283,6 +283,9 @@ def FetchKeyboardGlyphData(client):
       if 'label' in line:
         line['label'] = LABEL_MAP.get(line['label'], line['label'])
       keys[scancode] = line
+    # Add a label to space key
+    if '39' not in keys:
+      keys['39'] = {'label': 'space'}
     ret[lang]['keys'] = keys
   return ret