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

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

Issue 863263006: Migrating UpdateScreen to ScreenContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: small fixes Created 5 years, 11 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/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 34c9f036184672ca7dad60eef239af4915a71f72..1fa14c9797c99356c9785b0d447dbb915dc893ce 100644
--- a/chrome/browser/resources/chromeos/login/oobe_screen_update.js
+++ b/chrome/browser/resources/chromeos/login/oobe_screen_update.js
@@ -7,17 +7,56 @@
*/
login.createScreen('UpdateScreen', 'update', function() {
+ var USER_ACTION_CANCEL_UPDATE_SHORTCUT = 'cancel-update';
+ var CONTEXT_KEY_TIME_LEFT_SEC = 'time-left-sec';
+ var CONTEXT_KEY_SHOW_TIME_LEFT = 'show-time-left';
+ var CONTEXT_KEY_UPDATE_MESSAGE = 'update-msg';
+ var CONTEXT_KEY_SHOW_CURTAIN = 'show-curtain';
+ var CONTEXT_KEY_SHOW_PROGRESS_MESSAGE = 'show-progress-msg';
+ var CONTEXT_KEY_PROGRESS = 'progress';
+ var CONTEXT_KEY_PROGRESS_MESSAGE = 'progress-msg';
+ var CONTEXT_KEY_CANCEL_UPDATE_SHORTCUT_ENABLED = 'cancel-update-enabled';
+
return {
- EXTERNAL_API: [
- 'enableUpdateCancel',
- 'setUpdateProgress',
- 'showEstimatedTimeLeft',
- 'setEstimatedTimeLeft',
- 'showProgressMessage',
- 'setProgressMessage',
- 'setUpdateMessage',
- 'showUpdateCurtain'
- ],
+ EXTERNAL_API: [],
+
+ /** @override */
+ 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) {
+ 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;
+ });
+ },
/**
* Header text of the screen.
@@ -32,18 +71,12 @@ login.createScreen('UpdateScreen', 'update', function() {
*/
cancel: function() {
// It's safe to act on the accelerator even if it's disabled on official
- // builds, since Chrome will just ignore the message in that case.
+ // builds, since Chrome will just ignore this user action in that case.
var updateCancelHint = $('update-cancel-hint').firstElementChild;
updateCancelHint.textContent =
loadTimeData.getString('cancelledUpdateMessage');
- chrome.send('cancelUpdate');
- },
-
- /**
- * Makes 'press Escape to cancel update' hint visible.
- */
- enableUpdateCancel: function() {
- $('update-cancel-hint').hidden = false;
+ this.send(login.Screen.CALLBACK_USER_ACTED,
+ USER_ACTION_CANCEL_UPDATE_SHORTCUT);
},
/**

Powered by Google App Engine
This is Rietveld 408576698