Commit 989ad624 authored by Nnamdi Theodore Johnson-Kanu's avatar Nnamdi Theodore Johnson-Kanu Committed by Commit Bot

[CrOS settings] move bluetooth_dialog to its own sub-folder

Bug: 1045266
Change-Id: I7589bed370e5b64cd302e95df83049c211a48953
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2222889Reviewed-by: default avatarSteven Bennetts <stevenjb@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Reviewed-by: default avatarRegan Hsu <hsuregan@chromium.org>
Commit-Queue: Nnamdi Theodore Johnson-kanu <tjohnsonkanu@google.com>
Cr-Commit-Position: refs/heads/master@{#773797}
parent ba18c910
...@@ -22,7 +22,7 @@ js_type_check("closure_compile") { ...@@ -22,7 +22,7 @@ js_type_check("closure_compile") {
js_library("bluetooth_pairing_dialog") { js_library("bluetooth_pairing_dialog") {
deps = [ deps = [
"//ui/webui/resources/cr_components/chromeos:bluetooth_dialog", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_dialog",
"//ui/webui/resources/js:cr", "//ui/webui/resources/js:cr",
"//ui/webui/resources/js:i18n_behavior", "//ui/webui/resources/js:i18n_behavior",
] ]
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/bluetooth_dialog.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/bluetooth/bluetooth_dialog.html">
<link rel="import" href="chrome://resources/cr_elements/cr_page_host_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/cr_page_host_style_css.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
<link rel="import" href="chrome://resources/html/load_time_data.html"> <link rel="import" href="chrome://resources/html/load_time_data.html">
......
...@@ -38,7 +38,7 @@ js_library("bluetooth_subpage") { ...@@ -38,7 +38,7 @@ js_library("bluetooth_subpage") {
"..:metrics_recorder", "..:metrics_recorder",
"..:os_route", "..:os_route",
"../..:router", "../..:router",
"//ui/webui/resources/cr_components/chromeos:bluetooth_dialog", "//ui/webui/resources/cr_components/chromeos/bluetooth:bluetooth_dialog",
"//ui/webui/resources/cr_elements:cr_scrollable_behavior", "//ui/webui/resources/cr_elements:cr_scrollable_behavior",
"//ui/webui/resources/js:assert", "//ui/webui/resources/js:assert",
"//ui/webui/resources/js:i18n_behavior", "//ui/webui/resources/js:i18n_behavior",
......
<link rel="import" href="chrome://resources/html/polymer.html"> <link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="chrome://resources/cr_components/chromeos/bluetooth_dialog.html"> <link rel="import" href="chrome://resources/cr_components/chromeos/bluetooth/bluetooth_dialog.html">
<link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html"> <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">
<link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html"> <link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
<link rel="import" href="chrome://resources/cr_elements/shared_style_css.html"> <link rel="import" href="chrome://resources/cr_elements/shared_style_css.html">
......
...@@ -8,7 +8,7 @@ assert(is_chromeos, "Only ChromeOS components belong here.") ...@@ -8,7 +8,7 @@ assert(is_chromeos, "Only ChromeOS components belong here.")
group("closure_compile") { group("closure_compile") {
deps = [ deps = [
":chromeos_resources", "bluetooth:closure_compile",
"cellular_setup:closure_compile", "cellular_setup:closure_compile",
"multidevice_setup:closure_compile", "multidevice_setup:closure_compile",
"network:closure_compile", "network:closure_compile",
...@@ -19,35 +19,14 @@ group("closure_compile") { ...@@ -19,35 +19,14 @@ group("closure_compile") {
# TODO: Uncomment as Polymer3 migration makes progress. # TODO: Uncomment as Polymer3 migration makes progress.
# "network:closure_compile_module", # "network:closure_compile_module",
# "quick_unlock:closure_compile_module", # "quick_unlock:closure_compile_module",
# "bluetooth_dialog:closure_compile_module",
"smb_shares:closure_compile_module", "smb_shares:closure_compile_module",
] ]
} }
js_type_check("chromeos_resources") {
deps = [ ":bluetooth_dialog" ]
}
js_library("bluetooth_dialog") {
deps = [
"//third_party/polymer/v1_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior-extracted",
"//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
"//ui/webui/resources/cr_elements/cr_input:cr_input",
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:cr",
"//ui/webui/resources/js:i18n_behavior",
]
externs_list = [
"$externs_path/bluetooth.js",
"$externs_path/bluetooth_private.js",
]
extra_sources = [
"$interfaces_path/bluetooth_interface.js",
"$interfaces_path/bluetooth_private_interface.js",
]
}
group("polymer3_elements") { group("polymer3_elements") {
public_deps = [ public_deps = [
# "bluetooth_dialog:polymer3_elements",
"network:polymer3_elements", "network:polymer3_elements",
"quick_unlock:polymer3_elements", "quick_unlock:polymer3_elements",
"smb_shares:polymer3_elements", "smb_shares:polymer3_elements",
......
# Copyright 2020 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.
import("//third_party/closure_compiler/compile_js.gni")
import("//tools/polymer/polymer.gni")
import("//ui/webui/resources/tools/js_modulizer.gni")
assert(is_chromeos, "Bluetooth dialog is Chrome OS only.")
js_type_check("closure_compile") {
deps = [ ":bluetooth_dialog" ]
}
js_library("bluetooth_dialog") {
deps = [
"//third_party/polymer/v1_0/components-chromium/iron-resizable-behavior:iron-resizable-behavior-extracted",
"//ui/webui/resources/cr_elements/cr_dialog:cr_dialog",
"//ui/webui/resources/cr_elements/cr_input:cr_input",
"//ui/webui/resources/js:assert",
"//ui/webui/resources/js:cr",
"//ui/webui/resources/js:i18n_behavior",
]
externs_list = [
"$externs_path/bluetooth.js",
"$externs_path/bluetooth_private.js",
]
extra_sources = [
"$interfaces_path/bluetooth_interface.js",
"$interfaces_path/bluetooth_private_interface.js",
]
}
\ No newline at end of file
<link rel="import" href="../../html/polymer.html"> <link rel="import" href="../../../html/polymer.html">
<link rel="import" href="../../cr_elements/cr_button/cr_button.html"> <link rel="import" href="../../../cr_elements/cr_button/cr_button.html">
<link rel="import" href="../../cr_elements/cr_dialog/cr_dialog.html"> <link rel="import" href="../../../cr_elements/cr_dialog/cr_dialog.html">
<link rel="import" href="../../cr_elements/cr_input/cr_input.html"> <link rel="import" href="../../../cr_elements/cr_input/cr_input.html">
<link rel="import" href="../../cr_elements/hidden_style_css.html"> <link rel="import" href="../../../cr_elements/hidden_style_css.html">
<link rel="import" href="../../html/cr.html"> <link rel="import" href="../../../html/cr.html">
<link rel="import" href="../../html/i18n_behavior.html"> <link rel="import" href="../../../html/i18n_behavior.html">
<link rel="import" href="../../../html/assert.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html"> <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html">
......
...@@ -4,10 +4,10 @@ ...@@ -4,10 +4,10 @@
<!-- Chrome OS Custom Elements. When optimize_webui is true these are --> <!-- Chrome OS Custom Elements. When optimize_webui is true these are -->
<!-- vulcanized and are not included individually. --> <!-- vulcanized and are not included individually. -->
<structure name="IDR_WEBUI_CHROMEOS_BLUETOOTH_DIALOG_HTML" <structure name="IDR_WEBUI_CHROMEOS_BLUETOOTH_DIALOG_HTML"
file="cr_components/chromeos/bluetooth_dialog.html" file="cr_components/chromeos/bluetooth/bluetooth_dialog.html"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_WEBUI_CHROMEOS_BLUETOOTH_DIALOG_JS" <structure name="IDR_WEBUI_CHROMEOS_BLUETOOTH_DIALOG_JS"
file="cr_components/chromeos/bluetooth_dialog.js" file="cr_components/chromeos/bluetooth/bluetooth_dialog.js"
type="chrome_html" /> type="chrome_html" />
<structure name="IDR_WEBUI_CHROMEOS_NETWORK_APNLIST_HTML" <structure name="IDR_WEBUI_CHROMEOS_NETWORK_APNLIST_HTML"
file="cr_components/chromeos/network/network_apnlist.html" file="cr_components/chromeos/network/network_apnlist.html"
......
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