Make the JSON Schema compiler handle enums declared in other namespaces.

tools/json_schema_compiler/h_generator.py

 # 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.
 
 import os
 
 from code import Code
 from model import PropertyType
 import cpp_util
 import schema_util
@@ skipping 23 matching lines @@
       .Append()
       .Append(cpp_util.GENERATED_FILE_MESSAGE % self._namespace.source_file)
       .Append()
     )
 
     # Hack: for the purpose of gyp the header file will always be the source
     # file with its file extension replaced by '.h'. Assume so.
     output_file = os.path.splitext(self._namespace.source_file)[0] + '.h'
     ifndef_name = cpp_util.GenerateIfndefName(output_file)
 
+    # Hack: tabs and windows have circular references, so only generate hard
+    # references for them (i.e. anything that can't be forward declared). In
+    # other cases, generate soft dependencies so that they can include
+    # non-optional types from other namespaces.
+    include_soft = self._namespace.name not in ('tabs', 'windows')
+
     (c.Append('#ifndef %s' % ifndef_name)
       .Append('#define %s' % ifndef_name)
       .Append()
       .Append('#include <map>')
       .Append('#include <string>')
       .Append('#include <vector>')
       .Append()
       .Append('#include "base/basictypes.h"')
       .Append('#include "base/logging.h"')
       .Append('#include "base/memory/linked_ptr.h"')
       .Append('#include "base/memory/scoped_ptr.h"')
       .Append('#include "base/values.h"')
-      .Cblock(self._type_helper.GenerateIncludes())
+      .Cblock(self._type_helper.GenerateIncludes(include_soft=include_soft))
       .Append()
     )
 
-    # TODO(calamity): These forward declarations should be #includes to allow
-    # $ref types from other files to be used as required params. This requires
-    # some detangling of windows and tabs which will currently lead to circular
-    # #includes.
-    c.Cblock(self._type_helper.GenerateForwardDeclarations())
+    # Hack: we're not generating soft includes for tabs and windows, so we need
+    # to generate forward declarations for them.
+    if not include_soft:
+      c.Cblock(self._type_helper.GenerateForwardDeclarations())
 
     cpp_namespace = cpp_util.GetCppNamespace(
         self._namespace.environment.namespace_pattern,
         self._namespace.unix_name)
     c.Concat(cpp_util.OpenNamespace(cpp_namespace))
     c.Append()
     if self._namespace.properties:
       (c.Append('//')
         .Append('// Properties')
         .Append('//')
@@ skipping 313 matching lines @@
     """Builds the parameter list for a function, given an array of parameters.
     """
     # |error| is populated with warnings and/or errors found during parsing.
     # |error| being set does not necessarily imply failure and may be
     # recoverable.
     # For example, optional properties may have failed to parse, but the
     # parser was able to continue.
     if self._generate_error_messages:
       params += ('base::string16* error',)
     return ', '.join(str(p) for p in params)