Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2226)

Unified Diff: chrome/browser/resources/chromeos/login/encryption_migration.js

Issue 2819613003: cros: Update design of encryption migration UI for ext4 dircrypto. (Closed)
Patch Set: Address review comments. Created 3 years, 8 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
Index: chrome/browser/resources/chromeos/login/encryption_migration.js
diff --git a/chrome/browser/resources/chromeos/login/encryption_migration.js b/chrome/browser/resources/chromeos/login/encryption_migration.js
index 494176a5b47431f4a411818ae06b6da445fafaa0..1ca09d2eccce707bf982af428b159d5e926a301d 100644
--- a/chrome/browser/resources/chromeos/login/encryption_migration.js
+++ b/chrome/browser/resources/chromeos/login/encryption_migration.js
@@ -16,14 +16,15 @@ var EncryptionMigrationUIState = {
INITIAL: 0,
READY: 1,
MIGRATING: 2,
- MIGRATION_SUCCEEDED: 3,
- MIGRATION_FAILED: 4,
- NOT_ENOUGH_SPACE: 5
+ MIGRATION_FAILED: 3,
+ NOT_ENOUGH_SPACE: 4
};
Polymer({
is: 'encryption-migration',
+ behaviors: [I18nBehavior],
+
properties: {
/**
* Current UI state which corresponds to a sub step in migration process.
@@ -68,12 +69,36 @@ Polymer({
},
/**
+ * True if the device is charging.
+ */
+ isCharging: {
+ type: Boolean,
+ value: false
+ },
+
+ /**
* True if the user already accepted the migration.
*/
isMigrationAccepted: {
type: Boolean,
value: false
},
+
+ /**
+ * Formatted string of the current available space size.
+ */
+ availableSpaceInString: {
+ type: String,
+ value: ''
+ },
+
+ /**
+ * Formatted string of the necessary space size for migration.
+ */
+ necessarySpaceInString: {
+ type: String,
+ value: ''
+ },
},
/**
@@ -104,15 +129,6 @@ Polymer({
},
/**
- * Returns true if the migration is finished successfully.
- * @param {EncryptionMigrationUIState} state Current UI state
- * @private
- */
- isMigrationSucceeded_: function(state) {
- return state == EncryptionMigrationUIState.MIGRATION_SUCCEEDED;
- },
-
- /**
* Returns true if the migration failed.
* @param {EncryptionMigrationUIState} state Current UI state
* @private
@@ -140,6 +156,55 @@ Polymer({
},
/**
+ * Computes the label shown under progress bar.
+ * @param {number} progress
+ * @return {string}
+ * @private
+ */
+ computeProgressLabel_: function(progress) {
+ return this.i18n('migrationProgressLabel', Math.floor(progress * 100));
+ },
+
+ /**
+ * Computes the warning label when battery level is not enough.
+ * @param {number} batteryPercent
+ * @return {string}
+ * @private
+ */
+ computeBatteryWarningLabel_: function(batteryPercent) {
+ return this.i18n('migrationBatteryWarningLabel', batteryPercent);
+ },
+
+ /**
+ * Computes the label to show the necessary battery level for migration.
+ * @return {string}
+ * @private
+ */
+ computeNecessaryBatteryLevelLabel_: function() {
+ return this.i18n('migrationNecessaryBatteryLevelLabel', 30);
+ },
+
+ /**
+ * Computes the label to show the current available space.
+ * @param {string} availableSpaceInString
+ * @return {string}
+ * @private
+ */
+ computeAvailableSpaceLabel_: function(availableSpaceInString) {
+ return this.i18n('migrationAvailableSpaceLabel', availableSpaceInString);
+ },
+
+ /**
+ * Computes the label to show the necessary space to start migration.
+ * @param {string} necessarySpaceInString
+ * @return {string}
+ * @private
+ */
+ computeNecessarySpaceLabel_: function(necessarySpaceInString) {
+ return this.i18n('migrationNecessarySpaceLabel', necessarySpaceInString);
+ },
+
+ /**
* Handles tap on UPGRADE button.
* @private
*/

Powered by Google App Engine
This is Rietveld 408576698