Skip to content

Commit

Permalink
[OOBE] update TS migration
Browse files Browse the repository at this point in the history
Bug: b/314762334
Change-Id: I16ff7b36b3187350ffef4abff6fee03374b881a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5147211
Reviewed-by: Danila Kuzmin <dkuzmin@google.com>
Commit-Queue: Simon Ziegltrum <ziegltrum@google.com>
Cr-Commit-Position: refs/heads/main@{#1243965}
  • Loading branch information
Simon Ziegltrum authored and Chromium LUCI CQ committed Jan 8, 2024
1 parent 2ff0acc commit 3a54ff1
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 113 deletions.
2 changes: 1 addition & 1 deletion chrome/browser/resources/chromeos/login/login.gni
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ oobe_screens_js_files = [
"screens/oobe/hid_detection.js",
"screens/oobe/oobe_network.js",
"screens/oobe/packaged_license.ts",
"screens/oobe/update.js",
"screens/oobe/update.ts",
"screens/oobe/welcome.js",
"screens/oobe/welcome_dialog.js",
]
Expand Down
14 changes: 0 additions & 14 deletions chrome/browser/resources/chromeos/login/screens/oobe/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ js_type_check("closure_compile") {
":enterprise_enrollment",
":hid_detection",
":oobe_network",
":update",
":welcome",
":welcome_dialog",
]
Expand Down Expand Up @@ -91,19 +90,6 @@ js_library("oobe_network") {
extra_deps = [ ":web_components" ]
}

js_library("update") {
sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/screens/oobe/update.js" ]
deps = [
"../../components:oobe_slide",
"../../components/behaviors:login_screen_behavior",
"../../components/behaviors:multi_step_behavior",
"../../components/behaviors:oobe_i18n_behavior",
"../../components/dialogs:oobe_adaptive_dialog",
"//third_party/polymer/v3_0/components-chromium/polymer:polymer_bundled",
]
extra_deps = [ ":web_components" ]
}

js_library("welcome") {
sources = [ "$root_gen_dir/chrome/browser/resources/chromeos/login/screens/oobe/welcome.js" ]
deps = [
Expand Down
12 changes: 6 additions & 6 deletions chrome/browser/resources/chromeos/login/screens/oobe/update.html
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ <h1 slot="title">
</div>
<div slot="back-navigation">
<oobe-back-button id="cellular-permission-back" inverse
on-click="onBackClicked_"></oobe-back-button>
on-click="onBackClicked"></oobe-back-button>
</div>
<div slot="bottom-buttons">
<oobe-next-button id="cellular-permission-next" inverse
on-click="onNextClicked_"></oobe-next-button>
on-click="onNextClicked"></oobe-next-button>
</div>
</oobe-adaptive-dialog>
<oobe-adaptive-dialog footer-shrinkable id="checking-for-updates-dialog"
Expand Down Expand Up @@ -110,17 +110,17 @@ <h1 slot="title">
<div hidden="[[showLowBatteryWarning]]" id="carousel" class="slide-view"
slot="content">
<oobe-carousel
auto-transition="[[getAutoTransition_(uiStep, autoTransition)]]"
auto-transition="[[getAutoTransition(uiStep, autoTransition)]]"
slide-label="slideLabel"
selected-button-label="slideSelectedButtonLabel"
unselected-button-label="slideUnselectedButtonLabel">
<oobe-slide slot="slides">
<iron-icon slot="slide-img" icon="oobe-illos:update-no-waiting-illo"
class="illustration-jelly">
</iron-icon>
<div slot="title">[[getUpdateSlideTitle_(locale, isOptOutEnabled)]]
<div slot="title">[[getUpdateSlideTitle(locale, isOptOutEnabled)]]
</div>
<div slot="text">[[getUpdateSlideText_(locale, isOptOutEnabled)]]
<div slot="text">[[getUpdateSlideText(locale, isOptOutEnabled)]]
</div>
</oobe-slide>
<oobe-slide slot="slides">
Expand Down Expand Up @@ -182,6 +182,6 @@ <h1 slot="title">
</div>
<div slot="bottom-buttons">
<oobe-next-button id="opt-out-info-next" class="focus-on-show" inverse
on-click="onOptOutInfoNext_"></oobe-next-button>
on-click="onOptOutInfoNext"></oobe-next-button>
</div>
</oobe-adaptive-dialog>

0 comments on commit 3a54ff1

Please sign in to comment.