From 6e11c6d68228b6021b87ebc0edd050342a777bd1 Mon Sep 17 00:00:00 2001 From: Renato Silva Date: Mon, 19 Dec 2022 12:09:14 +0000 Subject: [PATCH] [OOBE] - Polymer3 - Check-in stylesheets Check-in all the stylesheets inside components/ that are reused by other components. Stylesheets are now being processed by the same tool that TypeScript WebUIs use -- 'css_to_wrapper'. Unfortunately it does not seem trivial to migrate each file separately. Indentations were kept in order for Git to properly identify a rename instead of a new file. The styles are now properly stored in .css files that become .css.js during runtime. Bug: b/250893501, b/260015687, b/250892709 Change-Id: I4570c8870b96cd1557c872cfaa8142981e5dbb61 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4110902 Reviewed-by: Danila Kuzmin Commit-Queue: Renato Silva Cr-Commit-Position: refs/heads/main@{#1084901} --- .../assistant_optin/assistant_loading.js | 2 +- .../assistant_optin/assistant_optin_flow.js | 2 +- .../assistant_optin/assistant_related_info.js | 2 +- .../assistant_optin/assistant_value_prop.js | 2 +- .../assistant_voice_match.html | 2 +- .../chromeos/assistant_optin/setting_zippy.js | 2 +- .../assistant_optin/voice_match_entry.html | 2 +- .../browser/resources/chromeos/login/BUILD.gn | 17 +++-- .../chromeos/login/components/BUILD.gn | 3 - .../components/buttons/oobe_back_button.js | 4 +- .../components/buttons/oobe_icon_button.js | 4 +- .../components/buttons/oobe_next_button.js | 4 +- .../components/buttons/oobe_text_button.js | 4 +- .../login/components/common_styles/BUILD.gn | 67 +++++++---------- ...mon_styles.html => oobe_common_styles.css} | 27 ++++--- ...tyles.html => oobe_dialog_host_styles.css} | 26 +++---- ...tyles.html => oobe_flex_layout_styles.css} | 24 +++---- .../dialogs/oobe_adaptive_dialog.js | 8 +-- .../components/dialogs/oobe_content_dialog.js | 6 +- .../components/dialogs/oobe_loading_dialog.js | 4 +- .../components/dialogs/oobe_modal_dialog.js | 2 +- .../chromeos/login/components/gaia_dialog.js | 4 +- .../chromeos/login/components/gaia_header.js | 2 +- .../login/components/gaia_input_form.js | 2 +- .../chromeos/login/components/hd_iron_icon.js | 2 +- .../login/components/notification_card.js | 2 +- .../login/components/oobe_a11y_option.js | 2 +- .../chromeos/login/components/oobe_slide.js | 2 +- .../login/components/oobe_vars/BUILD.gn | 71 ++++++++----------- ...tom_vars_css.html => oobe_custom_vars.css} | 22 +++--- ...a_css.html => oobe_custom_vars_remora.css} | 18 +++-- ...red_vars_css.html => oobe_shared_vars.css} | 25 ++++--- .../login/components/progress_list_item.js | 2 +- .../login/components/security_token_pin.js | 4 +- .../login/components/throbber_notice.js | 2 +- .../browser/resources/chromeos/login/oobe.js | 2 +- .../login/oobe_conditional_resources.grd | 4 +- .../login/screens/common/adb_sideloading.js | 4 +- .../login/screens/common/app_downloading.js | 4 +- .../screens/common/arc_terms_of_service.js | 4 +- .../login/screens/common/autolaunch.js | 4 +- .../chromeos/login/screens/common/choobe.js | 4 +- .../screens/common/consolidated_consent.js | 4 +- .../common/cryptohome_recovery_setup.js | 4 +- .../login/screens/common/device_disabled.js | 4 +- .../login/screens/common/enable_kiosk.js | 2 +- .../login/screens/common/error_message.js | 2 +- .../screens/common/family_link_notice.js | 4 +- .../login/screens/common/fingerprint_setup.js | 4 +- .../login/screens/common/gaia_signin.js | 4 +- .../screens/common/gesture_navigation.js | 4 +- .../login/screens/common/guest_tos.js | 4 +- .../screens/common/hw_data_collection.js | 4 +- .../login/screens/common/local_state_error.js | 4 +- .../common/managed_terms_of_service.js | 4 +- .../login/screens/common/marketing_opt_in.js | 4 +- .../login/screens/common/multidevice_setup.js | 2 +- .../login/screens/common/offline_ad_login.js | 4 +- .../login/screens/common/oobe_eula.js | 4 +- .../login/screens/common/oobe_reset.js | 4 +- .../login/screens/common/os_install.js | 4 +- .../chromeos/login/screens/common/os_trial.js | 4 +- .../login/screens/common/parental_handoff.js | 4 +- .../login/screens/common/pin_setup.js | 4 +- .../login/screens/common/recommend_apps.js | 2 +- .../screens/common/saml_confirm_password.js | 4 +- .../screens/common/signin_fatal_error.js | 4 +- .../common/smart_privacy_protection.js | 4 +- .../login/screens/common/sync_consent.js | 4 +- .../login/screens/common/theme_selection.js | 4 +- .../login/screens/common/tpm_error.js | 4 +- .../login/screens/common/user_creation.js | 4 +- .../login/screens/common/wrong_hwid.js | 4 +- .../login/active_directory_password_change.js | 4 +- .../login/checking_downloading_update.js | 4 +- .../screens/login/cryptohome_recovery.js | 4 +- .../screens/login/encryption_migration.js | 2 +- .../screens/login/gaia_password_changed.js | 4 +- .../login/lacros_data_backward_migration.js | 2 +- .../screens/login/lacros_data_migration.js | 2 +- .../screens/login/management_transition.js | 4 +- .../login/screens/login/offline_login.js | 2 +- .../screens/login/update_required_card.js | 4 +- .../login/screens/oobe/demo_preferences.js | 4 +- .../chromeos/login/screens/oobe/demo_setup.js | 4 +- .../login/screens/oobe/enable_debugging.js | 4 +- .../screens/oobe/enterprise_enrollment.js | 4 +- .../login/screens/oobe/hid_detection.js | 4 +- .../login/screens/oobe/oobe_network.js | 4 +- .../login/screens/oobe/packaged_license.js | 4 +- .../login/screens/oobe/quick_start.js | 2 +- .../chromeos/login/screens/oobe/update.js | 2 +- .../chromeos/login/screens/oobe/welcome.js | 4 +- .../login/screens/oobe/welcome_dialog.js | 4 +- chrome/browser/ui/webui/ash/login/oobe_ui.cc | 2 +- 95 files changed, 271 insertions(+), 319 deletions(-) rename chrome/browser/resources/chromeos/login/components/common_styles/{oobe_common_styles.html => oobe_common_styles.css} (78%) rename chrome/browser/resources/chromeos/login/components/common_styles/{oobe_dialog_host_styles.html => oobe_dialog_host_styles.css} (76%) rename chrome/browser/resources/chromeos/login/components/common_styles/{oobe_flex_layout_styles.html => oobe_flex_layout_styles.css} (88%) rename chrome/browser/resources/chromeos/login/components/oobe_vars/{oobe_custom_vars_css.html => oobe_custom_vars.css} (81%) rename chrome/browser/resources/chromeos/login/components/oobe_vars/{oobe_custom_vars_remora_css.html => oobe_custom_vars_remora.css} (82%) rename chrome/browser/resources/chromeos/login/components/oobe_vars/{oobe_shared_vars_css.html => oobe_shared_vars.css} (76%) diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_loading.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_loading.js index 1f2f03cec43ab..04651d579e439 100644 --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_loading.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_loading.js @@ -12,7 +12,7 @@ import '//resources/polymer/v3_0/iron-icon/iron-icon.js'; import '//resources/polymer/v3_0/paper-progress/paper-progress.js'; import '../components/buttons/oobe_text_button.js'; -import '../components/common_styles/oobe_dialog_host_styles.m.js'; +import '../components/common_styles/oobe_dialog_host_styles.css.js'; import '../components/dialogs/oobe_adaptive_dialog.js'; import '../components/dialogs/oobe_content_dialog.js'; import './assistant_icon.m.js'; diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_optin_flow.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_optin_flow.js index 599700f63a30d..ac92ebe10612e 100644 --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_optin_flow.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_optin_flow.js @@ -8,7 +8,7 @@ * */ -import '../components/common_styles/oobe_common_styles.m.js'; +import '../components/common_styles/oobe_common_styles.css.js'; import './assistant_common_styles.m.js'; import './assistant_icon.m.js'; import './assistant_loading.js'; diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js index 35bb2f870b99b..6d55a4bf0286d 100644 --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_related_info.js @@ -14,7 +14,7 @@ import '//resources/cr_elements/cr_lottie/cr_lottie.js'; import '//resources/polymer/v3_0/iron-icon/iron-icon.js'; import '../components/buttons/oobe_next_button.js'; import '../components/buttons/oobe_text_button.js'; -import '../components/common_styles/oobe_dialog_host_styles.m.js'; +import '../components/common_styles/oobe_dialog_host_styles.css.js'; import '../components/dialogs/oobe_adaptive_dialog.js'; import './assistant_common_styles.m.js'; import './assistant_icon.m.js'; diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js index 3ddf934dcf8cf..80c98900c4c84 100644 --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_value_prop.js @@ -16,7 +16,7 @@ import '//resources/polymer/v3_0/iron-icon/iron-icon.js'; import '../components/dialogs/oobe_adaptive_dialog.js'; import '../components/buttons/oobe_next_button.js'; import '../components/buttons/oobe_text_button.js'; -import '../components/common_styles/oobe_dialog_host_styles.m.js'; +import '../components/common_styles/oobe_dialog_host_styles.css.js'; import './assistant_common_styles.m.js'; import './assistant_icon.m.js'; import './setting_zippy.js'; diff --git a/chrome/browser/resources/chromeos/assistant_optin/assistant_voice_match.html b/chrome/browser/resources/chromeos/assistant_optin/assistant_voice_match.html index 2b7f5e6865ac7..7781f5f13792b 100644 --- a/chrome/browser/resources/chromeos/assistant_optin/assistant_voice_match.html +++ b/chrome/browser/resources/chromeos/assistant_optin/assistant_voice_match.html @@ -17,7 +17,7 @@ - + diff --git a/chrome/browser/resources/chromeos/assistant_optin/setting_zippy.js b/chrome/browser/resources/chromeos/assistant_optin/setting_zippy.js index 123b3f1e7d24d..ab2ea3643bf47 100644 --- a/chrome/browser/resources/chromeos/assistant_optin/setting_zippy.js +++ b/chrome/browser/resources/chromeos/assistant_optin/setting_zippy.js @@ -3,7 +3,7 @@ // found in the LICENSE file. import '//resources/cr_elements/cr_toggle/cr_toggle.js'; -import '../components/common_styles/oobe_common_styles.m.js'; +import '../components/common_styles/oobe_common_styles.css.js'; import './assistant_common_styles.m.js'; import {html, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/assistant_optin/voice_match_entry.html b/chrome/browser/resources/chromeos/assistant_optin/voice_match_entry.html index 9410d1f6c3635..be8d0319d7ee8 100644 --- a/chrome/browser/resources/chromeos/assistant_optin/voice_match_entry.html +++ b/chrome/browser/resources/chromeos/assistant_optin/voice_match_entry.html @@ -11,7 +11,7 @@ - + diff --git a/chrome/browser/resources/chromeos/login/BUILD.gn b/chrome/browser/resources/chromeos/login/BUILD.gn index 036f441fffb5b..adf25f8e7dba3 100644 --- a/chrome/browser/resources/chromeos/login/BUILD.gn +++ b/chrome/browser/resources/chromeos/login/BUILD.gn @@ -173,13 +173,15 @@ preprocess_if_expr("preprocess_unconditional_existing") { # Autogenerated files that are served conditionally preprocess_if_expr("preprocess_conditional_autogenerated_modules") { - deps = [ ":polymer3_elements" ] + deps = [ + ":polymer3_elements", + "components/oobe_vars:css_wrapper_files"] in_folder = target_gen_dir out_folder = "$target_gen_dir/$oobe_preprocessed_folder" out_manifest = "$target_gen_dir/$autogenerated_conditional_files_manifest" in_files = [ - "components/oobe_vars/oobe_custom_vars_css.m.js", - "components/oobe_vars/oobe_custom_vars_remora_css.m.js", + "components/oobe_vars/oobe_custom_vars.css.js", + "components/oobe_vars/oobe_custom_vars_remora.css.js", "debug/debug.m.js", "test_api/test_api.m.js", "test_api/no_test_api.m.js", @@ -198,10 +200,6 @@ preprocess_if_expr("preprocess_unconditional_autogenerated_modules") { out_folder = "$target_gen_dir/$oobe_preprocessed_folder" out_manifest = "$target_gen_dir/$autogenerated_unconditional_files_manifest" in_files = [ - "components/common_styles/oobe_common_styles.m.js", - "components/common_styles/oobe_dialog_host_styles.m.js", - "components/common_styles/oobe_flex_layout_styles.m.js", - "components/oobe_vars/oobe_shared_vars_css.m.js", "components/long_touch_detector.m.js", "components/oobe_icons.m.js", "components/oobe_network_icons.m.js", @@ -232,10 +230,14 @@ preprocess_if_expr("preprocess_gen_js_files") { "components/buttons/oobe_next_button.js", "components/buttons/oobe_text_button.js", "components/common_styles/cr_card_radio_group_styles.css.js", + "components/common_styles/oobe_common_styles.css.js", + "components/common_styles/oobe_dialog_host_styles.css.js", + "components/common_styles/oobe_flex_layout_styles.css.js", "components/dialogs/oobe_adaptive_dialog.js", "components/dialogs/oobe_content_dialog.js", "components/dialogs/oobe_loading_dialog.js", "components/dialogs/oobe_modal_dialog.js", + "components/oobe_vars/oobe_shared_vars.css.js", "components/gaia_button.js", "components/gaia_dialog.js", "components/gaia_header.js", @@ -334,6 +336,7 @@ group("generate_web_components") { "components/buttons:web_components", "components/common_styles:css_wrapper_files", "components/dialogs:web_components", + "components/oobe_vars:css_wrapper_files", "screens/common:web_components", "screens/login:web_components", "screens/oobe:web_components", diff --git a/chrome/browser/resources/chromeos/login/components/BUILD.gn b/chrome/browser/resources/chromeos/login/components/BUILD.gn index 93951707fe3c4..4ce32b0acc352 100644 --- a/chrome/browser/resources/chromeos/login/components/BUILD.gn +++ b/chrome/browser/resources/chromeos/login/components/BUILD.gn @@ -51,9 +51,6 @@ group("closure_compile") { group("polymer3_elements") { public_deps = [ - "common_styles:polymer3_elements", - "oobe_vars:polymer3_elements", - # Local targets ":oobe_icons_module", ":oobe_icons_module", diff --git a/chrome/browser/resources/chromeos/login/components/buttons/oobe_back_button.js b/chrome/browser/resources/chromeos/login/components/buttons/oobe_back_button.js index 6ddf07cfa29d2..83098b9627918 100644 --- a/chrome/browser/resources/chromeos/login/components/buttons/oobe_back_button.js +++ b/chrome/browser/resources/chromeos/login/components/buttons/oobe_back_button.js @@ -38,8 +38,8 @@ import '//resources/cr_elements/cr_button/cr_button.js'; import '//resources/cr_elements/cr_icons.css.js'; import '//resources/cr_elements/cr_shared_style.css.js'; import '//resources/polymer/v3_0/iron-icon/iron-icon.js'; -import '../common_styles/oobe_common_styles.m.js'; -import '../oobe_vars/oobe_custom_vars_css.m.js'; +import '../common_styles/oobe_common_styles.css.js'; +import '../oobe_vars/oobe_custom_vars.css.js'; import '../oobe_icons.m.js'; import {html} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/buttons/oobe_icon_button.js b/chrome/browser/resources/chromeos/login/components/buttons/oobe_icon_button.js index 9ba4685770e4b..4ee7830a41646 100644 --- a/chrome/browser/resources/chromeos/login/components/buttons/oobe_icon_button.js +++ b/chrome/browser/resources/chromeos/login/components/buttons/oobe_icon_button.js @@ -30,9 +30,9 @@ import '//resources/cr_elements/cr_button/cr_button.js'; import '//resources/cr_elements/cr_icons.css.js'; import '//resources/cr_elements/cr_shared_style.css.js'; -import '../common_styles/oobe_common_styles.m.js'; +import '../common_styles/oobe_common_styles.css.js'; import '../hd_iron_icon.js'; -import '../oobe_vars/oobe_custom_vars_css.m.js'; +import '../oobe_vars/oobe_custom_vars.css.js'; import {html} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/buttons/oobe_next_button.js b/chrome/browser/resources/chromeos/login/components/buttons/oobe_next_button.js index a32d504af2d5d..d6c7da6c9e9f6 100644 --- a/chrome/browser/resources/chromeos/login/components/buttons/oobe_next_button.js +++ b/chrome/browser/resources/chromeos/login/components/buttons/oobe_next_button.js @@ -39,8 +39,8 @@ import '//resources/cr_elements/cr_button/cr_button.js'; import '//resources/cr_elements/cr_icons.css.js'; import '//resources/cr_elements/cr_shared_style.css.js'; import '//resources/polymer/v3_0/iron-icon/iron-icon.js'; -import '../common_styles/oobe_common_styles.m.js'; -import '../oobe_vars/oobe_custom_vars_css.m.js'; +import '../common_styles/oobe_common_styles.css.js'; +import '../oobe_vars/oobe_custom_vars.css.js'; import '../oobe_icons.m.js'; import {html} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/buttons/oobe_text_button.js b/chrome/browser/resources/chromeos/login/components/buttons/oobe_text_button.js index aff3ea670477d..744c7774526de 100644 --- a/chrome/browser/resources/chromeos/login/components/buttons/oobe_text_button.js +++ b/chrome/browser/resources/chromeos/login/components/buttons/oobe_text_button.js @@ -32,8 +32,8 @@ import '//resources/cr_elements/cr_button/cr_button.js'; import '//resources/cr_elements/cr_shared_style.css.js'; import '//resources/polymer/v3_0/paper-styles/color.js'; -import '../common_styles/oobe_common_styles.m.js'; -import '../oobe_vars/oobe_custom_vars_css.m.js'; +import '../common_styles/oobe_common_styles.css.js'; +import '../oobe_vars/oobe_custom_vars.css.js'; import {html} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/common_styles/BUILD.gn b/chrome/browser/resources/chromeos/login/components/common_styles/BUILD.gn index 4a6789a100e12..e4db4dfdbd57f 100644 --- a/chrome/browser/resources/chromeos/login/components/common_styles/BUILD.gn +++ b/chrome/browser/resources/chromeos/login/components/common_styles/BUILD.gn @@ -9,31 +9,27 @@ import("//tools/polymer/polymer.gni") js_type_check("closure_compile") { is_polymer3 = true deps = [ - ":oobe_common_styles.m", + ":oobe_common_styles.css", ":cr_card_radio_group_styles.css", - ":oobe_dialog_host_styles.m", - ":oobe_flex_layout_styles.m", + ":oobe_dialog_host_styles.css", + ":oobe_flex_layout_styles.css", ] } -group("polymer3_elements") { - public_deps = [ - ":oobe_common_styles_module", - ":oobe_dialog_host_styles_module", - ":oobe_flex_layout_styles_module", +js_library("oobe_common_styles.css") { + sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/common_styles/oobe_common_styles.css.js" ] + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", ] + extra_deps = [ ":css_wrapper_files" ] } -js_library("oobe_common_styles.m") { - sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/common_styles/oobe_common_styles.m.js" ] - deps = [] - extra_deps = [ ":oobe_common_styles_module" ] -} - -js_library("oobe_dialog_host_styles.m") { - sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/common_styles/oobe_dialog_host_styles.m.js" ] - deps = [] - extra_deps = [ ":oobe_dialog_host_styles_module" ] +js_library("oobe_dialog_host_styles.css") { + sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/common_styles/oobe_dialog_host_styles.css.js" ] + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + extra_deps = [ ":css_wrapper_files" ] } js_library("cr_card_radio_group_styles.css") { @@ -44,31 +40,20 @@ js_library("cr_card_radio_group_styles.css") { extra_deps = [ ":css_wrapper_files" ] } -js_library("oobe_flex_layout_styles.m") { - sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/common_styles/oobe_flex_layout_styles.m.js" ] - deps = [] - extra_deps = [ ":oobe_flex_layout_styles_module" ] -} - -polymer_modulizer("oobe_common_styles") { - js_file = "oobe_common_styles.m.js" - html_file = "oobe_common_styles.html" - html_type = "style-module" -} - -polymer_modulizer("oobe_dialog_host_styles") { - js_file = "oobe_dialog_host_styles.m.js" - html_file = "oobe_dialog_host_styles.html" - html_type = "style-module" -} - -polymer_modulizer("oobe_flex_layout_styles") { - js_file = "oobe_flex_layout_styles.m.js" - html_file = "oobe_flex_layout_styles.html" - html_type = "style-module" +js_library("oobe_flex_layout_styles.css") { + sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/common_styles/oobe_flex_layout_styles.css.js" ] + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + extra_deps = [ ":css_wrapper_files" ] } css_to_wrapper("css_wrapper_files") { - in_files = [ "cr_card_radio_group_styles.css" ] + in_files = [ + "cr_card_radio_group_styles.css", + "oobe_common_styles.css", + "oobe_dialog_host_styles.css", + "oobe_flex_layout_styles.css", + ] use_js = true } diff --git a/chrome/browser/resources/chromeos/login/components/common_styles/oobe_common_styles.html b/chrome/browser/resources/chromeos/login/components/common_styles/oobe_common_styles.css similarity index 78% rename from chrome/browser/resources/chromeos/login/components/common_styles/oobe_common_styles.html rename to chrome/browser/resources/chromeos/login/components/common_styles/oobe_common_styles.css index f12c5a9647385..9dbd195a23bf4 100644 --- a/chrome/browser/resources/chromeos/login/components/common_styles/oobe_common_styles.html +++ b/chrome/browser/resources/chromeos/login/components/common_styles/oobe_common_styles.css @@ -1,16 +1,16 @@ - +/* Copyright 2020 The Chromium Authors + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ - - - +/* #css_wrapper_metadata_start + * #type=style + * #import=../oobe_vars/oobe_custom_vars.css.js + * #import=../oobe_vars/oobe_shared_vars.css.js + * #import=./oobe_flex_layout_styles.css.js + * #include=oobe-flex-layout-styles + * #css_wrapper_metadata_end */ - - - diff --git a/chrome/browser/resources/chromeos/login/components/common_styles/oobe_dialog_host_styles.html b/chrome/browser/resources/chromeos/login/components/common_styles/oobe_dialog_host_styles.css similarity index 76% rename from chrome/browser/resources/chromeos/login/components/common_styles/oobe_dialog_host_styles.html rename to chrome/browser/resources/chromeos/login/components/common_styles/oobe_dialog_host_styles.css index 0bcb590ec0b7e..7a9e561370ad1 100644 --- a/chrome/browser/resources/chromeos/login/components/common_styles/oobe_dialog_host_styles.html +++ b/chrome/browser/resources/chromeos/login/components/common_styles/oobe_dialog_host_styles.css @@ -1,16 +1,15 @@ - +/* Copyright 2021 The Chromium Authors + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ - - - - - - - diff --git a/chrome/browser/resources/chromeos/login/components/common_styles/oobe_flex_layout_styles.html b/chrome/browser/resources/chromeos/login/components/common_styles/oobe_flex_layout_styles.css similarity index 88% rename from chrome/browser/resources/chromeos/login/components/common_styles/oobe_flex_layout_styles.html rename to chrome/browser/resources/chromeos/login/components/common_styles/oobe_flex_layout_styles.css index 8df3900785b02..859f698b73796 100644 --- a/chrome/browser/resources/chromeos/login/components/common_styles/oobe_flex_layout_styles.html +++ b/chrome/browser/resources/chromeos/login/components/common_styles/oobe_flex_layout_styles.css @@ -1,18 +1,15 @@ - + */ - +/* #css_wrapper_metadata_start + * #type=style + * #css_wrapper_metadata_end */ - - - diff --git a/chrome/browser/resources/chromeos/login/components/dialogs/oobe_adaptive_dialog.js b/chrome/browser/resources/chromeos/login/components/dialogs/oobe_adaptive_dialog.js index 55bba72dcaf52..1a7b711b32f17 100644 --- a/chrome/browser/resources/chromeos/login/components/dialogs/oobe_adaptive_dialog.js +++ b/chrome/browser/resources/chromeos/login/components/dialogs/oobe_adaptive_dialog.js @@ -18,10 +18,10 @@ import '//resources/cr_elements/cr_shared_style.css.js'; import '//resources/ash/common/cr_scrollable_behavior.js'; import '//resources/cr_elements/cr_lazy_render/cr_lazy_render.js'; -import '../common_styles/oobe_common_styles.m.js'; -import '../common_styles/oobe_dialog_host_styles.m.js'; -import '../oobe_vars/oobe_custom_vars_css.m.js'; -import '../oobe_vars/oobe_shared_vars_css.m.js'; +import '../common_styles/oobe_common_styles.css.js'; +import '../common_styles/oobe_dialog_host_styles.css.js'; +import '../oobe_vars/oobe_custom_vars.css.js'; +import '../oobe_vars/oobe_shared_vars.css.js'; /** @polymer */ export class OobeAdaptiveDialog extends PolymerElement { diff --git a/chrome/browser/resources/chromeos/login/components/dialogs/oobe_content_dialog.js b/chrome/browser/resources/chromeos/login/components/dialogs/oobe_content_dialog.js index b8d9ae064b8d0..2d7131f141ef1 100644 --- a/chrome/browser/resources/chromeos/login/components/dialogs/oobe_content_dialog.js +++ b/chrome/browser/resources/chromeos/login/components/dialogs/oobe_content_dialog.js @@ -5,9 +5,9 @@ import '//resources/polymer/v3_0/paper-styles/color.js'; import '//resources/cr_elements/cr_shared_style.css.js'; import '//resources/cr_elements/cr_lazy_render/cr_lazy_render.js'; -import '../common_styles/oobe_common_styles.m.js'; -import '../common_styles/oobe_dialog_host_styles.m.js'; -import '../oobe_vars/oobe_shared_vars_css.m.js'; +import '../common_styles/oobe_common_styles.css.js'; +import '../common_styles/oobe_dialog_host_styles.css.js'; +import '../oobe_vars/oobe_shared_vars.css.js'; import {html, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/dialogs/oobe_loading_dialog.js b/chrome/browser/resources/chromeos/login/components/dialogs/oobe_loading_dialog.js index 09c94e1614a0c..d6cd3a5e4c930 100644 --- a/chrome/browser/resources/chromeos/login/components/dialogs/oobe_loading_dialog.js +++ b/chrome/browser/resources/chromeos/login/components/dialogs/oobe_loading_dialog.js @@ -6,8 +6,8 @@ import '//resources/polymer/v3_0/paper-spinner/paper-spinner-lite.js'; import '//resources/polymer/v3_0/paper-styles/color.js'; import '../oobe_cr_lottie.js'; import '../buttons/oobe_text_button.js'; -import '../common_styles/oobe_common_styles.m.js'; -import '../common_styles/oobe_dialog_host_styles.m.js'; +import '../common_styles/oobe_common_styles.css.js'; +import '../common_styles/oobe_dialog_host_styles.css.js'; import './oobe_adaptive_dialog.js'; import './oobe_content_dialog.js'; diff --git a/chrome/browser/resources/chromeos/login/components/dialogs/oobe_modal_dialog.js b/chrome/browser/resources/chromeos/login/components/dialogs/oobe_modal_dialog.js index 0447c16c954f8..91528d51ee8a2 100644 --- a/chrome/browser/resources/chromeos/login/components/dialogs/oobe_modal_dialog.js +++ b/chrome/browser/resources/chromeos/login/components/dialogs/oobe_modal_dialog.js @@ -24,7 +24,7 @@ import '//resources/polymer/v3_0/paper-styles/color.js'; import '//resources/cr_elements/cr_dialog/cr_dialog.js'; import '//resources/cr_elements/cr_shared_style.css.js'; import '../buttons/oobe_text_button.js'; -import '../common_styles/oobe_common_styles.m.js'; +import '../common_styles/oobe_common_styles.css.js'; import {html, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/gaia_dialog.js b/chrome/browser/resources/chromeos/login/components/gaia_dialog.js index f300699efaac4..9fd630a727d1a 100644 --- a/chrome/browser/resources/chromeos/login/components/gaia_dialog.js +++ b/chrome/browser/resources/chromeos/login/components/gaia_dialog.js @@ -22,8 +22,8 @@ import '//resources/cr_elements/icons.html.js'; import '//resources/cr_elements/cr_shared_style.css.js'; import './buttons/oobe_back_button.js'; import './buttons/oobe_text_button.js'; -import './common_styles/oobe_common_styles.m.js'; -import './common_styles/oobe_dialog_host_styles.m.js'; +import './common_styles/oobe_common_styles.css.js'; +import './common_styles/oobe_dialog_host_styles.css.js'; import './dialogs/oobe_content_dialog.js'; import {sendWithPromise} from '//resources/ash/common/cr.m.js'; diff --git a/chrome/browser/resources/chromeos/login/components/gaia_header.js b/chrome/browser/resources/chromeos/login/components/gaia_header.js index cdfd2eb723c77..b9de3adb6e01f 100644 --- a/chrome/browser/resources/chromeos/login/components/gaia_header.js +++ b/chrome/browser/resources/chromeos/login/components/gaia_header.js @@ -14,7 +14,7 @@ * 'email' - displayed email. */ -import './common_styles/oobe_common_styles.m.js'; +import './common_styles/oobe_common_styles.css.js'; import {html, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/gaia_input_form.js b/chrome/browser/resources/chromeos/login/components/gaia_input_form.js index a33cd7e6bc510..ef293619ecfd9 100644 --- a/chrome/browser/resources/chromeos/login/components/gaia_input_form.js +++ b/chrome/browser/resources/chromeos/login/components/gaia_input_form.js @@ -24,7 +24,7 @@ * */ -import './common_styles/oobe_common_styles.m.js'; +import './common_styles/oobe_common_styles.css.js'; import './gaia_button.js'; import {dom, html, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/hd_iron_icon.js b/chrome/browser/resources/chromeos/login/components/hd_iron_icon.js index 5b0790d3d0443..73659153e0003 100644 --- a/chrome/browser/resources/chromeos/login/components/hd_iron_icon.js +++ b/chrome/browser/resources/chromeos/login/components/hd_iron_icon.js @@ -20,7 +20,7 @@ */ import '//resources/polymer/v3_0/iron-icon/iron-icon.js'; -import './common_styles/oobe_common_styles.m.js'; +import './common_styles/oobe_common_styles.css.js'; import {html, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/notification_card.js b/chrome/browser/resources/chromeos/login/components/notification_card.js index e405f25841df5..527354423ee34 100644 --- a/chrome/browser/resources/chromeos/login/components/notification_card.js +++ b/chrome/browser/resources/chromeos/login/components/notification_card.js @@ -7,7 +7,7 @@ import '//resources/js/action_link.js'; import '//resources/polymer/v3_0/iron-icon/iron-icon.js'; import '//resources/polymer/v3_0/paper-styles/color.js'; import './oobe_icons.m.js'; -import './common_styles/oobe_common_styles.m.js'; +import './common_styles/oobe_common_styles.css.js'; import {html, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/oobe_a11y_option.js b/chrome/browser/resources/chromeos/login/components/oobe_a11y_option.js index f11fa8182200a..b5778a8000620 100644 --- a/chrome/browser/resources/chromeos/login/components/oobe_a11y_option.js +++ b/chrome/browser/resources/chromeos/login/components/oobe_a11y_option.js @@ -4,7 +4,7 @@ import '//resources/cr_elements/cr_toggle/cr_toggle.js'; import '//resources/cr_elements/cr_shared_vars.css.js'; -import './common_styles/oobe_common_styles.m.js'; +import './common_styles/oobe_common_styles.css.js'; import {html, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/oobe_slide.js b/chrome/browser/resources/chromeos/login/components/oobe_slide.js index 623373076b445..2f6dd61afd863 100644 --- a/chrome/browser/resources/chromeos/login/components/oobe_slide.js +++ b/chrome/browser/resources/chromeos/login/components/oobe_slide.js @@ -18,7 +18,7 @@ * is-warning - changes title slot color from blue to red. */ -import './common_styles/oobe_dialog_host_styles.m.js'; +import './common_styles/oobe_dialog_host_styles.css.js'; import {html, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/oobe_vars/BUILD.gn b/chrome/browser/resources/chromeos/login/components/oobe_vars/BUILD.gn index aa97364e3c651..bc95e953bed32 100644 --- a/chrome/browser/resources/chromeos/login/components/oobe_vars/BUILD.gn +++ b/chrome/browser/resources/chromeos/login/components/oobe_vars/BUILD.gn @@ -2,62 +2,47 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//chrome/browser/resources/chromeos/login/oobe_auto_imports.gni") import("//third_party/closure_compiler/compile_js.gni") -import("//tools/polymer/polymer.gni") +import("//tools/polymer/css_to_wrapper.gni") js_type_check("closure_compile") { is_polymer3 = true deps = [ - ":oobe_custom_vars_css.m", - ":oobe_custom_vars_remora_css.m", - ":oobe_shared_vars_css.m", + ":oobe_custom_vars.css", + ":oobe_custom_vars_remora.css", + ":oobe_shared_vars.css", ] } -group("polymer3_elements") { - public_deps = [ - ":oobe_custom_vars_css_module", - ":oobe_custom_vars_remora_css_module", - ":oobe_shared_vars_css_module", +js_library("oobe_custom_vars.css") { + sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars.css.js" ] + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", ] + extra_deps = [ ":css_wrapper_files" ] } -js_library("oobe_custom_vars_css.m") { - sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_css.m.js" ] - deps = [] - extra_deps = [ ":oobe_custom_vars_css_module" ] -} - -js_library("oobe_custom_vars_remora_css.m") { - sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_remora_css.m.js" ] - deps = [] - extra_deps = [ ":oobe_custom_vars_remora_css_module" ] -} - -js_library("oobe_shared_vars_css.m") { - sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_shared_vars_css.m.js" ] - deps = [] - extra_deps = [ ":oobe_shared_vars_css_module" ] -} - -polymer_modulizer("oobe_custom_vars_css") { - js_file = "oobe_custom_vars_css.m.js" - html_file = "oobe_custom_vars_css.html" - html_type = "custom-style" - migrated_imports = oobe_migrated_imports +js_library("oobe_custom_vars_remora.css") { + sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_remora.css.js" ] + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + extra_deps = [ ":css_wrapper_files" ] } -polymer_modulizer("oobe_custom_vars_remora_css") { - js_file = "oobe_custom_vars_remora_css.m.js" - html_file = "oobe_custom_vars_remora_css.html" - html_type = "custom-style" - migrated_imports = oobe_migrated_imports +js_library("oobe_shared_vars.css") { + sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_shared_vars.css.js" ] + deps = [ + "//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled", + ] + extra_deps = [ ":css_wrapper_files" ] } -polymer_modulizer("oobe_shared_vars_css") { - js_file = "oobe_shared_vars_css.m.js" - html_file = "oobe_shared_vars_css.html" - html_type = "custom-style" - migrated_imports = oobe_migrated_imports +css_to_wrapper("css_wrapper_files") { + in_files = [ + "oobe_custom_vars.css", + "oobe_custom_vars_remora.css", + "oobe_shared_vars.css", + ] + use_js = true } diff --git a/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_css.html b/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars.css similarity index 81% rename from chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_css.html rename to chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars.css index b6dd06e02fae6..c354e4bf5d1e1 100644 --- a/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_css.html +++ b/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars.css @@ -1,19 +1,19 @@ - +/* Copyright 2021 The Chromium Authors + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ - +/* #css_wrapper_metadata_start + * #type=vars + * #import=chrome://resources/cr_elements/cr_shared_vars.css.js + * #css_wrapper_metadata_end */ - - - diff --git a/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_remora_css.html b/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_remora.css similarity index 82% rename from chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_remora_css.html rename to chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_remora.css index 9f4feae594163..0a9976d8afa98 100644 --- a/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_remora_css.html +++ b/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_custom_vars_remora.css @@ -1,13 +1,13 @@ - +/* Copyright 2021 The Chromium Authors + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ - +/* #css_wrapper_metadata_start + * #type=vars + * #import=chrome://resources/cr_elements/cr_shared_vars.css.js + * #css_wrapper_metadata_end */ - - - diff --git a/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_shared_vars_css.html b/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_shared_vars.css similarity index 76% rename from chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_shared_vars_css.html rename to chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_shared_vars.css index 985b4b4db9485..c2f1ac4760759 100644 --- a/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_shared_vars_css.html +++ b/chrome/browser/resources/chromeos/login/components/oobe_vars/oobe_shared_vars.css @@ -1,14 +1,15 @@ - +/* Copyright 2021 The Chromium Authors + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ - - - diff --git a/chrome/browser/resources/chromeos/login/components/progress_list_item.js b/chrome/browser/resources/chromeos/login/components/progress_list_item.js index deb4b9cb8a0e7..f52a00700c2fe 100644 --- a/chrome/browser/resources/chromeos/login/components/progress_list_item.js +++ b/chrome/browser/resources/chromeos/login/components/progress_list_item.js @@ -5,7 +5,7 @@ import '//resources/cr_elements/icons.html.js'; import '//resources/polymer/v3_0/iron-icon/iron-icon.js'; import '//resources/polymer/v3_0/paper-spinner/paper-spinner-lite.js'; -import './common_styles/oobe_common_styles.m.js'; +import './common_styles/oobe_common_styles.css.js'; import {html, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/security_token_pin.js b/chrome/browser/resources/chromeos/login/components/security_token_pin.js index 4d804ddb25749..1924f353b9088 100644 --- a/chrome/browser/resources/chromeos/login/components/security_token_pin.js +++ b/chrome/browser/resources/chromeos/login/components/security_token_pin.js @@ -13,8 +13,8 @@ import '//resources/cr_elements/icons.html.js'; import './oobe_icons.m.js'; import './buttons/oobe_back_button.js'; import './buttons/oobe_next_button.js'; -import './common_styles/oobe_common_styles.m.js'; -import './common_styles/oobe_dialog_host_styles.m.js'; +import './common_styles/oobe_common_styles.css.js'; +import './common_styles/oobe_dialog_host_styles.css.js'; import './dialogs/oobe_adaptive_dialog.js'; import {html, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/components/throbber_notice.js b/chrome/browser/resources/chromeos/login/components/throbber_notice.js index 47d95bef0837d..04f6a2159e9c7 100644 --- a/chrome/browser/resources/chromeos/login/components/throbber_notice.js +++ b/chrome/browser/resources/chromeos/login/components/throbber_notice.js @@ -5,7 +5,7 @@ import '//resources/polymer/v3_0/paper-spinner/paper-spinner-lite.js'; import '//resources/polymer/v3_0/paper-styles/color.js'; import '//resources/cr_elements/chromeos/cros_color_overrides.css.js'; -import './common_styles/oobe_common_styles.m.js'; +import './common_styles/oobe_common_styles.css.js'; import {html, mixinBehaviors, PolymerElement} from '//resources/polymer/v3_0/polymer/polymer_bundled.min.js'; diff --git a/chrome/browser/resources/chromeos/login/oobe.js b/chrome/browser/resources/chromeos/login/oobe.js index e118736a29803..4228bac4bd520 100644 --- a/chrome/browser/resources/chromeos/login/oobe.js +++ b/chrome/browser/resources/chromeos/login/oobe.js @@ -13,7 +13,7 @@ import 'chrome://oobe/components/test_util.m.js'; import 'chrome://oobe/test_api/test_api.m.js'; import {commonScreensList, loginScreensList, oobeScreensList} from 'chrome://oobe/screens.js'; import {MultiTapDetector} from './multi_tap_detector.js'; -import './components/common_styles/oobe_flex_layout_styles.m.js'; +import './components/common_styles/oobe_flex_layout_styles.css.js'; // clang-format on /** diff --git a/chrome/browser/resources/chromeos/login/oobe_conditional_resources.grd b/chrome/browser/resources/chromeos/login/oobe_conditional_resources.grd index 0bf0a26b08858..81df790385f45 100644 --- a/chrome/browser/resources/chromeos/login/oobe_conditional_resources.grd +++ b/chrome/browser/resources/chromeos/login/oobe_conditional_resources.grd @@ -19,9 +19,9 @@ + file="${root_gen_dir}/chrome/browser/resources/chromeos/login/oobe_preprocessed/components/oobe_vars/oobe_custom_vars.css.js" /> + file="${root_gen_dir}/chrome/browser/resources/chromeos/login/oobe_preprocessed/components/oobe_vars/oobe_custom_vars_remora.css.js" />