summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/browser/mojo/chrome_renderer_manifest.json2
-rw-r--r--mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl3
-rw-r--r--mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl2
-rw-r--r--mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl2
-rw-r--r--mojo/shell/tests/connect/connect_unittests_manifest.json8
-rw-r--r--mojo/shell/tests/shell/target_manifest.json2
6 files changed, 10 insertions, 9 deletions
diff --git a/content/browser/mojo/chrome_renderer_manifest.json b/content/browser/mojo/chrome_renderer_manifest.json
index 7022695..463be6d 100644
--- a/content/browser/mojo/chrome_renderer_manifest.json
+++ b/content/browser/mojo/chrome_renderer_manifest.json
@@ -1,5 +1,5 @@
{
"name": "exe:chrome_renderer",
"display_name": "Chrome Renderer",
- "capabilities": { "mojo:mus": [ "mus.mojom.Gpu" ] }
+ "capabilities": { "mojo:mus": [ "mus::mojom::Gpu" ] }
}
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
index 1512454..de7469c 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/interface_definition.tmpl
@@ -3,6 +3,7 @@
{%- set class_name = interface.name %}
{%- set proxy_name = interface.name ~ "Proxy" %}
+{%- set namespace_as_string = "%s"|format(namespace|replace(".","::")) %}
{%- macro alloc_params(struct, serialization_context) %}
bool success = true;
@@ -34,7 +35,7 @@ p_{{param.name}}
{%- endmacro %}
{#--- Begin #}
-MOJO_STATIC_CONST_MEMBER_DEFINITION const char {{class_name}}::Name_[] = "{{namespace}}.{{class_name}}";
+MOJO_STATIC_CONST_MEMBER_DEFINITION const char {{class_name}}::Name_[] = "{{namespace_as_string}}::{{class_name}}";
MOJO_STATIC_CONST_MEMBER_DEFINITION const uint32_t {{class_name}}::Version_;
{#--- Constants #}
diff --git a/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl
index 6f80b04..527e15f 100644
--- a/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl
+++ b/mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl
@@ -59,7 +59,7 @@ public static final {{manager_class(interface, True)}} MANAGER =
new {{manager_class(interface, True)}}() {
public String getName() {
- return "{{namespace}}.{{interface.name}}";
+ return "{{namespace|replace(".","::")}}::{{interface.name}}";
}
public int getVersion() {
diff --git a/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl b/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl
index 0f442b8..1b5cafa 100644
--- a/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl
+++ b/mojo/public/tools/bindings/generators/js_templates/interface_definition.tmpl
@@ -161,7 +161,7 @@ params.{{parameter.name}}{% if not loop.last %}, {% endif -%}
}
var {{interface.name}} = {
- name: '{{namespace}}.{{interface.name}}',
+ name: '{{namespace|replace(".","::")}}::{{interface.name}}',
proxyClass: {{interface.name}}Proxy,
stubClass: {{interface.name}}Stub,
validateRequest: validate{{interface.name}}Request,
diff --git a/mojo/shell/tests/connect/connect_unittests_manifest.json b/mojo/shell/tests/connect/connect_unittests_manifest.json
index a36e640..cb8e865 100644
--- a/mojo/shell/tests/connect/connect_unittests_manifest.json
+++ b/mojo/shell/tests/connect/connect_unittests_manifest.json
@@ -3,9 +3,9 @@
"display_name": "Connect Unittests",
"capabilities": {
"mojo:connect_test_package": ["*"],
- "mojo:connect_test_app": ["mojo.shell.test.mojom.ConnectTestService",
- "mojo.shell.test.mojom.StandaloneApp"],
- "mojo:connect_test_a": ["mojo.shell.test.mojom.ConnectTestService",
- "mojo.shell.test.mojom.StandaloneApp"]
+ "mojo:connect_test_app": ["mojo::shell::test::mojom::ConnectTestService",
+ "mojo::shell::test::mojom::StandaloneApp"],
+ "mojo:connect_test_a": ["mojo::shell::test::mojom::ConnectTestService",
+ "mojo::shell::test::mojom::StandaloneApp"]
}
}
diff --git a/mojo/shell/tests/shell/target_manifest.json b/mojo/shell/tests/shell/target_manifest.json
index f751592..68ddc21 100644
--- a/mojo/shell/tests/shell/target_manifest.json
+++ b/mojo/shell/tests/shell/target_manifest.json
@@ -1,5 +1,5 @@
{
"name": "exe:shell_unittest_target",
"display_name": "Shell Unittest: Target",
- "capabilities": { "mojo:shell_unittest": [ "mojo.shell.test.mojom.CreateInstanceTest" ] }
+ "capabilities": { "mojo:shell_unittest": [ "mojo::shell::test::mojom::CreateInstanceTest" ] }
}