This updates the StaticIP configuration UI to match new mocks.

chrome/browser/chromeos/cros/network_library.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 CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 #define CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_
 
 #include <map>
 #include <string>
 #include <vector>
@@ skipping 1204 matching lines @@
 // This class handles the interaction with the ChromeOS network library APIs.
 // Classes can add themselves as observers. Users can get an instance of the
 // library like this: chromeos::CrosLibrary::Get()->GetNetworkLibrary()
 class NetworkLibrary {
  public:
   enum HardwareAddressFormat {
     FORMAT_RAW_HEX,
     FORMAT_COLON_SEPARATED_HEX
   };
 
+  // Used to configure which IP parameters will be specified by DHCP and which
+  // will be set by the user.
+  enum UseDHCP {
+    USE_DHCP_ADDRESS      = 0x1,
+    USE_DHCP_NETMASK      = 0x1 << 1,
+    USE_DHCP_GATEWAY      = 0x1 << 2,
+    USE_DHCP_NAME_SERVERS = 0x1 << 3,
+    USE_DHCP_ALL_ROUTING_INFO =
+        (USE_DHCP_ADDRESS |
+         USE_DHCP_NETMASK |
+         USE_DHCP_GATEWAY),
+  };
+
   class NetworkManagerObserver {
    public:
     // Called when the state of the network manager has changed,
     // for example, networks have appeared or disappeared.
     virtual void OnNetworkManagerChanged(NetworkLibrary* obj) = 0;
    protected:
     virtual ~NetworkManagerObserver() { }
   };
 
   class NetworkObserver {
@@ skipping 414 matching lines @@
 
   // Fetches IP configs and hardware address for a given device_path.
   // The hardware address is usually a MAC address like "0011AA22BB33".
   // |hardware_address| will be an empty string, if no hardware address is
   // found.
   virtual NetworkIPConfigVector GetIPConfigs(
       const std::string& device_path,
       std::string* hardware_address,
       HardwareAddressFormat) = 0;
 
-  // Sets an IP config. This is called when user changes from dhcp to static
-  // or vice versa or when user changes the ip config info.
-  // If nothing is changed, this method does nothing.
-  virtual void SetIPConfig(const NetworkIPConfig& ipconfig) = 0;
+  // Sets the configuration of the IP parameters. This is called when user
+  // changes IP settings from dhcp to static or vice versa or when user changes
+  // the ip config info. If nothing is changed, this method does nothing.
+  // |dhcp_usage_mask| is a bitmask composed of items from the UseDHCP enum, and
+  // indicates which of the supplied values are overridden by values given by
+  // the default IP acquisition technique for the service (DHCP, usually).
+  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) = 0;
 
   // This will connect to a preferred network if the currently connected
   // network is not preferred. This should be called when the active profile
   // changes.
   virtual void SwitchToPreferredNetwork() = 0;
 
   // Load networks from an Open Network Configuration blob.
   // If there was an error, this will return false and |error| will be set to
   // the error message.
   virtual bool LoadOncNetworks(const std::string& onc_blob,
@@ skipping 10 matching lines @@
                                 const std::string& service_path) = 0;
 
   // Factory function, creates a new instance and returns ownership.
   // For normal usage, access the singleton via CrosLibrary::Get().
   static NetworkLibrary* GetImpl(bool stub);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_CROS_NETWORK_LIBRARY_H_