Provide IPConfigs in networkingPrivate.GetProperties

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 53 matching lines @@
         const std::string& service_path,
         const std::string& key,
         const base::Value& value) = 0;
 
     // Called when a property for a watched device has changed.
     virtual void UpdateDeviceProperty(
         const std::string& device_path,
         const std::string& key,
         const base::Value& value) = 0;
 
+    // Called when a watched network or device IPConfig property changes.
+    virtual void UpdateIPConfigProperites(
+        ManagedState::ManagedType type,
+        const std::string& path,
+        const std::string& ip_config_path,
+        const base::DictionaryValue& properties) = 0;
+
     // Called when the list of devices with portal check enabled changes.
     virtual void CheckPortalListChanged(
          const std::string& check_portal_list) = 0;
 
     // Called when a technology list changes.
     virtual void TechnologyListChanged() = 0;
 
     // Called when a managed state list has changed, after properties for any
     // new entries in the list have been received and
     // UpdateManagedStateProperties has been called for each new entry.
@@ skipping 96 matching lines @@
                              const std::string& path,
                              DBusMethodCallStatus call_status,
                              const base::DictionaryValue& properties);
 
   // Callback invoked when a watched property changes. Calls appropriate
   // handlers and signals observers.
   void PropertyChangedCallback(ManagedState::ManagedType type,
                                const std::string& path,
                                const std::string& key,
                                const base::Value& value);
-  void NetworkServicePropertyChangedCallback(const std::string& path,
-                                             const std::string& key,
-                                             const base::Value& value);
 
-  // Callback for getting the IPConfig property of a Network. Handled here
-  // instead of in NetworkState so that all asynchronous requests are done
+  // Request a single IPConfig property from Shill.IPConfigClient.
+  void RequestIPConfig(ManagedState::ManagedType type,
+                       const std::string& path,
+                       const base::Value& value);
+
+  // Request a list IPConfig properties from Shill.IPConfigClient.
+  void RequestIPConfigsList(ManagedState::ManagedType type,
+                            const std::string& path,
+                            const base::Value& value);
+
+  // Callback for getting the IPConfig property of a network or device. Handled
+  // here instead of in NetworkState so that all asynchronous requests are done
   // in a single place (also simplifies NetworkState considerably).
-  void GetIPConfigCallback(const std::string& service_path,
+  void GetIPConfigCallback(ManagedState::ManagedType type,
+                           const std::string& path,
+                           const std::string& ip_config_path,
                            DBusMethodCallStatus call_status,
                            const base::DictionaryValue& properties);
-  void UpdateIPConfigProperty(const std::string& service_path,
-                              const base::DictionaryValue& properties,
-                              const char* property);
-
-  void NetworkDevicePropertyChangedCallback(const std::string& path,
-                                            const std::string& key,
-                                            const base::Value& value);
 
   // Pointer to containing class (owns this)
   Listener* listener_;
 
   // Convenience pointer for ShillManagerClient
   ShillManagerClient* shill_manager_;
 
   // Pending update list for each managed state type
   TypeRequestMap pending_updates_;
 
@@ skipping 13 matching lines @@
   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_