grit: Add fallback_to_default_layout attribute to <output>

grit_info.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.
 
 '''Tool to determine inputs and outputs of a grit file.
 '''
 
 import optparse
 import os
@@ skipping 49 matching lines @@
                 if f.endswith('.py') and not f.endswith('_unittest.py')]
     files.extend(grit_src)
   return sorted(files)
 
 
 def Inputs(filename, defines, ids_file, target_platform=None):
   grd = grd_reader.Parse(
       filename, debug=False, defines=defines, tags_to_ignore=set(['message']),
       first_ids_file=ids_file, target_platform=target_platform)
   files = set()
-  for lang, ctx in grd.GetConfigurations():
+  for lang, ctx, fallback in grd.GetConfigurations():
+    # TODO(tdanderson): Refactor all places which perform the action of setting
+    #                   output attributes on the root. See crbug.com/503637.
     grd.SetOutputLanguage(lang or grd.GetSourceLanguage())
     grd.SetOutputContext(ctx)
+    grd.SetFallbackToDefaultLayout(fallback)
     for node in grd.ActiveDescendants():
       with node:
         if (node.name == 'structure' or node.name == 'skeleton' or
             (node.name == 'file' and node.parent and
              node.parent.name == 'translations')):
-          files.add(grd.ToRealPath(node.GetInputPath()))
+          path = node.GetInputPath()
+          if path is not None:
+            files.add(grd.ToRealPath(path))
+
           # If it's a flattened node, grab inlined resources too.
           if node.name == 'structure' and node.attrs['flattenhtml'] == 'true':
             node.RunPreSubstitutionGatherer()
             files.update(node.GetHtmlResourceFilenames())
         elif node.name == 'grit':
           first_ids_file = node.GetFirstIdsFile()
           if first_ids_file:
             files.add(first_ids_file)
         elif node.name == 'include':
           files.add(grd.ToRealPath(node.GetInputPath()))
@@ skipping 89 matching lines @@
   except WrongNumberOfArguments, e:
     PrintUsage()
     print e
     return 1
   print result
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))