Remove the part of generating xkeyboard_data.h from gen_keyboard_overlay_data.py.

tools/gen_keyboard_overlay_data/gen_keyboard_overlay_data.py

 #!/usr/bin/env python
 # 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.
 
 """Generate keyboard layout and hotkey data for the keyboard overlay.
 
 This script fetches data from the keyboard layout and hotkey data spreadsheet,
 and output the data depending on the option.
 
   --cc: Rewrites a part of C++ code in
       chrome/browser/chromeos/webui/keyboard_overlay_ui.cc
 
   --grd: Rewrites a part of grd messages in
       chrome/app/generated_resources.grd
 
   --js: Rewrites the entire JavaScript code in
       chrome/browser/resources/keyboard_overlay/keyboard_overlay_data.js
 
-  --altgr: Rewrites a list of layouts in
-      chrome/browser/chromeos/input_method/xkeyboard.cc
-
 These options can be specified at the same time.
 
 e.g.
 python gen_keyboard_overlay_data.py --cc --grd --js
 
 The output directory of the generated files can be changed with --outdir.
 
-e.g. (This will generate tmp/xkeyboard.cc)
-python gen_keyboard_overlay_data.py --outdir=tmp --altgr
+e.g. (This will generate tmp/keyboard_overlay.js)
+python gen_keyboard_overlay_data.py --outdir=tmp --js
 """
 
 import cStringIO
 import datetime
 import gdata.spreadsheet.service
 import getpass
 import json
 import optparse
 import os
 import re
 import sys
 
 MODIFIER_SHIFT = 1 << 0
 MODIFIER_CTRL = 1 << 1
 MODIFIER_ALT = 1 << 2
 
 KEYBOARD_GLYPH_SPREADSHEET_KEY = '0Ao3KldW9piwEdExLbGR6TmZ2RU9aUjFCMmVxWkVqVmc'
 HOTKEY_SPREADSHEET_KEY = '0AqzoqbAMLyEPdE1RQXdodk1qVkFyTWtQbUxROVM1cXc'
 CC_OUTDIR = 'chrome/browser/ui/webui/chromeos'
 CC_FILENAME = 'keyboard_overlay_ui.cc'
 GRD_OUTDIR = 'chrome/app'
 GRD_FILENAME = 'generated_resources.grd'
 JS_OUTDIR = 'chrome/browser/resources/chromeos'
 JS_FILENAME = 'keyboard_overlay_data.js'
-ALTGR_OUTDIR = 'chrome/browser/chromeos/input_method'
-ALTGR_FILENAME = 'xkeyboard_data.h'
 CC_START = r'IDS_KEYBOARD_OVERLAY_INSTRUCTIONS_HIDE },'
 CC_END = r'};'
 GRD_START = """Escape to hide
       </message>"""
 GRD_END = r'    </if>'
 
 LABEL_MAP = {
   'glyph_arrow_down': 'down',
   'glyph_arrow_left': 'left',
   'glyph_arrow_right': 'right',
@@ skipping 101 matching lines @@
 # A snippet for grd file
 GRD_SNIPPET_TEMPLATE="""      <message name="%s" desc="%s">
         %s
       </message>
 """
 
 # A snippet for C++ file
 CC_SNIPPET_TEMPLATE="""  { "%s", %s },
 """
 
-ALTGR_TEMPLATE=(
-"""// This file was generated by 'gen_keyboard_overlay_data.py --altgr'
-
-#ifndef CHROME_BROWSER_CHROMEOS_INPUT_METHOD_XKEYBOARD_DATA_H_
-#define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_XKEYBOARD_DATA_H_
-
-namespace chromeos {
-namespace input_method {
-
-// These are the input method IDs that shouldn't remap the right alt key.
-const char* kKeepRightAltInputMethods[] = {
-%s
-};
-
-// These are the overlay names with caps lock remapped
-const char* kCapsLockRemapped[] = {
-%s
-};
-
-}  // input_method
-}  // chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_XKEYBOARD_DATA_H_
-""")
 
 def SplitBehavior(behavior):
   """Splits the behavior to compose a message or i18n-content value.
 
   Examples:
     'Activate last tab' => ['Activate', 'last', 'tab']
     'Close tab' => ['Close', 'tab']
   """
   return [x for x in re.split('[ ()"-.,]', behavior) if len(x) > 0]
 
@@ skipping 65 matching lines @@
   parser.add_option('--password', dest='password',
                     help='Your password.')
   parser.add_option('--account_type', default='GOOGLE', dest='account_type',
                     help='Account type used for gdata login (default: GOOGLE)')
   parser.add_option('--js', dest='js', default=False, action='store_true',
                     help='Output js file.')
   parser.add_option('--grd', dest='grd', default=False, action='store_true',
                     help='Output resource file.')
   parser.add_option('--cc', dest='cc', default=False, action='store_true',
                     help='Output cc file.')
-  parser.add_option('--altgr', dest='altgr', default=False, action='store_true',
-                    help='Output altgr file.')
   parser.add_option('--outdir', dest='outdir', default=None,
                     help='Specify the directory files are generated.')
   (options, unused_args) = parser.parse_args()
 
   if not options.username.endswith('google.com'):
     print 'google.com account is necessary to use this script.'
     sys.exit(-1)
 
-  if (not (options.js or options.grd or options.cc or options.altgr)):
-    print 'Either --js, --grd, --cc or --altgr needs to be specified.'
+  if (not (options.js or options.grd or options.cc)):
+    print 'Either --js, --grd, or --cc needs to be specified.'
     sys.exit(-1)
 
   # Get the password from the terminal, if needed.
   if not options.password:
     options.password = getpass.getpass(
         'Application specific password for %s: ' % options.username)
   return options
 
 
 def InitClient(options):
@@ skipping 218 matching lines @@
     output = CC_SNIPPET_TEMPLATE % (Toi18nContent(behavior), message_name)
     # Break the line if the line is longer than 80 characters
     if len(output) > 80:
       output = output.replace(' ' + message_name, '\n    %s' % message_name)
     snippet.write(output)
 
   RewriteFile(CC_START, CC_END, CC_OUTDIR, CC_FILENAME, snippet.getvalue(),
               outdir)
 
 
-def OutputAltGr(keyboard_glyph_data, outdir):
-  """Outputs the keyboard overlay data as a JSON file."""
-  altgr_output = []
-  caps_lock_output = []
-
-  for input_method_id, layout in INPUT_METHOD_ID_TO_OVERLAY_ID.iteritems():
-    try:
-      # If left and right alt have different values, this layout to the list of
-      # layouts that don't remap the right alt key.
-      right_alt = keyboard_glyph_data[layout]["keys"]["E0 38"]["label"].strip()
-      left_alt = keyboard_glyph_data[layout]["keys"]["38"]["label"].strip()
-      if right_alt.lower() != left_alt.lower():
-        altgr_output.append('  "%s",' % input_method_id)
-    except KeyError:
-      pass
-
-    try:
-      caps_lock = keyboard_glyph_data[layout]["keys"]["E0 5B"]["label"].strip()
-      if caps_lock.lower() != "search":
-        caps_lock_output.append('  "%s",' % input_method_id)
-    except KeyError:
-      pass
-
-  if not outdir:
-    outdir = ALTGR_OUTDIR
-  outpath = GetPath(os.path.join(outdir, ALTGR_FILENAME))
-  snippet = ALTGR_TEMPLATE % ("\n".join(sorted(altgr_output)),
-                              "\n".join(sorted(caps_lock_output)))
-  OutputFile(outpath, snippet)
-
-
 def main():
   options = ParseOptions()
   client = InitClient(options)
   hotkey_data = FetchHotkeyData(client)
 
-  if options.js or options.altgr:
+  if options.js:
     keyboard_glyph_data = FetchKeyboardGlyphData(client)
 
   if options.js:
     layouts = FetchLayoutsData(client)
     OutputJson(keyboard_glyph_data, hotkey_data, layouts, 'keyboardOverlayData',
                options.outdir)
   if options.grd:
     OutputGrd(hotkey_data, options.outdir)
   if options.cc:
     OutputCC(hotkey_data, options.outdir)
-  if options.altgr:
-    OutputAltGr(keyboard_glyph_data, options.outdir)
 
 
 if __name__ == '__main__':
   main()