Merge FavoriteState into NetworkState

chromeos/dbus/shill_manager_client.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_DBUS_SHILL_MANAGER_CLIENT_H_
 #define CHROMEOS_DBUS_SHILL_MANAGER_CLIENT_H_
 
 #include <string>
 
 #include "base/basictypes.h"
@@ skipping 44 matching lines @@
     virtual void AddProfile(const std::string& profile_path) = 0;
 
     // Used to reset all properties; does not notify observers.
     virtual void ClearProperties() = 0;
 
     // Set manager property.
     virtual void SetManagerProperty(const std::string& key,
                                     const base::Value& value) = 0;
 
     // Modify services in the Manager's list.
-    virtual void AddManagerService(const std::string& service_path,
-                                   bool add_to_visible_list) = 0;
-    virtual void RemoveManagerService(const std::string& service_path,
-                                      bool remove_from_complete_list) = 0;
+    virtual void AddManagerService(const std::string& service_path) = 0;
+    virtual void RemoveManagerService(const std::string& service_path) = 0;
     virtual void ClearManagerServices() = 0;
 
     // Called by ShillServiceClient when a service's State property changes,
     // before notifying observers. Sets the DefaultService property to empty
     // if the state changes to a non-connected state.
     virtual void ServiceStateChanged(const std::string& service_path,
                                      const std::string& state) = 0;
 
-    // Called by ShillServiceClient when a service's State property changes,
-    // after notifying observers. Services are sorted first by Active or
-    // Inactive State, then by Type.
-    virtual void SortManagerServices() = 0;
+    // Called by ShillServiceClient when a service's State property changes.
+    // If |notify| is true, notifies observers if a list changed. Services are
+    // sorted first by active, inactive, or disabled state, then by type.
+    virtual void SortManagerServices(bool notify) = 0;
 
     // Sets up the default fake environment based on default initial states
     // or states provided by the command line.
     virtual void SetupDefaultEnvironment() = 0;
 
     // Returns the interactive delay specified on the command line, 0 for none.
     virtual int GetInteractiveDelay() const = 0;
 
     // Sets the 'best' service to connect to on a ConnectToBestServices call.
     virtual void SetBestServiceToConnect(const std::string& service_path) = 0;
@@ skipping 140 matching lines @@
   // Create() should be used instead.
   ShillManagerClient();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ShillManagerClient);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_SHILL_MANAGER_CLIENT_H_