Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(26)

Unified Diff: tools/json_schema_compiler/cc_generator.py

Issue 10367002: Make all extension api types fully qualified. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix webrequest tests Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/json_schema_compiler/cc_generator.py
diff --git a/tools/json_schema_compiler/cc_generator.py b/tools/json_schema_compiler/cc_generator.py
index 3efad841e48abb226715dd04c18944d1d9bfc1d8..508e0f24014d6e190e22d03478afa7bbc238210e 100644
--- a/tools/json_schema_compiler/cc_generator.py
+++ b/tools/json_schema_compiler/cc_generator.py
@@ -7,6 +7,7 @@ from model import PropertyType
import any_helper
import cpp_util
import model
+import schema_util
import sys
import util_cc_helper
@@ -71,8 +72,8 @@ class CCGenerator(object):
.Append()
)
for type_ in self._namespace.types.values():
- (c.Concat(self._GenerateType(type_.name, type_))
- .Append()
+ (c.Concat(self._GenerateType(
+ schema_util.StripSchemaNamespace(type_.name), type_)).Append()
)
if self._namespace.functions:
(c.Append('//')
@@ -95,7 +96,7 @@ class CCGenerator(object):
def _GenerateType(self, cpp_namespace, type_):
"""Generates the function definitions for a type.
"""
- classname = cpp_util.Classname(type_.name)
+ classname = cpp_util.Classname(schema_util.StripSchemaNamespace(type_.name))
c = Code()
if type_.functions:
@@ -174,7 +175,7 @@ class CCGenerator(object):
E.g for type "Foo", generates Foo::Populate()
"""
- classname = cpp_util.Classname(type_.name)
+ classname = cpp_util.Classname(schema_util.StripSchemaNamespace(type_.name))
c = Code()
(c.Append('// static')
.Sblock('bool %(namespace)s::Populate'

Powered by Google App Engine
This is Rietveld 408576698