Add TechnologyState to NetworkStateHandler.

chromeos/network/shill_property_handler.h

Index: chromeos/network/shill_property_handler.h
diff --git a/chromeos/network/shill_property_handler.h b/chromeos/network/shill_property_handler.h
index ff0ea1d69c36aabf186179553863f7476eb5f157..a1283ef0345bbbba7b559d7662291e7e3be33c4a 100644
--- a/chromeos/network/shill_property_handler.h
+++ b/chromeos/network/shill_property_handler.h
@@ -87,9 +87,10 @@ class CHROMEOS_EXPORT ShillPropertyHandler
   // Sends an initial property request and sets up the observer.
   void Init();
 
-  // Returns true if |technology| is available / enabled / uninitialized.
+  // Returns true if |technology| is available, enabled, etc.
   bool TechnologyAvailable(const std::string& technology) const;

[Greg Spencer (Chromium), 2013/04/11 21:35:12]

Same here... Shouldn't these all be IsTechnology...?

[stevenjb, 2013/04/15 18:49:33]

Done.

   bool TechnologyEnabled(const std::string& technology) const;
+  bool TechnologyEnabling(const std::string& technology) const;
   bool TechnologyUninitialized(const std::string& technology) const;
 
   // Asynchronously sets the enabled state for |technology|.
@@ -136,6 +137,12 @@ class CHROMEOS_EXPORT ShillPropertyHandler
   void UpdateEnabledTechnologies(const base::ListValue& technologies);
   void UpdateUninitializedTechnologies(const base::ListValue& technologies);
 
+  void EnableTechnologyFailed(
+      const std::string& technology,
+      const network_handler::ErrorCallback& error_callback,
+      const std::string& error_name,
+      const std::string& error_message);
+
   // Called when Shill returns the properties for a service or device.
   void GetPropertiesCallback(ManagedState::ManagedType type,
                              const std::string& path,
@@ -180,6 +187,7 @@ class CHROMEOS_EXPORT ShillPropertyHandler
   // Lists of available / enabled / uninitialized technologies
   std::set<std::string> available_technologies_;
   std::set<std::string> enabled_technologies_;
+  std::set<std::string> enabling_technologies_;
   std::set<std::string> uninitialized_technologies_;
 
   DISALLOW_COPY_AND_ASSIGN(ShillPropertyHandler);