| Index: chrome/browser/resources/chromeos/login/oobe_screen_update.js
|
| diff --git a/chrome/browser/resources/chromeos/login/oobe_screen_update.js b/chrome/browser/resources/chromeos/login/oobe_screen_update.js
|
| index 0efb1b8db1aad8d6d1d1af9c2b1e221b4d9a0728..4edfccf5442c0d16eec1a38a788b796c7d961acb 100644
|
| --- a/chrome/browser/resources/chromeos/login/oobe_screen_update.js
|
| +++ b/chrome/browser/resources/chromeos/login/oobe_screen_update.js
|
| @@ -24,39 +24,38 @@ login.createScreen('UpdateScreen', 'update', function() {
|
| decorate: function() {
|
| var self = this;
|
|
|
| - this.context.addObserver(CONTEXT_KEY_TIME_LEFT_SEC,
|
| - function(time_left_sec) {
|
| - self.setEstimatedTimeLeft(time_left_sec);
|
| - });
|
| - this.context.addObserver(CONTEXT_KEY_SHOW_TIME_LEFT,
|
| - function(show_time_left) {
|
| - self.showEstimatedTimeLeft(show_time_left);
|
| - });
|
| - this.context.addObserver(CONTEXT_KEY_UPDATE_MESSAGE,
|
| - function(update_msg) {
|
| - self.setUpdateMessage(update_msg);
|
| - });
|
| - this.context.addObserver(CONTEXT_KEY_SHOW_CURTAIN,
|
| - function(show_curtain) {
|
| - self.showUpdateCurtain(show_curtain);
|
| - });
|
| - this.context.addObserver(CONTEXT_KEY_SHOW_PROGRESS_MESSAGE,
|
| - function(show_progress_msg) {
|
| - self.showProgressMessage(show_progress_msg);
|
| - });
|
| - this.context.addObserver(CONTEXT_KEY_PROGRESS,
|
| - function(progress) {
|
| + this.context.addObserver(
|
| + CONTEXT_KEY_TIME_LEFT_SEC, function(time_left_sec) {
|
| + self.setEstimatedTimeLeft(time_left_sec);
|
| + });
|
| + this.context.addObserver(
|
| + CONTEXT_KEY_SHOW_TIME_LEFT, function(show_time_left) {
|
| + self.showEstimatedTimeLeft(show_time_left);
|
| + });
|
| + this.context.addObserver(
|
| + CONTEXT_KEY_UPDATE_MESSAGE, function(update_msg) {
|
| + self.setUpdateMessage(update_msg);
|
| + });
|
| + this.context.addObserver(
|
| + CONTEXT_KEY_SHOW_CURTAIN, function(show_curtain) {
|
| + self.showUpdateCurtain(show_curtain);
|
| + });
|
| + this.context.addObserver(
|
| + CONTEXT_KEY_SHOW_PROGRESS_MESSAGE, function(show_progress_msg) {
|
| + self.showProgressMessage(show_progress_msg);
|
| + });
|
| + this.context.addObserver(CONTEXT_KEY_PROGRESS, function(progress) {
|
| self.setUpdateProgress(progress);
|
| });
|
| - this.context.addObserver(CONTEXT_KEY_PROGRESS_MESSAGE,
|
| - function(progress_msg) {
|
| - self.setProgressMessage(progress_msg);
|
| - });
|
| - this.context.addObserver(CONTEXT_KEY_CANCEL_UPDATE_SHORTCUT_ENABLED,
|
| - function(enabled) {
|
| - $('update-cancel-hint').hidden = !enabled;
|
| - $('oobe-update-md').cancelAllowed = enabled;
|
| - });
|
| + this.context.addObserver(
|
| + CONTEXT_KEY_PROGRESS_MESSAGE, function(progress_msg) {
|
| + self.setProgressMessage(progress_msg);
|
| + });
|
| + this.context.addObserver(
|
| + CONTEXT_KEY_CANCEL_UPDATE_SHORTCUT_ENABLED, function(enabled) {
|
| + $('update-cancel-hint').hidden = !enabled;
|
| + $('oobe-update-md').cancelAllowed = enabled;
|
| + });
|
| },
|
|
|
| /**
|
| @@ -77,8 +76,8 @@ login.createScreen('UpdateScreen', 'update', function() {
|
| var message = loadTimeData.getString('cancelledUpdateMessage');
|
| updateCancelHint.textContent = message;
|
| $('oobe-update-md').setCancelHint(message);
|
| - this.send(login.Screen.CALLBACK_USER_ACTED,
|
| - USER_ACTION_CANCEL_UPDATE_SHORTCUT);
|
| + this.send(
|
| + login.Screen.CALLBACK_USER_ACTED, USER_ACTION_CANCEL_UPDATE_SHORTCUT);
|
| },
|
|
|
| /**
|
| @@ -113,16 +112,15 @@ login.createScreen('UpdateScreen', 'update', function() {
|
| } else if (minutes > 55) {
|
| message = loadTimeData.getString('downloadingTimeLeftStatusOneHour');
|
| } else if (minutes > 20) {
|
| - message = loadTimeData.getStringF('downloadingTimeLeftStatusMinutes',
|
| - Math.ceil(minutes / 5) * 5);
|
| + message = loadTimeData.getStringF(
|
| + 'downloadingTimeLeftStatusMinutes', Math.ceil(minutes / 5) * 5);
|
| } else if (minutes > 1) {
|
| - message = loadTimeData.getStringF('downloadingTimeLeftStatusMinutes',
|
| - minutes);
|
| + message = loadTimeData.getStringF(
|
| + 'downloadingTimeLeftStatusMinutes', minutes);
|
| } else {
|
| message = loadTimeData.getString('downloadingTimeLeftSmall');
|
| }
|
| - var formattedMessage =
|
| - loadTimeData.getStringF('downloading', message);
|
| + var formattedMessage = loadTimeData.getStringF('downloading', message);
|
| $('estimated-time-left').textContent = formattedMessage;
|
| $('oobe-update-md').estimatedTimeLeft = formattedMessage;
|
| },
|
|
|