[oobe] Show error notification on the network screen.

BUG=chromium-os:17336
TEST=manual

Review URL: http://codereview.chromium.org/7646015

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96765 0039d316-1c4b-4281-b951-d872f2087c98
parent 0034f845
...@@ -353,14 +353,44 @@ cr.define('oobe', function() { ...@@ -353,14 +353,44 @@ cr.define('oobe', function() {
} }
}; };
/**
* Updates networks list with the new data.
* @param {!Object} data Networks list.
*/
NetworkScreen.updateNetworks = function(data) { NetworkScreen.updateNetworks = function(data) {
$('connect').updateNetworks(data); $('connect').updateNetworks(data);
}; };
/**
* Updates network title, which is shown by the drop-down.
* @param {string} title Title to be displayed.
* @param {!Object} icon Icon to be displayed.
*/
NetworkScreen.updateNetworkTitle = function(title, icon) { NetworkScreen.updateNetworkTitle = function(title, icon) {
$('connect').updateNetworkTitle(title, icon); $('connect').updateNetworkTitle(title, icon);
}; };
/**
* Shows the network error message.
* @param {string} message Message to be shown.
*/
NetworkScreen.showError = function(message) {
var error = document.createElement('div');
var messageDiv = document.createElement('div');
messageDiv.className = 'error-message';
messageDiv.textContent = message;
error.appendChild(messageDiv);
$('bubble').showContentForElement($('networks-list'), error);
};
/**
* Hides the error notification bubble (if any).
*/
NetworkScreen.clearErrors = function() {
$('bubble').hide();
};
return { return {
NetworkScreen: NetworkScreen NetworkScreen: NetworkScreen
}; };
......
...@@ -81,12 +81,13 @@ void NetworkScreenHandler::Hide() { ...@@ -81,12 +81,13 @@ void NetworkScreenHandler::Hide() {
} }
void NetworkScreenHandler::ShowError(const string16& message) { void NetworkScreenHandler::ShowError(const string16& message) {
// scoped_ptr<Value> message_value(Value::CreateStringValue(message)); scoped_ptr<Value> message_value(Value::CreateStringValue(message));
// web_ui_->CallJavascriptFunction("cr.ui.Oobe.showError", *message_value); web_ui_->CallJavascriptFunction("oobe.NetworkScreen.showError",
*message_value);
} }
void NetworkScreenHandler::ClearErrors() { void NetworkScreenHandler::ClearErrors() {
// web_ui_->CallJavascriptFunction("cr.ui.Oobe.clearErrors"); web_ui_->CallJavascriptFunction("oobe.NetworkScreen.clearErrors");
} }
void NetworkScreenHandler::ShowConnectingStatus( void NetworkScreenHandler::ShowConnectingStatus(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment