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

chrome/browser/chromeos/cros/network_library.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 293 matching lines @@
     virtual void NetworkChanged(NetworkLibrary* obj) = 0;
     // Called when the cellular data plan has changed.
     virtual void CellularDataPlanChanged(const std::string& service_path,
                                          const CellularDataPlanList& plans) {}
   };
 
   virtual ~NetworkLibrary() {}
   virtual void AddObserver(Observer* observer) = 0;
   virtual void RemoveObserver(Observer* observer) = 0;
 
+  // Return the active Ethernet network (or a default structure if inactive).
   virtual const EthernetNetwork& ethernet_network() const = 0;
   virtual bool ethernet_connecting() const = 0;
   virtual bool ethernet_connected() const = 0;
 
-  virtual const std::string& wifi_name() const = 0;
+  // Return the active Wifi network (or a default structure if none active).
+  virtual const WifiNetwork& wifi_network() const = 0;
   virtual bool wifi_connecting() const = 0;
   virtual bool wifi_connected() const = 0;
-  virtual int wifi_strength() const = 0;
 
-  virtual const std::string& cellular_name() const = 0;
-  virtual const std::string& cellular_service_path() const = 0;
+  // Return the active Cellular network (or a default structure if none active).
+  virtual const CellularNetwork& cellular_network() const = 0;
   virtual bool cellular_connecting() const = 0;
   virtual bool cellular_connected() const = 0;
-  virtual int cellular_strength() const = 0;
 
   // Return true if any network is currently connected.
   virtual bool Connected() const = 0;
 
   // Return true if any network is currently connecting.
   virtual bool Connecting() const = 0;
 
   // Returns the current IP address if connected. If not, returns empty string.
   virtual const std::string& IPAddress() const = 0;
 
@@ skipping 95 matching lines @@
   virtual std::string GetHtmlInfo(int refresh) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via CrosLibrary::Get().
   static NetworkLibrary* GetImpl(bool stub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_