Refactor WifiNetwork, CellularNetwork, and EthernetNetwork into classes to ma...

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 "app/resource_bundle.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "grit/generated_resources.h"
@@ skipping 20 matching lines @@
   if (NETWORK_EMPTY == type || id.empty()) return -1;
   std::string network_id = UTF16ToASCII(id);
   for (size_t i = 0; i < networks_.size(); i++) {
     if (type == networks_[i].network_type) {
       switch (type) {
         case NETWORK_ETHERNET:
           // Assuming that there's only single Ethernet network.
           return i;
 
         case NETWORK_WIFI:
-          if (network_id == networks_[i].wifi_network.ssid)
+          if (network_id == networks_[i].wifi_network.name())
             return i;
           break;
 
         case NETWORK_CELLULAR:
-          if (network_id == networks_[i].cellular_network.name)
+          if (network_id == networks_[i].cellular_network.name())
             return i;
           break;
 
         default:
           break;
       }
     }
   }
   return -1;
 }
@@ skipping 37 matching lines @@
                                     WifiNetwork(),
                                     CellularNetwork()));
     SetNetworksIndices(index++, ethernet_connected, ethernet_connecting);
   }
 
   // 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->ssid),
+                                    ASCIIToUTF16(it->name()),
                                     *it,
                                     CellularNetwork()));
-    if (network_lib->wifi_ssid() == it->ssid) {
+    if (network_lib->wifi_name() == it->name()) {
       SetNetworksIndices(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),
+                                    ASCIIToUTF16(it->name()),
                                     WifiNetwork(),
                                     *it));
-    if (network_lib->cellular_name() == it->name) {
+    if (network_lib->cellular_name() == it->name()) {
       SetNetworksIndices(index,
                          network_lib->cellular_connected(),
                          network_lib->cellular_connecting());
     }
   }
 }
 
 void NetworkList::SetNetworksIndices(int index,
                                      bool connected,
                                      bool connecting) {
   if (connected_network_index_  != -1 ||
       connecting_network_index_ != -1 ||
       index < 0 || index >= static_cast<int>(networks_.size()))
     return;
 
   if (connected) {
     connected_network_index_ = index;
   } else if (connecting) {
     connecting_network_index_ = index;
   }
 }
 
 }  // namespace chromeos