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

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

Issue 8043024: [cros,webui] Captive portal on login screen proper handling. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 9 years, 3 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
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/screen_offline_message.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/chromeos/login/header_bar.js
diff --git a/chrome/browser/resources/chromeos/login/header_bar.js b/chrome/browser/resources/chromeos/login/header_bar.js
index 7bf6038fa86727e0c030530cea187648a0a66542..2da030242ed479ca1065acfe7c414e04fd787c1c 100644
--- a/chrome/browser/resources/chromeos/login/header_bar.js
+++ b/chrome/browser/resources/chromeos/login/header_bar.js
@@ -25,12 +25,8 @@ cr.define('login', function() {
$('shutdown-button').addEventListener('click',
this.handleShutdownClick_);
$('add-user-button').addEventListener('click', function(e) {
- if (window.navigator.onLine) {
- Oobe.showSigninUI();
- } else {
- $('bubble').showTextForElement($('add-user-button'),
- localStrings.getString('addUserOfflineMessage'));
- }
+ chrome.send('loginRequestNetworkState',
+ ['login.HeaderBar.updateState']);
});
$('cancel-add-user-button').addEventListener('click', function(e) {
this.hidden = true;
@@ -48,6 +44,21 @@ cr.define('login', function() {
}
};
+ /**
+ * Network state changed callback.
+ * @param {Integer} state Current state of the network: 0 - offline;
+ * 1 - online; 2 - under the captive portal.
+ */
+ HeaderBar.updateState = function(state) {
+ var isOffline = state == 0;
+ if (!isOffline) {
+ Oobe.showSigninUI();
+ } else {
+ $('bubble').showTextForElement($('add-user-button'),
+ localStrings.getString('addUserOfflineMessage'));
+ }
+ }
+
return {
HeaderBar: HeaderBar
};
« no previous file with comments | « no previous file | chrome/browser/resources/chromeos/login/screen_offline_message.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698