Add TechnologyState to NetworkStateHandler.

chromeos/network/shill_property_handler.h

 // Copyright (c) 2012 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 CHROMEOS_NETWORK_SHILL_PROPERTY_HANDLER_H_
 #define CHROMEOS_NETWORK_SHILL_PROPERTY_HANDLER_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 72 matching lines @@
    protected:
     virtual ~Listener() {}
   };
 
   explicit ShillPropertyHandler(Listener* listener);
   virtual ~ShillPropertyHandler();
 
   // Sends an initial property request and sets up the observer.
   void Init();
 
-  // Returns true if |technology| is available / enabled / uninitialized.
-  bool TechnologyAvailable(const std::string& technology) const;
-  bool TechnologyEnabled(const std::string& technology) const;
-  bool TechnologyUninitialized(const std::string& technology) const;
+  // Returns true if |technology| is available, enabled, etc.
+  bool IsTechnologyAvailable(const std::string& technology) const;
+  bool IsTechnologyEnabled(const std::string& technology) const;
+  bool IsTechnologyEnabling(const std::string& technology) const;
+  bool IsTechnologyUninitialized(const std::string& technology) const;
 
   // Asynchronously sets the enabled state for |technology|.
   // Note: Modifes Manager state. Calls |error_callback| on failure.
   void SetTechnologyEnabled(
       const std::string& technology,
       bool enabled,
       const network_handler::ErrorCallback& error_callback);
 
   // Requests an immediate network scan.
   void RequestScan() const;
@@ skipping 25 matching lines @@
   // Updates the Shill property observers to observe any entries for |type|.
   void UpdateObserved(ManagedState::ManagedType type,
                       const base::ListValue& entries);
 
 
   // Sets |*_technologies_| to contain only entries in |technologies|.
   void UpdateAvailableTechnologies(const base::ListValue& technologies);
   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,
                              DBusMethodCallStatus call_status,
                              const base::DictionaryValue& properties);
 
   // Callback invoked when a watched property changes. Calls appropriate
   // handlers and signals observers.
   void PropertyChangedCallback(ManagedState::ManagedType type,
                                const std::string& path,
@@ skipping 24 matching lines @@
 
   // List of network services with Shill property changed observers
   ShillPropertyObserverMap observed_networks_;
 
   // List of network devices with Shill property changed observers
   ShillPropertyObserverMap observed_devices_;
 
   // 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);
 };
 
 }  // namespace internal
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_SHILL_PROPERTY_HANDLER_H_