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

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

Issue 872633008: Migrate (Network)ErrorScreen to ScreenContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cleanup Created 5 years, 10 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/screen_error_message.js
diff --git a/chrome/browser/resources/chromeos/login/screen_error_message.js b/chrome/browser/resources/chromeos/login/screen_error_message.js
index d0c47e5f0d9784d4b62e11661e6cb78558c90dd9..3f2d44d858f394e8d21e0ad70e8a90a27a4548f6 100644
--- a/chrome/browser/resources/chromeos/login/screen_error_message.js
+++ b/chrome/browser/resources/chromeos/login/screen_error_message.js
@@ -7,6 +7,13 @@
*/
login.createScreen('ErrorMessageScreen', 'error-message', function() {
+ var USER_ACTION_CONFIGURE_CERTS = 'configure-certs';
+ var USER_ACTION_DIAGNOSE = 'diagnose';
+ var USER_ACTION_LAUNCH_OOBE_GUEST = 'launch-oobe-guest';
+ var USER_ACTION_LOCAL_STATE_POWERWASH = 'local-state-error-powerwash';
+ var USER_ACTION_REBOOT = 'reboot';
+ var USER_ACTION_SHOW_CAPTIVE_PORTAL = 'show-captive-portal';
+
// Link which starts guest session for captive portal fixing.
/** @const */ var FIX_CAPTIVE_PORTAL_ID = 'captive-portal-fix-link';
@@ -85,6 +92,7 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
* Updates localized content of the screen that is not updated via template.
*/
updateLocalizedContent: function() {
+ var self = this;
$('auto-enrollment-offline-message-text').innerHTML =
loadTimeData.getStringF(
'autoEnrollmentOfflineMessageBody',
@@ -102,7 +110,8 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
'<a id="' + FIX_CAPTIVE_PORTAL_ID + '" class="signin-link" href="#">',
'</a>');
$(FIX_CAPTIVE_PORTAL_ID).onclick = function() {
- chrome.send('showCaptivePortal');
+ self.send(login.Screen.CALLBACK_USER_ACTED,
+ USER_ACTION_SHOW_CAPTIVE_PORTAL);
};
$('captive-portal-proxy-message-text').innerHTML =
@@ -202,12 +211,13 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
*/
get buttons() {
var buttons = [];
+ var self = this;
var rebootButton = this.ownerDocument.createElement('button');
rebootButton.textContent = loadTimeData.getString('rebootButton');
rebootButton.classList.add('show-with-ui-state-kiosk-mode');
rebootButton.addEventListener('click', function(e) {
- chrome.send('rebootButtonClicked');
+ self.send(login.Screen.CALLBACK_USER_ACTED, USER_ACTION_REBOOT);
e.stopPropagation();
});
buttons.push(rebootButton);
@@ -216,7 +226,7 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
diagnoseButton.textContent = loadTimeData.getString('diagnoseButton');
diagnoseButton.classList.add('show-with-ui-state-kiosk-mode');
diagnoseButton.addEventListener('click', function(e) {
- chrome.send('diagnoseButtonClicked');
+ self.send(login.Screen.CALLBACK_USER_ACTED, USER_ACTION_DIAGNOSE);
e.stopPropagation();
});
buttons.push(diagnoseButton);
@@ -225,7 +235,8 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
certsButton.textContent = loadTimeData.getString('configureCertsButton');
certsButton.classList.add('show-with-ui-state-kiosk-mode');
certsButton.addEventListener('click', function(e) {
- chrome.send('configureCertsClicked');
+ self.send(login.Screen.CALLBACK_USER_ACTED,
+ USER_ACTION_CONFIGURE_CERTS);
e.stopPropagation();
});
buttons.push(certsButton);
@@ -261,7 +272,8 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
loadTimeData.getString('localStateErrorPowerwashButton');
powerwashButton.classList.add('show-with-ui-state-local-state-error');
powerwashButton.addEventListener('click', function(e) {
- chrome.send('localStateErrorPowerwashButtonClicked');
+ self.send(login.Screen.CALLBACK_USER_ACTED,
+ USER_ACTION_LOCAL_STATE_POWERWASH);
e.stopPropagation();
});
buttons.push(powerwashButton);
@@ -318,8 +330,12 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
* @private
*/
launchGuestSession_: function() {
- chrome.send(Oobe.getInstance().isOobeUI() ?
- 'launchOobeGuestSession' : 'launchIncognito');
+ if (Oobe.getInstance().isOobeUI()) {
+ this.send(login.Screen.CALLBACK_USER_ACTED,
+ USER_ACTION_LAUNCH_OOBE_GUEST);
+ } else {
+ chrome.send('launchIncognito');
+ }
},
/**

Powered by Google App Engine
This is Rietveld 408576698