Mojo C++ bindings: assume that all imported mojoms have the same variant as current mojom

mojo/public/tools/bindings/generators/mojom_cpp_generator.py

 # Copyright 2013 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.
 
 """Generates C++ source files from a mojom.Module."""
 
 import mojom.generate.generator as generator
 import mojom.generate.module as mojom
 import mojom.generate.pack as pack
 from mojom.generate.template_expander import UseJinja
@@ skipping 66 matching lines @@
     if mojom.IsStructKind(kind) and kind.native_only:
       return "mojo::Array_Data<uint8_t>"
     if (mojom.IsStructKind(kind) or mojom.IsUnionKind(kind) or
         mojom.IsInterfaceKind(kind) or mojom.IsEnumKind(kind)):
       return kind.name + "_Data"
     return kind.name
 
   parts = []
   if kind.imported_from:
     parts.extend(NamespaceToArray(kind.imported_from["namespace"]))
+    if _variant and add_variant:
+      parts.append(_variant)
   elif add_same_module_namespaces:
     if hasattr(kind, "module"):
       parts.extend(NamespaceToArray(kind.module.namespace))
     if _variant and add_variant:
       parts.append(_variant)
   if internal:
     parts.append("internal")
   if kind.parent_kind:
     parts.append(MapKindName_(kind.parent_kind))
   parts.append(MapKindName_(kind))
   return parts
 
 def GetNameForKind(kind, internal=False):
-  parts = GetNamePartsForKind(kind, False, False, internal)
+  parts = GetNamePartsForKind(kind, False, True, internal)
   return "::".join(parts)
 
 def GetQualifiedNameForKind(kind, internal=False):
   # Always start with an empty part to force a leading "::" on output.
   parts = [""]
   parts.extend(GetNamePartsForKind(kind, True, True, internal))
   return "::".join(parts)
 
 def GetFullMojomNameForKind(kind):
   parts = GetNamePartsForKind(kind, True, False, False)
@@ skipping 264 matching lines @@
   return GetCppResultWrapperType(kind)
 
 def TranslateConstants(token, kind):
   if isinstance(token, mojom.NamedValue):
     # Both variable and enum constants are constructed like:
     # Namespace::Struct::CONSTANT_NAME
     # For enums, CONSTANT_NAME is ENUM_NAME_ENUM_VALUE.
     name = []
     if token.imported_from:
       name.extend(NamespaceToArray(token.namespace))
+    if _variant:
+      name.append(_variant)
     if token.parent_kind:
       name.append(token.parent_kind.name)
     if isinstance(token, mojom.EnumValue):
       name.extend([token.enum.name, token.name])
     else:
       name.append(token.name)
     return "::".join(name)
 
   if isinstance(token, mojom.BuiltinValue):
     if token.value == "double.INFINITY" or token.value == "float.INFINITY":
@@ skipping 173 matching lines @@
     _for_blink = self.for_blink
     global _variant
     _variant = self.variant
     suffix = "-%s" % self.variant if self.variant else ""
     self.Write(self.GenerateModuleHeader(),
         self.MatchMojomFilePath("%s%s.h" % (self.module.name, suffix)))
     self.Write(self.GenerateModuleInternalHeader(),
         self.MatchMojomFilePath("%s%s-internal.h" % (self.module.name, suffix)))
     self.Write(self.GenerateModuleSource(),
         self.MatchMojomFilePath("%s%s.cc" % (self.module.name, suffix)))