| Index: third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py
|
| diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py
|
| index 78079f39bcda09eec06aa5c928b40ac86ef528f1..2320dbaf983cb7431fa54599e638a65b6e8f5162 100644
|
| --- a/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py
|
| +++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py
|
| @@ -116,7 +116,7 @@ def ConstantStyle(name):
|
|
|
| def GetNameForElement(element):
|
| if (mojom.IsEnumKind(element) or mojom.IsInterfaceKind(element) or
|
| - mojom.IsStructKind(element)):
|
| + mojom.IsStructKind(element) or mojom.IsUnionKind(element)):
|
| return UpperCamelCase(element.name)
|
| if mojom.IsInterfaceRequestKind(element):
|
| return GetNameForElement(element.kind)
|
| @@ -243,7 +243,9 @@ def GetBoxedJavaType(context, kind, with_generics=True):
|
| def GetJavaType(context, kind, boxed=False, with_generics=True):
|
| if boxed:
|
| return GetBoxedJavaType(context, kind)
|
| - if mojom.IsStructKind(kind) or mojom.IsInterfaceKind(kind):
|
| + if (mojom.IsStructKind(kind) or
|
| + mojom.IsInterfaceKind(kind) or
|
| + mojom.IsUnionKind(kind)):
|
| return GetNameForKind(context, kind)
|
| if mojom.IsInterfaceRequestKind(kind):
|
| return ('org.chromium.mojo.bindings.InterfaceRequest<%s>' %
|
| @@ -406,6 +408,7 @@ class Generator(generator.Generator):
|
| 'is_pointer_array_kind': IsPointerArrayKind,
|
| 'is_reference_kind': mojom.IsReferenceKind,
|
| 'is_struct_kind': mojom.IsStructKind,
|
| + 'is_union_kind': mojom.IsUnionKind,
|
| 'java_true_false': GetJavaTrueFalse,
|
| 'java_type': GetJavaType,
|
| 'method_ordinal_name': GetMethodOrdinalName,
|
|
|