Add TechnologyState to NetworkStateHandler.

chromeos/network/network_state_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_NETWORK_STATE_HANDLER_H_
 #define CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 39 matching lines @@
 // * kMatchTypeNonVirtual returns the primary non virtual network
 // * kMatchTypeWireless returns the primary wireless network
 // * kMatchTypeMobile returns the primary cellular or wimax network
 
 class CHROMEOS_EXPORT NetworkStateHandler
     : public internal::ShillPropertyHandler::Listener {
  public:
   typedef std::vector<ManagedState*> ManagedStateList;
   typedef std::vector<const NetworkState*> NetworkStateList;
 
+  enum TechnologyState {
+    TECHNOLOGY_UNAVAILABLE,
+    TECHNOLOGY_AVAILABLE,
+    TECHNOLOGY_UNINITIALIZED,
+    TECHNOLOGY_ENABLING,
+    TECHNOLOGY_ENABLED
+  };
+
   virtual ~NetworkStateHandler();
 
   // Sets the global instance. Must be called before any calls to Get().
   static void Initialize();
 
   // Returns true if the global instance has been initialized.
   static bool IsInitialized();
 
   // Destroys the global instance.
   static void Shutdown();
 
   // Gets the global instance. Initialize() must be called first.
   static NetworkStateHandler* Get();
 
   // Add/remove observers.
   void AddObserver(NetworkStateHandlerObserver* observer);
   void RemoveObserver(NetworkStateHandlerObserver* observer);
 
-  // Returns true if technology for |type| is available/ enabled/uninitialized.
-  // kMatchTypeMobile (only) is also supported.
-  bool TechnologyAvailable(const std::string& type) const;
-  bool TechnologyEnabled(const std::string& type) const;
-  bool TechnologyUninitialized(const std::string& type) const;
+  // Returns the state for technology |type|. kMatchTypeMobile (only) is
+  // also supported.
+  TechnologyState GetTechnologyState(const std::string& type) const;
+  bool TechnologyEnabled(const std::string& type) const {

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

Shouldn't this be named something like "IsTechnologyEnabled"?

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

Done.

+    return GetTechnologyState(type) == TECHNOLOGY_ENABLED;
+  }
 
   // Asynchronously sets the technology enabled property for |type|.
   // kMatchTypeMobile (only) is also supported.
   // Note: Modifies Manager state. Calls |error_callback| on failure.
   void SetTechnologyEnabled(
       const std::string& type,
       bool enabled,
       const network_handler::ErrorCallback& error_callback);
 
   // Finds and returns a device state by |device_path| or NULL if not found.
@@ skipping 140 matching lines @@
 
   // Logs an event and notifies observers.
   void OnDefaultNetworkChanged();
 
   // Notifies observers and updates connecting_network_.
   void NetworkPropertiesUpdated(const NetworkState* network);
 
   // Called whenever Device.Scanning state transitions to false.
   void ScanCompleted(const std::string& type);
 
+  // Returns the technology type for |type|.
+  std::string TechnologyForType(const std::string& type) const;

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

Maybe GetTechnologyForType?  I think usually only the lower-case accessors are
named for the items they return rather than being a verb.

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

Done.

+
   // Shill property handler instance, owned by this class.
   scoped_ptr<internal::ShillPropertyHandler> shill_property_handler_;
 
   // Observer list
   ObserverList<NetworkStateHandlerObserver> observers_;
 
   // Lists of managed states
   ManagedStateList network_list_;
   ManagedStateList device_list_;
 
   // Keeps track of the default network for notifying observers when it changes.
   std::string default_network_path_;
 
   // Convenience member to track the user initiated connecting network. Set
   // externally when a connection is requested and cleared here when the state
   // changes to something other than Connecting (after observers are notified).
   // TODO(stevenjb): Move this to NetworkConfigurationHandler.
   std::string connecting_network_;
 
   // Callbacks to run when a scan for the technology type completes.
   ScanCompleteCallbackMap scan_complete_callbacks_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkStateHandler);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_HANDLER_H_