Merge FavoriteState into NetworkState

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 28 matching lines @@
 // This class must not outlive the ShillManagerClient instance.
 class CHROMEOS_EXPORT ShillPropertyHandler
     : public ShillPropertyChangedObserver,
       public base::SupportsWeakPtr<ShillPropertyHandler> {
  public:
   typedef std::map<std::string, ShillPropertyObserver*>
       ShillPropertyObserverMap;
 
   class CHROMEOS_EXPORT Listener {
    public:
-    // Called when the entries in a managed list have changed.
-    virtual void UpdateManagedList(ManagedState::ManagedType type,
-                                   const base::ListValue& entries) = 0;
+    // Called when the entries in the device list have changed.
+    virtual void UpdateManagedDevices(const base::ListValue& entries) = 0;
+
+    // Called when the entries in the service list have changed. If
+    // |complete_list| is true then |entries| represent the complete list of
+    // network services, otherwise it includes just the visible services.
+    virtual void UpdateManagedNetworks(const base::ListValue& entries,
+                                       bool complete_list) = 0;
 
     // Called when the properties for a managed state have changed.
     virtual void UpdateManagedStateProperties(
         ManagedState::ManagedType type,
         const std::string& path,
         const base::DictionaryValue& properties) = 0;
 
     // Called when the list of profiles changes.
     virtual void ProfileListChanged() = 0;
 
@@ skipping 87 matching lines @@
 
   // Notifies the listener when a ManagedStateList has changed and all pending
   // updates have been received. |key| can either identify the list that
   // has changed or an empty string if multiple lists may have changed.
   void CheckPendingStateListUpdates(const std::string& key);
 
   // Called form OnPropertyChanged() and ManagerPropertiesCallback().
   void ManagerPropertyChanged(const std::string& key,
                               const base::Value& value);
 
-  // Requests properties for new entries in the list for |type| as follows:
-  // * Any new Device objects for MANAGED_TYPE_DEVICE
-  // * Any new Service objects for MANAGED_TYPE_NETWORK
-  // * Additional new Service objects for MANAGED_TYPE_FAVORITE that were not
-  //   requested for MANAGED_TYPE_NETWORK (i.e. only request objects once).
-  // For this to avoid duplicate requests, this must be called with
-  // MANAGED_TYPE_NETWORK before MANAGED_TYPE_FAVORITE.
+  // Requests properties for new entries in the list for |type|.
   void UpdateProperties(ManagedState::ManagedType type,
                         const base::ListValue& entries);
 
   // 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);
@@ skipping 51 matching lines @@
 
   // Pending update list for each managed state type
   TypeRequestMap pending_updates_;
 
   // List of states for which properties have been requested, for each managed
   // state type
   TypeRequestMap requested_updates_;
 
   // List of network services with Shill property changed observers
   ShillPropertyObserverMap observed_networks_;
+  size_t new_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_