chromium-os:5494 Networks with identical names not handled properly.

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 143 matching lines @@
 }
 
 void NetworkScreen::UpdateStatus(NetworkLibrary* network) {
   if (!view() || !network)
     return;
 
   if (network->ethernet_connected()) {
     StopWaitingForConnection(
         l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET));
   } else if (network->wifi_connected()) {
-    StopWaitingForConnection(ASCIIToUTF16(network->wifi_name()));
+    StopWaitingForConnection(ASCIIToUTF16(network->wifi_network().name()));
   } else if (network->cellular_connected()) {
-    StopWaitingForConnection(ASCIIToUTF16(network->cellular_name()));
+    StopWaitingForConnection(ASCIIToUTF16(network->cellular_network().name()));
   } else if (network->ethernet_connecting()) {
     WaitForConnection(
         l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET));
   } else if (network->wifi_connecting()) {
-    WaitForConnection(ASCIIToUTF16(network->wifi_name()));
+    WaitForConnection(ASCIIToUTF16(network->wifi_network().name()));
   } else if (network->cellular_connecting()) {
-    WaitForConnection(ASCIIToUTF16(network->cellular_name()));
+    WaitForConnection(ASCIIToUTF16(network->cellular_network().name()));
   } else {
     StopWaitingForConnection(network_id_);
   }
 }
 
 void NetworkScreen::StopWaitingForConnection(const string16& network_id) {
   NetworkLibrary* network = CrosLibrary::Get()->GetNetworkLibrary();
   bool is_connected = network && network->Connected();
   if (is_connected && continue_pressed_) {
     NotifyOnConnection();
@@ skipping 16 matching lines @@
                             &NetworkScreen::OnConnectionTimeout);
   }
 
   network_id_ = network_id;
   view()->ShowConnectingStatus(continue_pressed_, network_id_);
 
   view()->EnableContinue(false);
 }
 
 }  // namespace chromeos