Land for njw:...

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 280 matching lines @@
   // Reads out the results of the last wifi scan. These results are not
   // pre-cached in the library, so the call may block whilst the results are
   // read over IPC.
   // Returns false if an error occurred in reading the results. Note that
   // a true return code only indicates the result set was successfully read,
   // it does not imply a scan has successfully completed yet.
   virtual bool GetWifiAccessPoints(WifiAccessPointVector* result) = 0;
 
   // TODO(joth): Add GetCellTowers to retrieve a CellTowerVector.
 
+  // Force an update of the system info.
+  virtual void UpdateSystemInfo() = 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.
   virtual bool PreferredNetworkConnected() = 0;
 
   // Returns true if we failed to connect to the preferred network.
@@ skipping 159 matching lines @@
 
   virtual bool offline_mode() const { return offline_mode_; }
 
   virtual void EnableEthernetNetworkDevice(bool enable);
   virtual void EnableWifiNetworkDevice(bool enable);
   virtual void EnableCellularNetworkDevice(bool enable);
   virtual void EnableOfflineMode(bool enable);
   virtual NetworkIPConfigVector GetIPConfigs(const std::string& device_path);
   virtual std::string GetHtmlInfo(int refresh);
 
+  virtual void UpdateSystemInfo();
+
  private:
 
   // This method is called when there's a change in network status.
   // This method is called on a background thread.
   static void NetworkStatusChangedHandler(void* object);
 
   // This parses SystemInfo into:
   //  - an EthernetNetwork
   //  - a WifiNetworkVector of wifi networks
   //  - a CellularNetworkVector of cellular networks.
   //  - a WifiNetworkVector of remembered wifi networks
   //  - a CellularNetworkVector of remembered cellular networks.
   static void ParseSystem(SystemInfo* system,
                           EthernetNetwork* ethernet,
                           WifiNetworkVector* wifi_networks,
                           CellularNetworkVector* ceullular_networks,
                           WifiNetworkVector* remembered_wifi_networks,
                           CellularNetworkVector* remembered_ceullular_networks);
 
   // This methods loads the initial list of networks on startup and starts the
   // 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 WirelessNetwork (WifiNetwork or CellularNetwork) by path
   template<typename T>
   T* GetWirelessNetworkByPath(std::vector<T>& networks,
@@ skipping 72 matching lines @@
   int connected_devices_;
 
   bool offline_mode_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkLibraryImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_