mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl - Issue 1751563002: Mojo C++ bindings: support mapping mojo string to WTF::String.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl

Issue 1751563002: Mojo C++ bindings: support mapping mojo string to WTF::String. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 9 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

« mojo/public/cpp/bindings/tests/wtf_test_base.cc ('K') | « mojo/public/tools/bindings/generators/cpp_templates/module.cc.tmpl ('k') | mojo/public/tools/bindings/generators/mojom_cpp_generator.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 91a4473240dcfe2db98dbe423e29921c64c8770b..a8f0a44b03dc0c331cc3450e873b70665cde6f37 100644

--- a/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl

+++ b/mojo/public/tools/bindings/generators/cpp_templates/module.h.tmpl

@@ -32,7 +32,6 @@

#include "mojo/public/cpp/bindings/map.h"

#include "mojo/public/cpp/bindings/message_filter.h"

#include "mojo/public/cpp/bindings/no_interface.h"

-#include "mojo/public/cpp/bindings/string.h"

#include "mojo/public/cpp/bindings/struct_ptr.h"

#include "mojo/public/cpp/bindings/struct_traits.h"

#include "{{variant_path}}-internal.h"

@@ -42,6 +41,11 @@

{%- if variant %}

#include "{{module.path}}.h"

{%- endif %}

+{%- if not for_blink %}

+#include "mojo/public/cpp/bindings/string.h"

+{%- else %}

+#include "third_party/WebKit/Source/wtf/text/WTFString.h"

+{%- endif %}

{%- for namespace in namespaces_as_array %}

namespace {{namespace}} {