Commit 829cc13a authored by Igor Kobylin's avatar Igor Kobylin Committed by Commit Bot

Move node_utils to c/b/r/bluetooth_internals

Since node_utils is used only by cr.ui.pageManager.Page move it to the
same place.

This also fixes an error with missing dependency in
c/b/r/bluetooth_internals/page.js.

R=dpapad@chromium.org

Bug: None
Change-Id: I9048038a1df853cf2cddf11b6728c4780fa1267f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1878070
Commit-Queue: Igor Kobylin <ikobylin@yandex-team.ru>
Reviewed-by: default avatarDemetrios Papadopoulos <dpapad@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709367}
parent c1b7612e
...@@ -33,6 +33,7 @@ js_library("bluetooth_internals") { ...@@ -33,6 +33,7 @@ js_library("bluetooth_internals") {
] ]
deps = [ deps = [
":node_utils",
":page", ":page",
":page_manager", ":page_manager",
"//chrome/browser/ui/webui/bluetooth_internals:mojo_bindings_js_library_for_compile", "//chrome/browser/ui/webui/bluetooth_internals:mojo_bindings_js_library_for_compile",
...@@ -44,14 +45,20 @@ js_library("bluetooth_internals") { ...@@ -44,14 +45,20 @@ js_library("bluetooth_internals") {
] ]
} }
js_library("node_utils") {
deps = [
"//ui/webui/resources/js:cr",
]
}
js_library("page") { js_library("page") {
deps = [ deps = [
":node_utils",
"//ui/webui/resources/js:cr", "//ui/webui/resources/js:cr",
"//ui/webui/resources/js:util", "//ui/webui/resources/js:util",
"//ui/webui/resources/js/cr:event_target", "//ui/webui/resources/js/cr:event_target",
"//ui/webui/resources/js/cr/ui:bubble", "//ui/webui/resources/js/cr/ui:bubble",
"//ui/webui/resources/js/cr/ui:focus_outline_manager", "//ui/webui/resources/js/cr/ui:focus_outline_manager",
"//ui/webui/resources/js/cr/ui:node_utils",
"//ui/webui/resources/js/cr/ui:overlay", "//ui/webui/resources/js/cr/ui:overlay",
] ]
} }
......
<link rel="import" href="chrome://resources/html/cr.html">
<script src="node_utils.js"></script>
<link rel="import" href="node_utils.html">
<script src="page.js"></script> <script src="page.js"></script>
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// <include src="../node_utils.js">
cr.define('cr.ui.pageManager', function() { cr.define('cr.ui.pageManager', function() {
const PageManager = cr.ui.pageManager.PageManager; const PageManager = cr.ui.pageManager.PageManager;
......
...@@ -89,6 +89,14 @@ ...@@ -89,6 +89,14 @@
use_base_dir="false" use_base_dir="false"
type="BINDATA" type="BINDATA"
compress="gzip" /> compress="gzip" />
<include name="IDR_BLUETOOTH_INTERNALS_NODE_UTILS_HTML"
file="node_utils.html"
type="BINDATA"
compress="gzip" />
<include name="IDR_BLUETOOTH_INTERNALS_NODE_UTILS_JS"
file="node_utils.js"
type="BINDATA"
compress="gzip" />
<include name="IDR_BLUETOOTH_INTERNALS_OBJECT_FIELDSET_JS" <include name="IDR_BLUETOOTH_INTERNALS_OBJECT_FIELDSET_JS"
file="object_fieldset.js" file="object_fieldset.js"
type="BINDATA" type="BINDATA"
......
...@@ -33,7 +33,6 @@ js_type_check("ui_resources") { ...@@ -33,7 +33,6 @@ js_type_check("ui_resources") {
":menu", ":menu",
":menu_button", ":menu_button",
":menu_item", ":menu_item",
":node_utils",
":overlay", ":overlay",
":position_util", ":position_util",
":splitter", ":splitter",
...@@ -209,12 +208,6 @@ js_library("menu") { ...@@ -209,12 +208,6 @@ js_library("menu") {
] ]
} }
js_library("node_utils") {
deps = [
"../..:cr",
]
}
js_library("overlay") { js_library("overlay") {
deps = [ deps = [
"../..:cr", "../..:cr",
......
...@@ -380,9 +380,6 @@ without changes to the corresponding grd file. --> ...@@ -380,9 +380,6 @@ without changes to the corresponding grd file. -->
<structure name="IDR_WEBUI_JS_CR_UI_MENU_ITEM" <structure name="IDR_WEBUI_JS_CR_UI_MENU_ITEM"
file="js/cr/ui/menu_item.js" type="chrome_html" file="js/cr/ui/menu_item.js" type="chrome_html"
compress="gzip" /> compress="gzip" />
<structure name="IDR_WEBUI_JS_CR_UI_NODE_UTILS"
file="js/cr/ui/node_utils.js" type="chrome_html"
compress="gzip" />
<structure name="IDR_WEBUI_JS_CR_UI_OVERLAY" <structure name="IDR_WEBUI_JS_CR_UI_OVERLAY"
file="js/cr/ui/overlay.js" type="chrome_html" file="js/cr/ui/overlay.js" type="chrome_html"
compress="gzip" /> compress="gzip" />
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment