[cros] Clear any error messages when there's a connected network.

chrome/browser/chromeos/login/network_screen.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/network_screen.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/string16.h"
@@ skipping 125 matching lines @@
 
 void NetworkScreen::NotifyOnConnection() {
   // TODO(nkostylev): Check network connectivity.
   UnsubscribeNetworkNotification();
   connection_timer_.Stop();
   delegate()->GetObserver(this)->OnExit(ScreenObserver::NETWORK_CONNECTED);
 }
 
 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();
     views::View* network_control = view()->GetNetworkControlView();
     bubble_ = MessageBubble::Show(
         network_control->GetWidget(),
         network_control->GetScreenBounds(),
         BubbleBorder::LEFT_TOP,
         ResourceBundle::GetSharedInstance().GetBitmapNamed(IDR_WARNING),
         l10n_util::GetStringF(IDS_NETWORK_SELECTION_ERROR,
                               l10n_util::GetString(IDS_PRODUCT_OS_NAME),
                               UTF16ToWide(network_id_)),
         l10n_util::GetString(IDS_NETWORK_SELECTION_ERROR_HELP),
         this);
     network_control->RequestFocus();
   }
 }
 
 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));
   } else if (network->wifi_connected()) {
     StopWaitingForConnection(ASCIIToUTF16(network->wifi_network()->name()));
   } else if (network->cellular_connected()) {
     StopWaitingForConnection(ASCIIToUTF16(network->cellular_network()->name()));
   } else if (network->ethernet_connecting()) {
     WaitForConnection(
         l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET));
@@ skipping 30 matching lines @@
                             &NetworkScreen::OnConnectionTimeout);
   }
 
   network_id_ = network_id;
   view()->ShowConnectingStatus(continue_pressed_, network_id_);
 
   view()->EnableContinue(false);
 }
 
 }  // namespace chromeos