Push change for stevenjb:...

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_
 
 #include <string>
 #include <vector>
 
@@ skipping 59 matching lines @@
   EthernetNetwork() : Network() {}
 };
 
 class WirelessNetwork : public Network {
  public:
   // WirelessNetwork are sorted by name.
   bool operator< (const WirelessNetwork& other) const {
     return name_ < other.name();
   }
 
+  // We frequently want to compare networks by service path.
+  struct ServicePathEq {
+    explicit ServicePathEq(const std::string& path_in) : path(path_in) {}
+    bool operator()(const WirelessNetwork& a) {
+      return a.service_path().compare(path) == 0;
+    }
+    const std::string& path;
+  };
+
   const std::string& name() const { return name_; }
   int strength() const { return strength_; }
   bool auto_connect() const { return auto_connect_; }
 
   void set_name(const std::string& name) { name_ = name; }
   void set_auto_connect(bool auto_connect) { auto_connect_ = auto_connect; }
 
   // Network overrides.
   virtual void Clear();
   virtual void ConfigureFromService(const ServiceInfo& service);
@@ skipping 192 matching lines @@
 
   // Returns the list of remembered wifi networks.
   virtual const WifiNetworkVector& remembered_wifi_networks() const = 0;
 
   // Returns the current list of cellular networks.
   virtual const CellularNetworkVector& cellular_networks() const = 0;
 
   // Returns the list of remembered cellular networks.
   virtual const CellularNetworkVector& remembered_cellular_networks() const = 0;
 
+  // Search the current list of networks by path and if the network
+  // is available, copy the result and return true.
+  virtual bool FindWifiNetworkByPath(const std::string& path,
+                                     WifiNetwork* result) const = 0;
+  virtual bool FindCellularNetworkByPath(const std::string& path,
+                                         CellularNetwork* result) const = 0;
+
   // Request a scan for new wifi networks.
   virtual void RequestWifiScan() = 0;
 
   // Attempt to connect to the preferred network if available and it is set up.
   // This call will return true if connection is started.
   // If the preferred network is not available or not setup, returns false.
   // Note: For dogfood purposes, we hardcode the preferred network to Google-A.
   virtual bool ConnectToPreferredNetworkIfAvailable() = 0;
 
   // Returns true if we are currently connected to the preferred network.
@@ skipping 107 matching lines @@
   }
 
   virtual const CellularNetworkVector& cellular_networks() const {
     return cellular_networks_;
   }
 
   virtual const CellularNetworkVector& remembered_cellular_networks() const {
     return remembered_cellular_networks_;
   }
 
+  virtual bool FindWifiNetworkByPath(const std::string& path,
+                                     WifiNetwork* network) const;
+  virtual bool FindCellularNetworkByPath(const std::string& path,
+                                         CellularNetwork* network) const;
+
   virtual void RequestWifiScan();
   virtual bool ConnectToPreferredNetworkIfAvailable();
   virtual bool PreferredNetworkConnected();
   virtual bool PreferredNetworkFailed();
   virtual void ConnectToWifiNetwork(WifiNetwork network,
                                     const string16& password,
                                     const string16& identity,
                                     const string16& certpath);
   virtual void ConnectToWifiNetwork(const string16& ssid,
                                     const string16& password,
@@ skipping 57 matching lines @@
   // monitoring of network changes.
   void Init();
 
   // Force an update of the system info.
   void UpdateSystemInfo();
 
   // Returns the preferred wifi network.
   WifiNetwork* GetPreferredNetwork();
 
   // Gets the WifiNetwork with the given name. Returns NULL if not found.
+  // Only used by GetPreferredNetwork() to lookup "Google" and "GoogleA" (hack)
   WifiNetwork* GetWifiNetworkByName(const std::string& name);
 
-  // Gets the WifiNetwork with the given path. Returns NULL if not found.
-  WifiNetwork* GetWifiNetworkByPath(const std::string& path);
+  // Gets the WirelessNetwork (WifiNetwork or CellularNetwork) by path
+  template<typename T>
+  T* GetWirelessNetworkByPath(std::vector<T>& networks,
+                              const std::string& path);
+  template<typename T>
+  const T* GetWirelessNetworkByPath(const std::vector<T>& networks,
+                                    const std::string& path) const;
 
   // Enables/disables the specified network device.
   void EnableNetworkDeviceType(ConnectionType device, bool enable);
 
   // Update the network with the SystemInfo object.
   // This will notify all the Observers.
   void UpdateNetworkStatus(SystemInfo* system);
 
   // Checks network traffic to see if there is any uploading.
   // If there is download traffic, then true is passed in for download.
@@ skipping 58 matching lines @@
   int connected_devices_;
 
   bool offline_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkLibraryImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_