Merge FavoriteState into NetworkState

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 5a78f190fa5e18eeee111234856ae60419a740ea..e72a94dfee1ea6f209da72ef47871accf5086895 100644
--- a/chromeos/network/shill_property_handler.h
+++ b/chromeos/network/shill_property_handler.h
@@ -50,6 +50,9 @@ class CHROMEOS_EXPORT ShillPropertyHandler
     virtual void UpdateManagedList(ManagedState::ManagedType type,
                                    const base::ListValue& entries) = 0;
 
+    // Called when the entries in the visible network list have changed.
+    virtual void UpdateVisibleNetworks(const base::ListValue& entries) = 0;
+
     // Called when the properties for a managed state have changed.
     virtual void UpdateManagedStateProperties(
         ManagedState::ManagedType type,
@@ -156,13 +159,7 @@ class CHROMEOS_EXPORT ShillPropertyHandler
   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);
 
@@ -235,6 +232,11 @@ class CHROMEOS_EXPORT ShillPropertyHandler
   // List of network services with Shill property changed observers
   ShillPropertyObserverMap observed_networks_;
 
+  // Tracks the number of newly added observed visible networks. Used to send a
+  // request to Shill for the complete list of networks when new visible
+  // networks appear.
+  size_t new_observed_networks_;

[pneubeck (no reviews), 2014/06/10 10:51:37]

never read?

[stevenjb, 2014/06/10 16:17:28]

Oops. Was used at one point, turned out to be unnecessary. Removed.

+
   // List of network devices with Shill property changed observers
   ShillPropertyObserverMap observed_devices_;