Make grit resource maps work also for strings

grit/format/resource_map.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.
 
 '''This file contains item formatters for resource_map_header and
 resource_map_source files.  A resource map is a mapping between resource names
 (string) and the internal resource ID.'''
 
 import os
@@ skipping 86 matching lines @@
   # Return the footer text.
   return '''\
 };
 
 const size_t %(map_name)sSize = arraysize(%(map_name)s);
 ''' % { 'map_name': GetMapName(root) }
 
 
 def _FormatSource(get_key, root, lang, output_dir):
   from grit.format import rc_header
-  from grit.node import include, structure
+  from grit.node import include, structure, message
   yield _FormatSourceHeader(root)
   tids = rc_header.GetIds(root)
   seen = set()
+  active_descendants = [item for item in root.ActiveDescendants()]
   for item in root:
-    if isinstance(item, (include.IncludeNode, structure.StructureNode)):
+    if isinstance(item, (include.IncludeNode,
+                         structure.StructureNode,
+                         message.MessageNode)):
       key = get_key(item)
       tid = item.attrs['name']
       if tid in tids and key not in seen:
         seen.add(key)
-        yield '  {"%s", %s},\n' % (key, tid)
+        # For messages, only include the active ones
+        if not isinstance(item, message.MessageNode) \
+            or item in active_descendants:
+          yield '  {"%s", %s},\n' % (key, tid)
   yield _FormatSourceFooter(root)
 
 
 def _GetItemName(item):
   return item.attrs['name']
 
 
 def _GetItemPath(item):
   return item.GetInputPath().replace("\\", "/")