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

chrome/browser/chromeos/network_list.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/network_list.h"
 
 #include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "grit/generated_resources.h"
@@ skipping 60 matching lines @@
   }
 
   // TODO(nkostylev): Show public WiFi networks first.
   WifiNetworkVector wifi = network_lib->wifi_networks();
   for (WifiNetworkVector::const_iterator it = wifi.begin();
        it != wifi.end(); ++it, ++index) {
     networks_.push_back(NetworkItem(NETWORK_WIFI,
                                     ASCIIToUTF16(it->name()),
                                     *it,
                                     CellularNetwork()));
-    if (network_lib->wifi_name() == it->name()) {
+    if (network_lib->wifi_network().service_path() == it->service_path()) {
       AddNetworkIndexToList(index,
                             network_lib->wifi_connected(),
                             network_lib->wifi_connecting());
     }
   }
 
   CellularNetworkVector cellular = network_lib->cellular_networks();
   for (CellularNetworkVector::const_iterator it = cellular.begin();
        it != cellular.end(); ++it, ++index) {
     networks_.push_back(NetworkItem(NETWORK_CELLULAR,
                                     ASCIIToUTF16(it->name()),
                                     WifiNetwork(),
                                     *it));
-    if (network_lib->cellular_name() == it->name()) {
+    if (network_lib->cellular_network().service_path() == it->service_path()) {
       AddNetworkIndexToList(index,
                             network_lib->cellular_connected(),
                             network_lib->cellular_connecting());
     }
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkList, private:
 
@@ skipping 35 matching lines @@
                                         bool connected,
                                         bool connecting) {
   if (connected) {
     connected_networks_.push_back(index);
   } else if (connecting) {
     connecting_networks_.push_back(index);
   }
 }
 
 }  // namespace chromeos