Mojo: Move mojo/public/bindings/js to mojo/public/js/bindings.

The presence of constants.{cc,h} still seems very odd to me, and I still
need to figure out what to do with them (even though I moved them
anyway).

R=sky@chromium.org
TBR=brettw@chromium.org

Review URL: https://codereview.chromium.org/223233002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261679 0039d316-1c4b-4281-b951-d872f2087c98

14 files changed, 33 insertions, 33 deletions

diff --git a/mojo/apps/js/bindings/connection_unittests.js b/mojo/apps/js/bindings/connection_unittests.js
index 60b867d..c65e427 100644
--- a/mojo/apps/js/bindings/connection_unittests.js
+++ b/mojo/apps/js/bindings/connection_unittests.js
@@ -50,7 +50,7 @@ define([
     "gin/test/expect",
     "mojo/bindings/js/support",
     "mojo/bindings/js/core",
-    "mojo/public/bindings/js/connection",
+    "mojo/public/js/bindings/connection",
     "mojo/public/interfaces/bindings/tests/sample_interfaces.mojom",
     "mojo/public/interfaces/bindings/tests/sample_service.mojom",
     "gc",
diff --git a/mojo/apps/js/main.js b/mojo/apps/js/main.js
index fa90b49..fb2d15b 100644
--- a/mojo/apps/js/main.js
+++ b/mojo/apps/js/main.js
@@ -6,7 +6,7 @@ define([
     'console',
     'monotonic_clock',
     'timer',
-    'mojo/public/bindings/js/connection',
+    'mojo/public/js/bindings/connection',
     'mojo/bindings/js/core',
     'mojo/apps/js/bindings/gl',
     'mojo/apps/js/bindings/threading',
diff --git a/mojo/bindings/js/codec_unittests.js b/mojo/bindings/js/codec_unittests.js
index c5ce8cc..e2823e0 100644
--- a/mojo/bindings/js/codec_unittests.js
+++ b/mojo/bindings/js/codec_unittests.js
@@ -4,7 +4,7 @@
 
 define([
     "gin/test/expect",
-    "mojo/public/bindings/js/codec",
+    "mojo/public/js/bindings/codec",
     "mojo/public/interfaces/bindings/tests/sample_service.mojom",
   ], function(expect, codec, sample) {
   testBar();
diff --git a/mojo/mojo_apps_js_unittests.isolate b/mojo/mojo_apps_js_unittests.isolate
index 29a7d6d..c8fe038 100644
--- a/mojo/mojo_apps_js_unittests.isolate
+++ b/mojo/mojo_apps_js_unittests.isolate
@@ -23,7 +23,7 @@
           '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/',
           'apps/js/',
           'bindings/js/',
-          'public/bindings/js/',
+          'public/js/bindings/',
         ],
       },
     }],
diff --git a/mojo/mojo_js_unittests.isolate b/mojo/mojo_js_unittests.isolate
index cae1e8e..770a7c3 100644
--- a/mojo/mojo_js_unittests.isolate
+++ b/mojo/mojo_js_unittests.isolate
@@ -22,7 +22,7 @@
         'isolate_dependency_untracked': [
           '<(PRODUCT_DIR)/gen/mojo/public/interfaces/bindings/tests/',
           'bindings/js/',
-          'public/bindings/js/',
+          'public/js/bindings/',
         ],
       },
     }],
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 83a0ee8..6a530b8 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -246,8 +246,6 @@
         '..'
       ],
       'sources': [
-        'public/bindings/js/constants.cc',
-        'public/bindings/js/constants.h',
         'public/cpp/bindings/allocation_scope.h',
         'public/cpp/bindings/array.h',
         'public/cpp/bindings/buffer.h',
@@ -285,6 +283,8 @@
         'public/cpp/bindings/lib/shared_data.h',
         'public/cpp/bindings/lib/shared_ptr.h',
         'public/cpp/bindings/lib/sync_dispatcher.cc',
+        'public/js/bindings/constants.cc',
+        'public/js/bindings/constants.h',
       ],
     },
     {
diff --git a/mojo/public/bindings/generators/js_templates/module.js.tmpl b/mojo/public/bindings/generators/js_templates/module.js.tmpl
index 2ecd60b..08c5a97 100644
--- a/mojo/public/bindings/generators/js_templates/module.js.tmpl
+++ b/mojo/public/bindings/generators/js_templates/module.js.tmpl
@@ -4,7 +4,7 @@
 
 define("{{module.path}}", [
     "mojo/bindings/js/core",
-    "mojo/public/bindings/js/codec",
+    "mojo/public/js/bindings/codec",
 {%- for import in imports %}
     "{{import.module.path}}",
 {%- endfor %}
diff --git a/mojo/public/bindings/js/constants.cc b/mojo/public/bindings/js/constants.cc
deleted file mode 100644
index fef4f35..0000000
--- a/mojo/public/bindings/js/constants.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-// 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.
-
-#include "mojo/public/bindings/js/constants.h"
-
-namespace mojo {
-
-const char kCodecModuleName[] = "mojo/public/bindings/js/codec";
-const char kConnectionModuleName[] = "mojo/public/bindings/js/connection";
-const char kConnectorModuleName[] = "mojo/public/bindings/js/connector";
-const char kRouterModuleName[] = "mojo/public/bindings/js/router";
-
-}  // namespace mojo
diff --git a/mojo/public/bindings/js/codec.js b/mojo/public/js/bindings/codec.js
index 9827b36..243488b 100644
--- a/mojo/public/bindings/js/codec.js
+++ b/mojo/public/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("mojo/public/bindings/js/codec", function() {
+define("mojo/public/js/bindings/codec", function() {
 
   // Memory -------------------------------------------------------------------
 
diff --git a/mojo/public/bindings/js/connection.js b/mojo/public/js/bindings/connection.js
index 96c7419..ebf60ad 100644
--- a/mojo/public/bindings/js/connection.js
+++ b/mojo/public/js/bindings/connection.js
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-define("mojo/public/bindings/js/connection", [
-  "mojo/public/bindings/js/router",
+define("mojo/public/js/bindings/connection", [
+  "mojo/public/js/bindings/router",
 ], function(router) {
 
   function Connection(handle, localFactory, remoteFactory) {
diff --git a/mojo/public/bindings/js/connector.js b/mojo/public/js/bindings/connector.js
index 2aa9a9f..2fd964d 100644
--- a/mojo/public/bindings/js/connector.js
+++ b/mojo/public/js/bindings/connector.js
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-define("mojo/public/bindings/js/connector", [
-  "mojo/public/bindings/js/codec",
+define("mojo/public/js/bindings/connector", [
+  "mojo/public/js/bindings/codec",
   "mojo/bindings/js/core",
   "mojo/bindings/js/support",
 ], function(codec, core, support) {
diff --git a/mojo/public/js/bindings/constants.cc b/mojo/public/js/bindings/constants.cc
new file mode 100644
index 0000000..d506ee5
--- /dev/null
+++ b/mojo/public/js/bindings/constants.cc
@@ -0,0 +1,14 @@
+// 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.
+
+#include "mojo/public/js/bindings/constants.h"
+
+namespace mojo {
+
+const char kCodecModuleName[] = "mojo/public/js/bindings/codec";
+const char kConnectionModuleName[] = "mojo/public/js/bindings/connection";
+const char kConnectorModuleName[] = "mojo/public/js/bindings/connector";
+const char kRouterModuleName[] = "mojo/public/js/bindings/router";
+
+}  // namespace mojo
diff --git a/mojo/public/bindings/js/constants.h b/mojo/public/js/bindings/constants.h
index f2685a6..27b7e67 100644
--- a/mojo/public/bindings/js/constants.h
+++ b/mojo/public/js/bindings/constants.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_PUBLIC_BINDINGS_JS_CONSTANTS_H_
-#define MOJO_PUBLIC_BINDINGS_JS_CONSTANTS_H_
+#ifndef MOJO_PUBLIC_JS_BINDINGS_CONSTANTS_H_
+#define MOJO_PUBLIC_JS_BINDINGS_CONSTANTS_H_
 
 namespace mojo {
 
@@ -15,4 +15,4 @@ extern const char kRouterModuleName[];
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_BINDINGS_JS_CONSTANTS_H_
+#endif  // MOJO_PUBLIC_JS_BINDINGS_CONSTANTS_H_
diff --git a/mojo/public/bindings/js/router.js b/mojo/public/js/bindings/router.js
index 4a51674..06617ff 100644
--- a/mojo/public/bindings/js/router.js
+++ b/mojo/public/js/bindings/router.js
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-define("mojo/public/bindings/js/router", [
-  "mojo/public/bindings/js/codec",
-  "mojo/public/bindings/js/connector",
+define("mojo/public/js/bindings/router", [
+  "mojo/public/js/bindings/codec",
+  "mojo/public/js/bindings/connector",
 ], function(codec, connector) {
 
   function Router(handle) {