This updates the StaticIP configuration UI to match new mocks.

chrome/browser/chromeos/cros/network_library_impl_cros.h

Index: chrome/browser/chromeos/cros/network_library_impl_cros.h
diff --git a/chrome/browser/chromeos/cros/network_library_impl_cros.h b/chrome/browser/chromeos/cros/network_library_impl_cros.h
index 692caa37c6c100ca96fa38a9ee11082c0c79bf22..30a34e1922b21bca91d35f3083e4c66e310f80f2 100644
--- a/chrome/browser/chromeos/cros/network_library_impl_cros.h
+++ b/chrome/browser/chromeos/cros/network_library_impl_cros.h
@@ -14,6 +14,16 @@ class NetworkLibraryImplCros : public NetworkLibraryImplBase  {
   NetworkLibraryImplCros();
   virtual ~NetworkLibraryImplCros();
 
+  // Structure used to pass IP parameter info to a DoSetIPParameters callback,
+  // since Bind only takes up to six parameters.
+  struct IPParameterInfo {
+    std::string address;
+    std::string netmask;
+    std::string gateway;
+    std::string name_servers;
+    int dhcp_usage_mask;
+  };
+
   virtual void Init() OVERRIDE;
   virtual bool IsCros() const OVERRIDE;
 
@@ -28,7 +38,7 @@ class NetworkLibraryImplCros : public NetworkLibraryImplBase  {
       const std::string& device_path) OVERRIDE;
 
   virtual void CallConfigureService(const std::string& identifier,
-                                    const DictionaryValue* info) OVERRIDE;
+                                    const base::DictionaryValue* info) OVERRIDE;
   virtual void CallConnectToNetwork(Network* network) OVERRIDE;
   virtual void CallRequestWifiNetworkAndConnect(
       const std::string& ssid, ConnectionSecurity security) OVERRIDE;
@@ -73,7 +83,12 @@ class NetworkLibraryImplCros : public NetworkLibraryImplBase  {
       const std::string& device_path,
       std::string* hardware_address,
       HardwareAddressFormat format) OVERRIDE;
-  virtual void SetIPConfig(const NetworkIPConfig& ipconfig) OVERRIDE;
+  virtual void SetIPParameters(const std::string& service_path,
+                               const std::string& address,
+                               const std::string& netmask,
+                               const std::string& gateway,
+                               const std::string& name_servers,
+                               int dhcp_usage_mask) OVERRIDE;
 
   //////////////////////////////////////////////////////////////////////////////
   // Callbacks.
@@ -116,6 +131,13 @@ class NetworkLibraryImplCros : public NetworkLibraryImplBase  {
   void NetworkDeviceUpdate(const std::string& device_path,
                            const base::DictionaryValue* properties);
 
+  // Second half of setting IP Parameters.  SetIPParameters above kicks off
+  // an async information fetch, and this completes the operation when that
+  // fetch is complete.
+  void SetIPParametersCallback(const IPParameterInfo& info,
+                               const std::string& service_path,
+                               const base::DictionaryValue* properties);

[stevenjb, 2012/08/13 17:43:44]

Does this need to be part of the public API? If so, then I suggest having
SetIPParameters also use IPParemeterInfo. Otherwise I would make this and
IPParemeterInfo private (and forward declare IPParemeterInfo, defining it in the
C++ file).

[Greg Spencer (Chromium), 2012/08/13 23:53:44]

No, I guess it doesn't.  I had thought that it needed to be public for Bind to
work, but I guess not.  Fixed.

+
   // Second half of refreshing IPConfig for a network.  Refreshes all IP config
   // paths found in properties.
   void RefreshIPConfigCallback(const std::string& device_path,
@@ -124,29 +146,29 @@ class NetworkLibraryImplCros : public NetworkLibraryImplBase  {
  private:
   // This processes all Manager update messages.
   bool NetworkManagerStatusChanged(const std::string& key, const Value* value);
-  void ParseNetworkManager(const DictionaryValue& dict);
-  void UpdateTechnologies(const ListValue* technologies, int* bitfieldp);
-  void UpdateAvailableTechnologies(const ListValue* technologies);
-  void UpdateEnabledTechnologies(const ListValue* technologies);
-  void UpdateConnectedTechnologies(const ListValue* technologies);
+  void ParseNetworkManager(const base::DictionaryValue& dict);
+  void UpdateTechnologies(const base::ListValue* technologies, int* bitfieldp);
+  void UpdateAvailableTechnologies(const base::ListValue* technologies);
+  void UpdateEnabledTechnologies(const base::ListValue* technologies);
+  void UpdateConnectedTechnologies(const base::ListValue* technologies);
 
   // Update network lists.
-  void UpdateNetworkServiceList(const ListValue* services);
-  void UpdateWatchedNetworkServiceList(const ListValue* services);
+  void UpdateNetworkServiceList(const base::ListValue* services);
+  void UpdateWatchedNetworkServiceList(const base::ListValue* services);
   Network* ParseNetwork(const std::string& service_path,
-                        const DictionaryValue& info);
+                        const base::DictionaryValue& info);
 
-  void UpdateRememberedNetworks(const ListValue* profiles);
+  void UpdateRememberedNetworks(const base::ListValue* profiles);
   void RequestRememberedNetworksUpdate();
   void UpdateProfile(const std::string& profile_path,
-                     const DictionaryValue* properties);
+                     const base::DictionaryValue* properties);
   Network* ParseRememberedNetwork(const std::string& service_path,
-                                  const DictionaryValue& info);
+                                  const base::DictionaryValue& info);
 
   // NetworkDevice list management functions.
-  void UpdateNetworkDeviceList(const ListValue* devices);
+  void UpdateNetworkDeviceList(const base::ListValue* devices);
   void ParseNetworkDevice(const std::string& device_path,
-                          const DictionaryValue& info);
+                          const base::DictionaryValue& info);
 
   // Empty device observer to ensure that device property updates are received.
   class NetworkLibraryDeviceObserver : public NetworkDeviceObserver {