Skip to content

Commit

Permalink
[OOBE][UpdateRequiredScreen] - Polymer3 Check-In
Browse files Browse the repository at this point in the history
Check-In a modularized version of the Update Required screen.

BUG=b:243382425

Change-Id: I3a92725104599f1219da47399e3d8df67a58d07a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3998942
Reviewed-by: Renato Silva <rrsilva@google.com>
Commit-Queue: Bohdan Tyshchenko <bohdanty@google.com>
Cr-Commit-Position: refs/heads/main@{#1067343}
  • Loading branch information
bohdanty authored and Chromium LUCI CQ committed Nov 4, 2022
1 parent 3804dfb commit c93dba7
Show file tree
Hide file tree
Showing 5 changed files with 262 additions and 234 deletions.
2 changes: 1 addition & 1 deletion chrome/browser/resources/chromeos/login/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@ preprocess_if_expr("preprocess_unconditional_autogenerated_modules") {
"screens/common/smart_privacy_protection.m.js",
"screens/common/sync_consent.m.js",
"screens/login/checking_downloading_update.m.js",
"screens/login/update_required_card.m.js",
"screens/oobe/enterprise_enrollment.m.js",
"screens/oobe/packaged_license.m.js",
"screens/oobe/quick_start.m.js",
Expand Down Expand Up @@ -301,6 +300,7 @@ preprocess_if_expr("preprocess_gen_js_files") {
"screens/login/lacros_data_migration.js",
"screens/login/management_transition.js",
"screens/login/offline_login.js",
"screens/login/update_required_card.js",
"screens/oobe/auto_enrollment_check.js",
"screens/oobe/demo_setup.js",
"screens/oobe/demo_preferences.js",
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/resources/chromeos/login/screens.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ import './screens/login/lacros_data_backward_migration.js';
import './screens/login/lacros_data_migration.js';
import './screens/login/management_transition.js';
import './screens/login/offline_login.js';
import './screens/login/update_required_card.m.js';
import './screens/login/update_required_card.js';
// SCREENS USED DURING THE OOBE FLOW
import './screens/oobe/auto_enrollment_check.js';
import './screens/oobe/demo_preferences.js';
Expand Down
23 changes: 6 additions & 17 deletions chrome/browser/resources/chromeos/login/screens/login/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ import("//tools/polymer/polymer.gni")
import("../../oobe_auto_imports.gni")

group("polymer3_elements") {
public_deps = [
":checking_downloading_update_module",
":update_required_card_module",
]
public_deps = [ ":checking_downloading_update_module" ]
}

js_type_check("closure_compile") {
Expand All @@ -28,7 +25,7 @@ js_type_check("closure_compile") {
":lacros_data_migration",
":management_transition",
":offline_login",
":update_required_card.m",
":update_required_card",
]
}

Expand Down Expand Up @@ -142,8 +139,8 @@ js_library("offline_login") {
[ "//ui/webui/resources/cr_elements/cr_dialog/cr_dialog_externs.js" ]
}

js_library("update_required_card.m") {
sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/screens/login/update_required_card.m.js" ]
js_library("update_required_card") {
sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/screens/login/update_required_card.js" ]
deps = [
":checking_downloading_update.m",
"../../components/behaviors:login_screen_behavior.m",
Expand All @@ -154,7 +151,7 @@ js_library("update_required_card.m") {
"../../components/dialogs:oobe_modal_dialog.m",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
]
extra_deps = [ ":update_required_card_module" ]
extra_deps = [ ":web_components" ]
externs_list = [ "$externs_path/tts.js" ]
}

Expand All @@ -172,15 +169,6 @@ js_library("checking_downloading_update.m") {
externs_list = [ "$externs_path/tts.js" ]
}

polymer_modulizer("update_required_card") {
js_file = "update_required_card.js"
html_file = "update_required_card.html"
html_type = "dom-module"
auto_imports = oobe_auto_imports
migrated_imports = oobe_migrated_imports
namespace_rewrites = oobe_namespace_rewrites
}

polymer_modulizer("checking_downloading_update") {
js_file = "checking_downloading_update.js"
html_file = "checking_downloading_update.html"
Expand All @@ -200,5 +188,6 @@ html_to_js("web_components") {
"lacros_data_migration.js",
"management_transition.js",
"offline_login.js",
"update_required_card.js",
]
}

0 comments on commit c93dba7

Please sign in to comment.