Skip to content

Commit

Permalink
WebUI: Migrate cr-button to TypeScript
Browse files Browse the repository at this point in the history
Also adding cr_button_externs for remaining JS users.

Bug: 1316438
Change-Id: I52817d324737f939f089c268248fa7352c103add
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3854492
Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1040847}
  • Loading branch information
Rebekah Potter authored and Chromium LUCI CQ committed Aug 30, 2022
1 parent 2d64cf3 commit 05cbb64
Show file tree
Hide file tree
Showing 43 changed files with 250 additions and 249 deletions.
13 changes: 8 additions & 5 deletions ash/webui/diagnostics_ui/resources/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -160,8 +160,9 @@ js_library("diagnostics_network_icon") {
js_library("diagnostics_sticky_banner") {
deps = [
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}

js_library("diagnostics_utils") {
Expand Down Expand Up @@ -242,10 +243,11 @@ js_library("ip_config_info_drawer") {
":diagnostics_types",
":diagnostics_utils",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:load_time_data.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}

js_library("keyboard_tester") {
Expand Down Expand Up @@ -401,12 +403,13 @@ js_library("system_page") {
":mojo_interface_provider",
":overview_card",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:load_time_data.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_toast/cr_toast_externs.js" ]
externs_list = [
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
"//ui/webui/resources/cr_elements/cr_toast/cr_toast_externs.js",
]
}

js_library("text_badge") {
Expand Down
27 changes: 16 additions & 11 deletions ash/webui/shimless_rma/resources/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,9 @@ js_library("shimless_rma") {
":wrapup_restock_page",
":wrapup_wait_for_manual_wp_enable_page",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}

js_library("base_page") {
Expand Down Expand Up @@ -298,13 +299,14 @@ js_library("onboarding_network_page") {
"//ui/webui/resources/cr_components/chromeos/network:network_config.m",
"//ui/webui/resources/cr_components/chromeos/network:network_list.m",
"//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:assert.m",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:util.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js" ]
externs_list = [
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
"//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js",
]
}

js_library("onboarding_update_page") {
Expand All @@ -325,8 +327,9 @@ js_library("onboarding_wait_for_manual_wp_disable_page") {
":mojo_interface_provider",
":shimless_rma_types",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}

js_library("onboarding_wp_disable_complete_page") {
Expand Down Expand Up @@ -438,11 +441,12 @@ js_library("wrapup_repair_complete_page") {
":mojo_interface_provider",
":shimless_rma_types",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js" ]
externs_list = [
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
"//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js",
]
}

js_library("wrapup_restock_page") {
Expand All @@ -462,10 +466,11 @@ js_library("wrapup_finalize_page") {
":mojo_interface_provider",
":shimless_rma_types",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js" ]
externs_list = [
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
"//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js",
]
}

js_library("wrapup_wait_for_manual_wp_enable_page") {
Expand Down
3 changes: 2 additions & 1 deletion chrome/browser/resources/chromeos/emoji_picker/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -307,8 +307,9 @@ js_library("text_group_button") {
":events",
":types",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}

js_type_check("closure_compile") {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ js_library("gaia_action_buttons") {
deps = [
"//chrome/browser/resources/gaia_auth_host:authenticator.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}

html_to_js("web_components") {
Expand Down
3 changes: 2 additions & 1 deletion chrome/browser/resources/chromeos/login/components/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ js_library("gaia_button.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/gaia_button.m.js" ]
deps = [
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
extra_deps = [ ":gaia_button_module" ]
}

Expand Down
3 changes: 2 additions & 1 deletion chrome/browser/resources/chromeos/parent_access/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ js_library("parent_access_after") {
deps = [
"flows:local_web_approvals_after",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}

js_library("parent_access_app") {
Expand Down
7 changes: 4 additions & 3 deletions chrome/browser/resources/chromeos/password_change/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ js_library("lock_screen_network") {
deps = [
"//ui/webui/resources/cr_components/chromeos/network:network_select.m",
"//ui/webui/resources/cr_components/chromeos/network:onc_mojo.m",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:load_time_data.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js" ]
externs_list = [
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
"//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js",
]
}
2 changes: 2 additions & 0 deletions chrome/browser/resources/chromeos/smb_shares/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@ js_type_check("closure_compile") {

js_library("smb_share_dialog") {
deps = [
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_components/chromeos/smb_shares:add_smb_share_dialog",
"//ui/webui/resources/js:i18n_behavior.m",
]
}

js_library("smb_credentials_dialog") {
deps = [
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_components/chromeos/smb_shares:smb_browser_proxy",
"//ui/webui/resources/js:assert.m",
"//ui/webui/resources/js:cr.m",
Expand Down
6 changes: 4 additions & 2 deletions chrome/browser/resources/nearby_share/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,10 @@ js_library("nearby_confirmation_page") {
"//chrome/browser/ui/webui/nearby_share:mojom_js_library_for_compile",
"//chrome/browser/ui/webui/nearby_share:share_type_js_library_for_compile",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}

js_library("nearby_discovery_page") {
Expand All @@ -194,8 +195,9 @@ js_library("nearby_discovery_page") {
"//chrome/browser/ui/webui/nearby_share:share_type_js_library_for_compile",
"//third_party/polymer/v3_0/components-chromium/iron-list",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/cr_elements/cr_lottie:cr_lottie",
"//ui/webui/resources/js:assert.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}
46 changes: 28 additions & 18 deletions chrome/browser/resources/settings/chromeos/crostini_page/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,26 @@ js_library("crostini_arc_adb") {
"..:os_route",
"..:route_observer_behavior",
"../..:router",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/cr_elements/policy:cr_policy_indicator",
"//ui/webui/resources/cr_elements/policy:cr_policy_indicator_behavior",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:load_time_data.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}

js_library("crostini_arc_adb_confirmation_dialog") {
deps = [
":crostini_browser_proxy",
"..:metrics_recorder",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js" ]
externs_list = [
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
"//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js",
]
}

js_library("crostini_browser_proxy") {
Expand All @@ -79,11 +81,11 @@ js_library("crostini_disk_resize_dialog") {
deps = [
":crostini_browser_proxy",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
]
externs_list = [
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
"//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js",
"//ui/webui/resources/cr_elements/cr_slider/cr_slider_externs.js",
]
Expand All @@ -92,12 +94,13 @@ js_library("crostini_disk_resize_dialog") {
js_library("crostini_disk_resize_confirmation_dialog") {
deps = [
":crostini_browser_proxy",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js" ]
externs_list = [
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
"//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js",
]
}

js_library("crostini_export_import") {
Expand All @@ -110,21 +113,23 @@ js_library("crostini_export_import") {
"../..:router",
"../guest_os:guest_os_browser_proxy",
"../guest_os:guest_os_container_select",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}

js_library("crostini_import_confirmation_dialog") {
deps = [
":crostini_browser_proxy",
"../guest_os:guest_os_browser_proxy",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js" ]
externs_list = [
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
"//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js",
]
}

js_library("crostini_page") {
Expand All @@ -144,11 +149,12 @@ js_library("crostini_page") {
"../..:router",
"../guest_os:guest_os_shared_paths",
"../guest_os:guest_os_shared_usb_devices",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/cr_elements/policy:cr_policy_indicator",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js" ]
}

js_library("crostini_port_forwarding") {
Expand Down Expand Up @@ -177,12 +183,12 @@ js_library("crostini_port_forwarding_add_port_dialog") {
"..:metrics_recorder",
"../guest_os:guest_os_browser_proxy",
"../guest_os:guest_os_container_select",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:cr.m",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:load_time_data.m",
]
externs_list = [
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
"//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js",
"//ui/webui/resources/cr_elements/cr_input/cr_input_externs.js",
]
Expand Down Expand Up @@ -232,12 +238,14 @@ js_library("crostini_subpage") {
"..:route_observer_behavior",
"..:route_origin_behavior",
"../..:router",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:load_time_data.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
]
externs_list = [ "../settings_controls_types.js" ]
externs_list = [
"../settings_controls_types.js",
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
]
}

js_library("crostini_shared_usb_devices") {
Expand All @@ -257,12 +265,14 @@ js_library("bruschetta_subpage") {
"..:route_observer_behavior",
"..:route_origin_behavior",
"../..:router",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:load_time_data.m",
"//ui/webui/resources/js:web_ui_listener_behavior.m",
]
externs_list = [ "../settings_controls_types.js" ]
externs_list = [
"../settings_controls_types.js",
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
]
}

html_to_js("web_components") {
Expand Down
7 changes: 4 additions & 3 deletions chrome/browser/resources/settings/chromeos/guest_os/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,14 @@ js_library("guest_os_shared_usb_devices_add_dialog") {
":guest_os_browser_proxy",
":guest_os_container_select",
"..:metrics_recorder",
"//ui/webui/resources/cr_elements/cr_button:cr_button",
"//ui/webui/resources/js:cr.m",
"//ui/webui/resources/js:i18n_behavior.m",
"//ui/webui/resources/js:load_time_data.m",
]
externs_list =
[ "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js" ]
externs_list = [
"//ui/webui/resources/cr_elements/cr_button/cr_button_externs.js",
"//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js",
]
}

js_library("guest_os_shared_paths") {
Expand Down
Loading

0 comments on commit 05cbb64

Please sign in to comment.