NetworkChangeNotifierChromeos: Handle IPConfig property changes on the default network

chromeos/network/network_state.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_NETWORK_STATE_H_
 #define CHROMEOS_NETWORK_NETWORK_STATE_H_
 
+#include <string>
+#include <vector>
+
 #include "chromeos/network/managed_state.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 
 // Simple class to provide network state information about a network service.
 // This class should always be passed as a const* and should never be held
@@ skipping 11 matching lines @@
                                const base::Value& value) OVERRIDE;
 
   // Fills |dictionary| with the state properties. All the properties that are
   // accepted by PropertyChanged are stored in |dictionary|, no other values are
   // stored.
   void GetProperties(base::DictionaryValue* dictionary) const;
 
   // Accessors
   const std::string& security() const { return security_; }
   const std::string& ip_address() const { return ip_address_; }
+  const std::vector<std::string>& dns_servers() const { return dns_servers_; }
   const std::string& device_path() const { return device_path_; }
   const std::string& guid() const { return guid_; }
   const std::string& connection_state() const { return connection_state_; }
   const std::string& error() const { return error_; }
   bool auto_connect() const { return auto_connect_; }
   bool favorite() const { return favorite_; }
   int priority() const { return priority_; }
   // Wireless property accessors
   int signal_strength() const { return signal_strength_; }
   // Cellular property accessors
   const std::string& technology() const { return technology_; }
   const std::string& activation_state() const { return activation_state_; }
   const std::string& roaming() const { return roaming_; }
   bool activate_over_non_cellular_networks() const {
     return activate_over_non_cellular_networks_;
   }
   bool cellular_out_of_credits() const { return cellular_out_of_credits_; }
 
   bool IsConnectedState() const;
   bool IsConnectingState() const;
 
   // Helpers (used e.g. when a state is cached)
   static bool StateIsConnected(const std::string& connection_state);
   static bool StateIsConnecting(const std::string& connection_state);
 
+  // Helper to return a full prefixed version of an IPConfig property
+  // key.
+  static std::string IPConfigProperty(const char* key);
+
  private:
   friend class NetworkStateHandler;
   friend class NetworkChangeNotifierChromeosUpdateTest;
 
   // Called by NetworkStateHandler when the ip config changes.
   void set_ip_address(const std::string& ip_address) {
     ip_address_ = ip_address;
   }
+  void set_dns_servers(const std::vector<std::string>& dns_servers) {
+    dns_servers_ = dns_servers;
+  }
 
   // Common Network Service properties
   std::string security_;
   std::string device_path_;
   std::string guid_;
-  std::string ip_address_;
   std::string connection_state_;
   std::string error_;
   bool auto_connect_;
   bool favorite_;
   int priority_;
+  // IPConfig properties.
+  // Note: These do not correspond to actual Shill.Service properties
+  // but are derived from the service's corresponding IPConfig object.
+  std::string ip_address_;
+  std::vector<std::string> dns_servers_;
   // Wireless properties
   int signal_strength_;
   // Cellular properties
   std::string technology_;
   std::string activation_state_;
   std::string roaming_;
   bool activate_over_non_cellular_networks_;
   bool cellular_out_of_credits_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkState);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_NETWORK_STATE_H_