chromeos: Simplify user action code.

chrome/tools/extract_actions.py

 #!/usr/bin/python
 # Copyright (c) 2011 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.
 
 """Extract UserMetrics "actions" strings from the Chrome source.
 
 This program generates the list of known actions we expect to see in the
 user behavior logs.  It walks the Chrome source, looking for calls to
 UserMetrics functions, extracting actions and warning on improper calls,
@@ skipping 115 matching lines @@
 
   # Actions for language_options_handler.cc (Chrome OS specific).
   for input_method_id in INPUT_METHOD_IDS:
     actions.add('LanguageOptions_DisableInputMethod_%s' % input_method_id)
     actions.add('LanguageOptions_EnableInputMethod_%s' % input_method_id)
     actions.add('InputMethodOptions_Open_%s' % input_method_id)
   for language_code in LANGUAGE_CODES:
     actions.add('LanguageOptions_UiLanguageChange_%s' % language_code)
     actions.add('LanguageOptions_SpellCheckLanguageChange_%s' % language_code)
 
-  # Actions sent by the Chrome OS window manager.
-  actions.add('Accel_NextWindow_Tab')
-  actions.add('Accel_PrevWindow_Tab')
-  actions.add('Accel_NextWindow_F5')
-  actions.add('Accel_PrevWindow_F5')
-
-  # Actions sent by the Chrome OS power manager.
-  actions.add('Accel_BrightnessDown_F6')
-  actions.add('Accel_BrightnessUp_F7')
-
 def AddWebKitEditorActions(actions):
   """Add editor actions from editor_client_impl.cc.
 
   Arguments:
     actions: set of actions to add to.
   """
   action_re = re.compile(r'''\{ [\w']+, +\w+, +"(.*)" +\},''')
 
   editor_file = os.path.join(path_utils.ScriptDir(), '..', '..', 'webkit',
                              'api', 'src','EditorClientImpl.cc')
@@ skipping 29 matching lines @@
   for line in open(about_flags):
     match = flag_name_re.search(line)
     if match:
       actions.add("AboutFlags_" + match.group(1))
     # If the line contains the marker but was not matched by the regex, put up
     # an error if the line is not a comment.
     elif 'FLAGS:RECORD_UMA' in line and line[0:2] != '//':
       print >>sys.stderr, 'WARNING: This line is marked for recording ' + \
           'about:flags metrics, but is not in the proper format:\n' + line
 
+def AddChromeOSActions(actions):
+  """Add actions reported by non-Chrome processes in Chrome OS.
+
+  Arguments:
+    actions: set of actions to add to.
+  """
+  # Actions sent by the Chrome OS window manager.
+  actions.add('Accel_NextWindow_Tab')
+  actions.add('Accel_PrevWindow_Tab')
+  actions.add('Accel_NextWindow_F5')
+  actions.add('Accel_PrevWindow_F5')
+
+  # Actions sent by the Chrome OS power manager.
+  actions.add('Accel_BrightnessDown_F6')
+  actions.add('Accel_BrightnessUp_F7')
+
 def GrepForActions(path, actions):
   """Grep a source file for calls to UserMetrics functions.
 
   Arguments:
     path: path to the file
     actions: set of actions to add to
   """
   global number_of_files_total
   number_of_files_total = number_of_files_total + 1
   # we look for the UserMetricsAction structure constructor
@@ skipping 52 matching lines @@
   chrome_root = os.path.join(path_utils.ScriptDir(), '..')
   WalkDirectory(chrome_root, actions)
   webkit_root = os.path.join(path_utils.ScriptDir(), '..', '..', 'webkit')
   WalkDirectory(os.path.join(webkit_root, 'glue'), actions)
   WalkDirectory(os.path.join(webkit_root, 'port'), actions)
 
   # print "Scanned {0} number of files".format(number_of_files_total)
   # print "Found {0} entries".format(len(actions))
 
   AddClosedSourceActions(actions)
+  AddChromeOSActions(actions)
 
   if hash_output:
     f = open(chromeactions_path, "w")
 
 
   # Print out the actions as a sorted list.
   for action in sorted(actions):
     if hash_output:
       hash = hashlib.md5()
       hash.update(action)
       print >>f, '0x%s\t%s' % (hash.hexdigest()[:16], action)
     else:
       print action
 
   if hash_output:
     print "Done. Do not forget to add chromeactions.txt to your changelist"
 
 if '__main__' == __name__:
   main(sys.argv)