chrome/browser/resources/chromeos/login/oobe_screen_reset.html - Issue 609803002: UI rework for reset options including Rollback.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/chromeos/login/oobe_screen_reset.html

Issue 609803002: UI rework for reset options including Rollback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Strings and views nits. Rollback view is unset on screen cancel. Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_screen_reset.css ('k') | chrome/browser/resources/chromeos/login/oobe_screen_reset.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/chromeos/login/oobe_screen_reset.html

diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_reset.html b/chrome/browser/resources/chromeos/login/oobe_screen_reset.html

index 47aca9c497790d8ee63ffd24d1c2a179e956bb9e..52666c554e50bf81e9657cefadbbd4e316276440 100644

--- a/chrome/browser/resources/chromeos/login/oobe_screen_reset.html

+++ b/chrome/browser/resources/chromeos/login/oobe_screen_reset.html

@@ -3,34 +3,24 @@

<div id="reset-warning-msg" i18n-content="resetWarningTitle"

class="revert-promise-specific restart-required-specific

- powerwash-proposal-specific">

+ powerwash-proposal-specific rollback-proposal-specific">

</div>

- <div id="powerwash-warning-msg"

- i18n-content="resetPowerwashWarningTitle"

- class="powerwash-confirm-specific">

- </div>

- <div id="powerwash-and-rollback-warning-msg"

- i18n-content="resetPowerwasAndRollbackhWarningTitle"

- class="rollback-confirm-specific"></div>

<img id="reset-warning-icon" src="chrome://theme/IDR_RESET_WARNING"

i18n-values="alt:resetScreenIconTitle">

<div id="reset-info"

- class="reset-text powerwash-proposal-specific powerwash-confirm-specific

- rollback-confirm-specific restart-required-specific">

+ class="reset-text powerwash-proposal-specific rollback-proposal-specific

+ restart-required-specific">

<div id="powerwash-warning-details"

i18n-content="resetPowerwashWarningDetails"

class="powerwash-proposal-specific">

</div>

- <div id="powerwash-confirmation-details"

- i18n-content="resetPowerwashConfirmationDetails"

- class="reset-text powerwash-confirm-specific">

+ <div id="rollback-warning-details"

+ i18n-content="resetPowerwashRollbackWarningDetails"

+ class="rollback-proposal-specific">

</div>

- <div id="powerwash-and-rollback-confirmation-details"

- i18n-content="resetPowerwashRollbackConfirmationDetails"

- class="reset-text rollback-confirm-specific"></div>

<div id="reset-warning-data-details"

class="reset-text powerwash-proposal-specific

- powerwash-confirm-specific rollback-confirm-specific"

+ rollback-proposal-specific"

i18n-content="resetWarningDataDetails">

</div>

<div id="reset-warning-restart" i18n-content="resetRestartMessage"