Index: mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl |
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl |
index 4c667aee9d7d3084e373e8e59c6c5a12a9746628..6a0f6cfcd42f1b57ccf0824224731608f78f2d10 100644 |
--- a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl |
+++ b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl |
@@ -10,7 +10,9 @@ |
#include "mojo/public/cpp/bindings/array.h" |
#include "mojo/public/cpp/bindings/callback.h" |
-#include "mojo/public/cpp/bindings/interface.h" |
+#include "mojo/public/cpp/bindings/interface_impl.h" |
+#include "mojo/public/cpp/bindings/interface_ptr.h" |
+#include "mojo/public/cpp/bindings/no_interface.h" |
#include "{{module.path}}-internal.h" |
{%- for import in imports %} |
#include "{{import.module.path}}.h" |
@@ -28,10 +30,7 @@ namespace {{namespace}} { |
{#--- Interface Forward Declarations -#} |
{% for interface in interfaces %} |
class {{interface.name}}; |
-// A typesafe variant of MessagePipeHandle: |
-typedef mojo::Interface<{{interface.name}}>::Handle {{interface.name}}Handle; |
-// A typesafe variant of ScopedMessagePipeHandle: |
-typedef mojo::Interface<{{interface.name}}>::ScopedHandle Scoped{{interface.name}}Handle; |
+typedef mojo::InterfacePtr<{{interface.name}}> {{interface.name}}Ptr; |
{% endfor %} |
{#--- Structs #} |