Cleanup network type matching.

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 30 matching lines @@
 //
 // This class maps essential properties from the connection manager (Shill) for
 // each visible network. It is not used to change the properties of services or
 // devices, only global (manager) properties.
 //
 // All getters return the currently cached properties. This class is expected to
 // keep properties up to date by managing the appropriate Shill observers.
 // It will invoke its own more specific observer methods when the specified
 // changes occur.
 //
-// Most *ByType or *ForType methods will accept any of the following  for
-// |type|. See individual methods for specific notes.
+// Most *ByType or *ForType methods will accept any of the following for |type|.
+// See individual methods for specific notes.
 // * Any type defined in service_constants.h (e.g. flimflam::kTypeWifi)
 // * kMatchTypeDefault returns the default (active) network
 // * kMatchTypeNonVirtual returns the primary non virtual network
+// * kMatchTypeWired returns the primary wired 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;
   typedef std::vector<const DeviceState*> DeviceStateList;
   typedef std::vector<const FavoriteState*> FavoriteStateList;
@@ skipping 12 matching lines @@
   void AddObserver(NetworkStateHandlerObserver* observer,
                    const tracked_objects::Location& from_here);
   void RemoveObserver(NetworkStateHandlerObserver* observer,
                       const tracked_objects::Location& from_here);
 
   // Requests all Manager properties, specifically to update the complete
   // list of services which determines the list of Favorites. This should be
   // called any time a new service is configured or a Profile is loaded.
   void UpdateManagerProperties();
 
-  // Returns the state for technology |type|. kMatchTypeMobile (only) is
-  // also supported.
+  // Returns the state for technology |type|. kMatchTypeMobile and
+  // kMatchTypeWired (and no other kMatchType*) are also supported.
   TechnologyState GetTechnologyState(const std::string& type) const;
   bool IsTechnologyAvailable(const std::string& type) const {
     return GetTechnologyState(type) != TECHNOLOGY_UNAVAILABLE;
   }
   bool IsTechnologyEnabled(const std::string& type) const {
     return GetTechnologyState(type) == TECHNOLOGY_ENABLED;
   }
 
   // Asynchronously sets the technology enabled property for |type|.
-  // kMatchTypeMobile (only) is also supported.
+  // kMatchTypeMobile and kMatchTypeWired (and no other kMatchType*) are 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.
   const DeviceState* GetDeviceState(const std::string& device_path) const;
 
   // Finds and returns a device state by |type|. Returns NULL if not found.
@@ skipping 89 matching lines @@
 
   // Generates a DictionaryValue of all NetworkState properties. Currently
   // provided for debugging purposes only.
   void GetNetworkStatePropertiesForTest(
       base::DictionaryValue* dictionary) const;
 
   // Construct and initialize an instance for testing.
   static NetworkStateHandler* InitializeForTest();
 
   static const char kMatchTypeDefault[];
+  static const char kMatchTypeWired[];
   static const char kMatchTypeWireless[];
   static const char kMatchTypeMobile[];
   static const char kMatchTypeNonVirtual[];
 
   // Default set of comma separated interfaces on which to enable
   // portal checking.
   static const char kDefaultCheckPortalList[];
 
  protected:
   friend class NetworkHandler;
@@ skipping 115 matching lines @@
 
   // 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_