Implement unions as members of structs.

mojo/public/tools/bindings/mojom.gni

 # Copyright 2014 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("../../mojo_sdk.gni")
 
 # Generate C++ and JavaScript source files from mojom files. The output files
 # will go under the generated file directory tree with the same path as each
 # input file.
 #
@@ skipping 46 matching lines @@
       "$generator_root/generators/cpp_templates/interface_declaration.tmpl",
       "$generator_root/generators/cpp_templates/interface_definition.tmpl",
       "$generator_root/generators/cpp_templates/interface_macros.tmpl",
       "$generator_root/generators/cpp_templates/interface_proxy_declaration.tmpl",
       "$generator_root/generators/cpp_templates/interface_request_validator_declaration.tmpl",
       "$generator_root/generators/cpp_templates/interface_response_validator_declaration.tmpl",
       "$generator_root/generators/cpp_templates/interface_stub_declaration.tmpl",
       "$generator_root/generators/cpp_templates/module.cc.tmpl",
       "$generator_root/generators/cpp_templates/module.h.tmpl",
       "$generator_root/generators/cpp_templates/module-internal.h.tmpl",
-      "$generator_root/generators/cpp_templates/serialization_macros.tmpl",
+      "$generator_root/generators/cpp_templates/struct_serialization_declaration.tmpl",
+      "$generator_root/generators/cpp_templates/union_serialization_declaration.tmpl",

[yzshen1, 2015/03/27 16:26:33]

alphabetically, please.

[azani, 2015/03/27 20:50:14]

Done.

       "$generator_root/generators/cpp_templates/struct_declaration.tmpl",
       "$generator_root/generators/cpp_templates/struct_definition.tmpl",
       "$generator_root/generators/cpp_templates/struct_serialization_definition.tmpl",
       "$generator_root/generators/cpp_templates/struct_macros.tmpl",
       "$generator_root/generators/cpp_templates/wrapper_class_declaration.tmpl",
       "$generator_root/generators/cpp_templates/wrapper_class_definition.tmpl",
       "$generator_root/generators/cpp_templates/union_declaration.tmpl",
       "$generator_root/generators/cpp_templates/union_definition.tmpl",
       "$generator_root/generators/cpp_templates/union_serialization_definition.tmpl",
       "$generator_root/generators/cpp_templates/validation_macros.tmpl",
@@ skipping 298 matching lines @@
         full_name = get_label_info(d, "label_no_toolchain")
         deps += [ "${full_name}_java" ]
       }
 
       if (defined(invoker.sources)) {
         srcjars = process_file_template(invoker.sources, generator_java_outputs)
       }
     }
   }
 }