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

Unified Diff: chrome/browser/chromeos/login/network_screen.cc

Issue 5713006: [cros] Clear any error messages when there's a connected network. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix test for real Created 10 years 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/chromeos/login/network_screen_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/network_screen.cc
diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc
index 9afeb593e3fb0d1318044462b2c38c330126de9b..381218117652fca97a7192f73c81e3aa8d78277f 100644
--- a/chrome/browser/chromeos/login/network_screen.cc
+++ b/chrome/browser/chromeos/login/network_screen.cc
@@ -143,7 +143,11 @@ void NetworkScreen::NotifyOnConnection() {
void NetworkScreen::OnConnectionTimeout() {
StopWaitingForConnection(network_id_);
- if (!view()->is_dialog_open() &&
+ NetworkLibrary* network = CrosLibrary::Get()->GetNetworkLibrary();
+ bool is_connected = network && network->Connected();
+
+ if (!is_connected &&
+ !view()->is_dialog_open() &&
!(help_app_.get() && help_app_->is_open())) {
// Show error bubble.
ClearErrors();
@@ -166,6 +170,9 @@ void NetworkScreen::UpdateStatus(NetworkLibrary* network) {
if (!view() || !network)
return;
+ if (network->Connected())
+ ClearErrors();
+
if (network->ethernet_connected()) {
StopWaitingForConnection(
l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET));
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/network_screen_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698