Fix so that login errors are shown from login/oobe screens....

chrome/browser/chromeos/network_message_observer.cc

Index: chrome/browser/chromeos/network_message_observer.cc
===================================================================
--- chrome/browser/chromeos/network_message_observer.cc	(revision 70931)
+++ chrome/browser/chromeos/network_message_observer.cc	(working copy)
@@ -10,21 +10,16 @@
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_list.h"
-#include "chrome/browser/browser_window.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/notifications/balloon_view_host.h"
-#include "chrome/browser/chromeos/options/network_config_view.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
-#include "chrome/browser/views/window.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/time_format.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "views/window/dialog_delegate.h"
-#include "views/window/window.h"
 
 namespace {
 
@@ -44,8 +39,7 @@
 namespace chromeos {
 
 NetworkMessageObserver::NetworkMessageObserver(Profile* profile)
-    : initialized_(false),
-      notification_connection_error_(profile, "network_connection.chromeos",
+    : notification_connection_error_(profile, "network_connection.chromeos",
           IDR_NOTIFICATION_NETWORK_FAILED,
           l10n_util::GetStringUTF16(IDS_NETWORK_CONNECTION_ERROR_TITLE)),
       notification_low_data_(profile, "network_low_data.chromeos",
@@ -58,7 +52,6 @@
   OnNetworkManagerChanged(netlib);
   // Note that this gets added as a NetworkManagerObserver and a
   // CellularDataPlanObserver in browser_init.cc
-  initialized_ = true;
 }
 
 NetworkMessageObserver::~NetworkMessageObserver() {
@@ -72,20 +65,6 @@
   STLDeleteValues(&wifi_networks_);
 }
 
-void NetworkMessageObserver::CreateModalPopup(views::WindowDelegate* view) {
-  Browser* browser = BrowserList::GetLastActive();
-  if (browser && browser->type() != Browser::TYPE_NORMAL) {
-    browser = BrowserList::FindBrowserWithType(browser->profile(),
-                                               Browser::TYPE_NORMAL,
-                                               true);
-  }
-  DCHECK(browser);
-  views::Window* window = browser::CreateViewsWindow(
-      browser->window()->GetNativeHandle(), gfx::Rect(), view);
-  window->SetIsAlwaysOnTop(true);
-  window->Show();
-}
-
 void NetworkMessageObserver::OpenMobileSetupPage(const ListValue* args) {
   Browser* browser = BrowserList::GetLastActive();
   if (browser)
@@ -108,7 +87,6 @@
   const WifiNetworkVector& wifi_networks = obj->wifi_networks();
   const CellularNetworkVector& cellular_networks = obj->cellular_networks();
 
-  NetworkConfigView* view = NULL;
   std::string new_failed_network;
   // Check to see if we have any newly failed wifi network.
   for (WifiNetworkVector::const_iterator it = wifi_networks.begin();
@@ -124,21 +102,6 @@
         continue;
 
       const WifiNetwork* wifi_old = iter->second;
-      // If this network was in a failed state previously, then it's not new.
-      if (wifi_old->failed())
-        continue;

[stevenjb, 2011/01/11 20:53:52]

Don't we still need this check?

[Charlie Lee, 2011/01/11 22:52:06]

No, because wifi_old->connecting() below means that it wasn't previously failed

On 2011/01/11 20:53:52, Steven Bennetts wrote:

[stevenjb, 2011/01/12 01:34:52]

Ah, right, OK.

On 2011/01/11 22:52:06, Charlie Lee wrote:

-
-      // Display login box again for bad_passphrase and bad_wepkey errors.
-      if (wifi->error() == ERROR_BAD_PASSPHRASE ||
-          wifi->error() == ERROR_BAD_WEPKEY) {
-        // The NetworkConfigView will show the appropriate error message.
-        view = new NetworkConfigView(wifi);
-        // There should only be one wifi network that failed to connect.
-        // If for some reason, we have more than one failure,
-        // we only display the first one. So we break here.
-        break;
-      }
-

[stevenjb, 2011/01/11 20:53:52]

If we remove this check here, we might end up displaying a notification as well
as a dialog. This actually seems like better behavior, but you might want to run
it by Kan.

[Charlie Lee, 2011/01/11 22:52:06]

Let me think about this. For this change, I don't want to change the behavior.

On 2011/01/11 20:53:52, Steven Bennetts wrote:

       // If network connection failed, display a notification.
       // We only do this if we were trying to make a new connection.
       // So if a previously connected network got disconnected for any reason,
@@ -183,10 +146,6 @@
         IDS_NETWORK_CONNECTION_ERROR_MESSAGE,
         ASCIIToUTF16(new_failed_network)), false, false);
   }
-
-  // Show login box if necessary.
-  if (view && initialized_)
-    CreateModalPopup(view);
 }
 
 void NetworkMessageObserver::OnCellularDataPlanChanged(NetworkLibrary* obj) {