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 8db12049a2027a83f565cae0f5517c56609fd910..7d333b2b1eafcd229acbace6fe14e0eb0dea0335 100644 |
--- a/chrome/browser/resources/chromeos/login/screen_error_message.js |
+++ b/chrome/browser/resources/chromeos/login/screen_error_message.js |
@@ -94,15 +94,15 @@ cr.define('login', function() { |
}; |
}, |
- onBeforeShow: function() { |
- cr.ui.DropDown.setActive('offline-networks-list', true, false); |
+ onBeforeShow: function(last) { |
+ cr.ui.DropDown.show('offline-networks-list', false, last); |
$('error-guest-signin').hidden = $('guestSignin').hidden || |
!$('add-user-header-bar-item').hidden; |
}, |
onBeforeHide: function() { |
- cr.ui.DropDown.setActive('offline-networks-list', false, false); |
+ cr.ui.DropDown.hide('offline-networks-list'); |
}, |
update: function() { |
@@ -114,7 +114,7 @@ cr.define('login', function() { |
/** |
* Shows or hides offline message based on network on/offline state. |
whywhat
2011/11/29 07:58:06
Add comments about the parameters, please.
altimofeev
2011/11/29 17:10:46
Done.
|
*/ |
- updateState_: function(state, network, reason) { |
+ updateState_: function(state, network, reason, last) { |
whywhat
2011/11/29 07:58:06
Ditto about last
altimofeev
2011/11/29 17:10:46
Done.
|
var currentScreen = Oobe.getInstance().currentScreen; |
var offlineMessage = this; |
var isOnline = (state == NET_STATE.ONLINE); |
@@ -135,7 +135,7 @@ cr.define('login', function() { |
console.log('Show offline message, state=' + state + |
', network=' + network + |
', isUnderCaptivePortal=' + isUnderCaptivePortal); |
- offlineMessage.onBeforeShow(); |
+ offlineMessage.onBeforeShow(last); |
if (isUnderCaptivePortal) { |
if (isProxyError) { |
@@ -191,9 +191,10 @@ cr.define('login', function() { |
* @param {Integer} state Current state of the network (see NET_STATE). |
* @param {string} network Name of the current network. |
* @param {string} reason Reason the callback was called. |
+ * @param {int} last Last active network type. |
*/ |
- ErrorMessageScreen.updateState = function(state, network, reason) { |
- $('error-message').updateState_(state, network, reason); |
+ ErrorMessageScreen.updateState = function(state, network, reason, last) { |
+ $('error-message').updateState_(state, network, reason, last); |
}; |
/** |