Fix bug where auto-connect setting is not immediately saved....

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 13 matching lines @@
   const std::string& device_path() const { return device_path_; }
   const std::string& ip_address() const { return ip_address_; }
   ConnectionType type() const { return type_; }
   bool connecting() const { return state_ == STATE_ASSOCIATION ||
       state_ == STATE_CONFIGURATION || state_ == STATE_CARRIER; }
   bool connected() const { return state_ == STATE_READY; }
   bool connecting_or_connected() const { return connecting() || connected(); }
   bool failed() const { return state_ == STATE_FAILURE; }
   ConnectionError error() const { return error_; }
 
-  void set_connecting(bool connecting) { state_ = STATE_CONFIGURATION; }
-  void set_connected(bool connected) { state_ = STATE_READY; }
+  void set_connecting(bool connecting) { state_ = (connecting ?
+      STATE_ASSOCIATION : STATE_IDLE); }
+  void set_connected(bool connected) { state_ = (connected ?
+      STATE_READY : STATE_IDLE); }
 
   // Clear the fields.
   virtual void Clear();
 
   // Configure the Network from a ServiceInfo object.
   virtual void ConfigureFromService(const ServiceInfo& service);
 
   // Return a string representation of the state code.
   // This not translated and should be only used for debugging purposes.
   std::string GetStateString();
@@ skipping 382 matching lines @@
                           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();
 
-  // Gets the WifiNetwork with the given name. Returns whether the wifi network
-  // was found or not.
-  bool GetWifiNetworkByName(const std::string& name, WifiNetwork* wifi);
+  // Gets the WifiNetwork with the given name. Returns NULL if not found.
+  WifiNetwork* GetWifiNetworkByName(const std::string& name);
+
+  // Gets the WifiNetwork with the given path. Returns NULL if not found.
+  WifiNetwork* GetWifiNetworkByPath(const std::string& path);
 
   // 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_