Improve NetworkStateHandler API

The UI needs more flexible accessors than "ActiveNetwork," which is also a somewhat unclear term. This replaces it with DefaultNetwork and provides better accessors for the UI.

BUG=none
For webui:
TBR=jhawkins@chromium.org

Review URL: https://codereview.chromium.org/11614035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@174288 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chromeos/network/network_state.h b/chromeos/network/network_state.h
index b5f7376..c5fa66d 100644
--- a/chromeos/network/network_state.h
+++ b/chromeos/network/network_state.h
@@ -28,7 +28,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
   const std::string& technology() const { return technology_; }
   const std::string& ip_address() const { return ip_address_; }
   const std::string& device_path() const { return device_path_; }
-  const std::string& state() const { return state_; }
+  const std::string& connection_state() const { return connection_state_; }
   const std::string& error() const { return error_; }
   const std::string& activation_state() const { return activation_state_; }
   const std::string& roaming() const { return roaming_; }
@@ -38,8 +38,8 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
   bool IsConnectingState() const;
 
   // Helpers (used e.g. when a state is cached)
-  static bool StateIsConnected(const std::string& state);
-  static bool StateIsConnecting(const std::string& state);
+  static bool StateIsConnected(const std::string& connection_state);
+  static bool StateIsConnecting(const std::string& connection_state);
 
  private:
   friend class NetworkStateHandler;
@@ -53,7 +53,7 @@ class CHROMEOS_EXPORT NetworkState : public ManagedState {
   std::string security_;
   std::string device_path_;
   std::string ip_address_;
-  std::string state_;
+  std::string connection_state_;
   std::string error_;
   // Wireless properties
   int signal_strength_;