summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 16:20:34 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-04 16:20:34 +0000
commita907c5fcc0c91a3723b2e544dbcdb5d6acb8cb0b (patch)
tree88d75870dce6b8e691b148391d4c0f411aef0fa7
parent18d4065cc07739d29911a80110da2812da663f04 (diff)
downloadchromium_src-a907c5fcc0c91a3723b2e544dbcdb5d6acb8cb0b.zip
chromium_src-a907c5fcc0c91a3723b2e544dbcdb5d6acb8cb0b.tar.gz
chromium_src-a907c5fcc0c91a3723b2e544dbcdb5d6acb8cb0b.tar.bz2
Makes core mojo binding js files explicitly define their name
It's rather tricky to infer the name when executing via WebFrame. So, rather than attempting that I'm explicitly defining the module name. This also changes the binding generator to include the path too. BUG=none TEST=none R=abarth@chromium.org Review URL: https://codereview.chromium.org/183893015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254765 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--mojo/apps/js/bindings/codec.js2
-rw-r--r--mojo/apps/js/bindings/connector.js2
-rw-r--r--mojo/public/bindings/generators/js_templates/module.js.tmpl2
3 files changed, 3 insertions, 3 deletions
diff --git a/mojo/apps/js/bindings/codec.js b/mojo/apps/js/bindings/codec.js
index 5df5803..6160fea 100644
--- a/mojo/apps/js/bindings/codec.js
+++ b/mojo/apps/js/bindings/codec.js
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-define(function() {
+define("mojo/apps/js/bindings/codec", function() {
// Memory -------------------------------------------------------------------
diff --git a/mojo/apps/js/bindings/connector.js b/mojo/apps/js/bindings/connector.js
index ddd677e..a9126c0 100644
--- a/mojo/apps/js/bindings/connector.js
+++ b/mojo/apps/js/bindings/connector.js
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-define([
+define("mojo/apps/js/bindings/connector", [
"mojo/apps/js/bindings/codec",
"mojo/apps/js/bindings/core",
"mojo/apps/js/bindings/support",
diff --git a/mojo/public/bindings/generators/js_templates/module.js.tmpl b/mojo/public/bindings/generators/js_templates/module.js.tmpl
index 5d5e259..82c84ec6b 100644
--- a/mojo/public/bindings/generators/js_templates/module.js.tmpl
+++ b/mojo/public/bindings/generators/js_templates/module.js.tmpl
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-define([
+define("{{module.path}}", [
"mojo/apps/js/bindings/core",
"mojo/apps/js/bindings/codec",
{%- for import in imports %}