Chromium Code Reviews| Index: chrome/browser/resources/chromeos/login/oobe_update.html |
| diff --git a/chrome/browser/resources/chromeos/login/oobe_eula.html b/chrome/browser/resources/chromeos/login/oobe_update.html |
| similarity index 51% |
| copy from chrome/browser/resources/chromeos/login/oobe_eula.html |
| copy to chrome/browser/resources/chromeos/login/oobe_update.html |
| index b82c146a3c4ae01729f3697c0d625f229e66424c..3fe8856a6898e4b3b4bcf0d8d82f161d5de49724 100644 |
| --- a/chrome/browser/resources/chromeos/login/oobe_eula.html |
| +++ b/chrome/browser/resources/chromeos/login/oobe_update.html |
| @@ -5,10 +5,10 @@ |
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/iron-iconset-svg/iron-iconset-svg.html"> |
| -<link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html"> |
| +<link rel="import" href="chrome://resources/polymer/v1_0/paper-progress/paper-progress.html"> |
| <link rel="import" href="chrome://resources/polymer/v1_0/paper-styles/color.html"> |
| -<iron-iconset-svg name="oobe-eula" size="24"> |
| +<iron-iconset-svg name="oobe-update" size="24"> |
| <svg> |
| <defs> |
| <!-- The Google "G" icon (copied from md-settings). --> |
| @@ -23,47 +23,40 @@ |
| </svg> |
| </iron-iconset-svg> |
| -<dom-module name="oobe-eula-md"> |
| +<dom-module name="oobe-update-md"> |
| <template> |
| - <link rel="stylesheet" href="oobe_eula.css"> |
| + <link rel="stylesheet" href="oobe_update.css"> |
| <link rel="stylesheet" href="oobe_dialog_parameters.css"> |
| - <oobe-dialog hidden="[[!eulaLoadingScreenShown]]" |
| - has-buttons> |
| - <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon> |
| + <oobe-dialog hidden="[[!checkingForUpdate]]"> |
| + <iron-icon icon="oobe-update:googleg" class="oobe-icon"></iron-icon> |
| <div class="header"> |
| - <h1 class="title" i18n-content="termsOfServiceLoading"></h1> |
| + <h1 class="title" i18n-content="checkingForUpdates"></h1> |
| + <div class="subtitle" i18n-content="checkingForUpdatesMsg"></div> |
| + <div class="subtitle" id="cancelHint1" i18n-content="cancelUpdateHint" |
|
michaelpg
2016/10/05 21:51:42
nit: use clearer names, e.g. cancelCheckForUpdates
Alexander Alekseev
2016/10/05 22:06:23
Done.
michaelpg
2016/10/05 23:28:14
You misunderstood: it's not clear what the differe
Alexander Alekseev
2016/10/06 00:07:12
Done.
|
| + hidden="[[!cancelAllowed]]"> |
| + </div> |
| + </div> |
| + <div class="footer flex layout vertical"> |
| + <paper-progress id="checking-progress" indeterminate></paper-progress> |
|
michaelpg
2016/10/05 21:51:41
indent
Alexander Alekseev
2016/10/05 22:06:24
Done.
|
| </div> |
| </oobe-dialog> |
| - <oobe-dialog hidden="[[!eulaScreenShown]]" |
| - has-buttons> |
| - <iron-icon icon="oobe-eula:googleg" class="oobe-icon"></iron-icon> |
| + <oobe-dialog hidden="[[checkingForUpdate]]"> |
| + <iron-icon icon="oobe-update:googleg" class="oobe-icon"></iron-icon> |
| <div class="header"> |
| - <h1 class="title" i18n-content="oobeEulaSectionTitle"></h1> |
| - </div> |
| - <div class="footer flex layout vertical"> |
| - <iframe id="crosEulaFrame" class="flex" src="chrome://terms" |
| - on-load="onFrameLoad_"> |
| - </iframe> |
| - <a id="installationSettings" href="#" |
| - on-tap="onInstallationSettingsClicked_" |
| - i18n-content="eulaSystemInstallationSettings"> |
| - </a> |
| - <div id="logging"> |
| - <paper-checkbox aria-labelledby="usage-stats-label" id="usageStats" |
| - checked="{{usageStatsChecked}}" on-change="onUsageChanged_"> |
| - <label id="usage-stats-label" i18n-content="checkboxLogging"> |
| - </label> |
| - <a id="" href="#" i18n-content="learnMore" |
| - on-tap="onUsageStatsHelpLinkClicked_"> |
| - </a> |
| - </paper-checkbox> |
| + <h1 class="title" i18n-content="updateScreenTitle"></h1> |
| + <div class="subtitle" i18n-content="installingUpdateDesc"></div> |
| + <div class="subtitle" id="cancelHint2" i18n-content="cancelUpdateHint" |
| + hidden="[[!cancelAllowed]]"> |
| </div> |
| </div> |
| - <div class="bottom-buttons flex layout horizontal end-justified"> |
| - <oobe-text-button inverse on-tap="eulaAccepted_" |
| - i18n-content="oobeEulaAcceptAndContinueButtonText" |
| - disabled="[[acceptButtonDisabled]]"> |
| - </oobe-text-button> |
| + <div class="footer flex layout vertical"> |
| + <div id="update-upper-label">[[updateUpperLabel]]</div> |
| + <paper-progress min="0" max="100" value="[[progressValue]]"> |
| + </paper-progress> |
| + <div id="estimated-time-left" class="progress-message" |
| + hidden="[[!estimatedTimeLeftShown]]">[[estimatedTimeLeft]]</div> |
| + <div id="progress-message" class="progress-message" |
| + hidden="[[!progressMessageShown]]">[[progressMessage]]</div> |
| </div> |
| </oobe-dialog> |
| </template> |