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

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

Issue 209143002: Added shortcut for NW config screen in kiosk. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: updates Created 6 years, 9 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 bb68507e6165bf0ee451117dc94aedaaff09e5c4..493f3c3e1c49540aba5fa4521c54e36439152d48 100644
--- a/chrome/browser/resources/chromeos/login/screen_error_message.js
+++ b/chrome/browser/resources/chromeos/login/screen_error_message.js
@@ -40,7 +40,8 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
PORTAL: 'error-state-portal',
OFFLINE: 'error-state-offline',
PROXY: 'error-state-proxy',
- AUTH_EXT_TIMEOUT: 'error-state-auth-ext-timeout'
+ AUTH_EXT_TIMEOUT: 'error-state-auth-ext-timeout',
+ KIOSK_ONLINE: 'error-state-kiosk-online'
};
// Possible error states of the screen. Must be in the same order as
@@ -50,7 +51,8 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
ERROR_STATE.PORTAL,
ERROR_STATE.OFFLINE,
ERROR_STATE.PROXY,
- ERROR_STATE.AUTH_EXT_TIMEOUT
+ ERROR_STATE.AUTH_EXT_TIMEOUT,
+ ERROR_STATE.KIOSK_ONLINE
];
return {
@@ -196,6 +198,7 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
var rebootButton = this.ownerDocument.createElement('button');
rebootButton.textContent = loadTimeData.getString('rebootButton');
rebootButton.classList.add('show-with-ui-state-kiosk-mode');
+ rebootButton.classList.add('show-with-error-state-kiosk-online');
xiyuan 2014/03/25 05:21:19 Do we need this line? When error screen shows up d
zel 2014/03/25 22:26:32 Done.
rebootButton.addEventListener('click', function(e) {
chrome.send('rebootButtonClicked');
e.stopPropagation();
@@ -205,6 +208,7 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
var diagnoseButton = this.ownerDocument.createElement('button');
diagnoseButton.textContent = loadTimeData.getString('diagnoseButton');
diagnoseButton.classList.add('show-with-ui-state-kiosk-mode');
+ diagnoseButton.classList.add('show-with-error-state-kiosk-online');
diagnoseButton.addEventListener('click', function(e) {
chrome.send('diagnoseButtonClicked');
e.stopPropagation();
@@ -214,12 +218,23 @@ login.createScreen('ErrorMessageScreen', 'error-message', function() {
var certsButton = this.ownerDocument.createElement('button');
certsButton.textContent = loadTimeData.getString('configureCertsButton');
certsButton.classList.add('show-with-ui-state-kiosk-mode');
+ certsButton.classList.add('show-with-error-state-kiosk-online');
certsButton.addEventListener('click', function(e) {
chrome.send('configureCertsClicked');
e.stopPropagation();
});
buttons.push(certsButton);
+ var continueButton = this.ownerDocument.createElement('button');
+ continueButton.id = 'continue-network-config-btn';
+ continueButton.textContent = loadTimeData.getString('continueButton');
+ continueButton.classList.add('show-with-error-state-kiosk-online');
+ continueButton.addEventListener('click', function(e) {
+ chrome.send('continueAppLaunch');
+ e.stopPropagation();
+ });
+ buttons.push(continueButton);
+
var spacer = this.ownerDocument.createElement('div');
spacer.classList.add('button-spacer');
spacer.classList.add('show-with-ui-state-kiosk-mode');

Powered by Google App Engine
This is Rietveld 408576698