Move chrome.appWindow to chrome.app.window.

tools/json_schema_compiler/schema_bundle_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 code
 import cpp_util
+from schema_util import CapitalizeFirstLetter
+from schema_util import JsFunctionNameToClassName
 
 import json
 import os
 import re
 
 # TODO(miket/asargent) - parameterize this.
 SOURCE_BASE_PATH = 'chrome/common/extensions/api'
 
 class SchemaBundleGenerator(object):
   """This class contains methods to generate code based on multiple schemas.
@@ skipping 44 matching lines @@
 
     c.Concat(self._cpp_type_generator.GetRootNamespaceStart())
     for namespace in self._model.namespaces.values():
       c.Append("// TODO(miket): emit code for %s" % (namespace.unix_name))
     c.Append()
     c.Concat(self.GenerateFunctionRegistry())
     c.Concat(self._cpp_type_generator.GetRootNamespaceEnd())
     c.Append()
     return self.GenerateHeader('generated_api', c)
 
-  def CapitalizeFirstLetter(self, value):
-    return value[0].capitalize() + value[1:]
-
   def GenerateFunctionRegistry(self):
     c = code.Code()
     c.Sblock("class GeneratedFunctionRegistry {")
     c.Append("public:")
     c.Sblock("static void RegisterAll(ExtensionFunctionRegistry* registry) {")
     for namespace in self._model.namespaces.values():
-      namespace_name = self.CapitalizeFirstLetter(namespace.name.replace(
+      namespace_name = CapitalizeFirstLetter(namespace.name.replace(
           "experimental.", ""))
       for function in namespace.functions.values():
         if function.nocompile:
           continue
-        function_name = namespace_name + self.CapitalizeFirstLetter(
-            function.name)
-        c.Append("registry->RegisterFunction<%sFunction>();" % function_name)
+        function_name = JsFunctionNameToClassName(namespace.name, function.name)
+        c.Append("registry->RegisterFunction<%sFunction>();" % (
+            function_name))
     c.Eblock("}")
     c.Eblock("};")
     c.Append()
     return c
 
   def GenerateSchemasHeader(self):
     """Generates a code.Code object for the generated schemas .h file"""
     c = code.Code()
     c.Append('#include <map>')
     c.Append('#include <string>')
@@ skipping 37 matching lines @@
       for index, line in enumerate(lines):
         line = '    "%s"' % line
         if index == len(lines) - 1:
           line += ';'
         c.Append(line)
     c.Eblock('}')
     c.Append()
     c.Concat(self._cpp_type_generator.GetRootNamespaceEnd())
     c.Append()
     return c