Resubmit CL. See 8429004.

chrome/browser/chromeos/cros/network_library.h

 // Copyright (c) 2011 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_
 #pragma once
 
+#include <map>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "base/string16.h"
@@ skipping 105 matching lines @@
   PROPERTY_INDEX_ROAMING_STATE,
   PROPERTY_INDEX_SAVE_CREDENTIALS,
   PROPERTY_INDEX_SCANNING,
   PROPERTY_INDEX_SECURITY,
   PROPERTY_INDEX_SELECTED_NETWORK,
   PROPERTY_INDEX_SERVICES,
   PROPERTY_INDEX_SERVICE_WATCH_LIST,
   PROPERTY_INDEX_SERVING_OPERATOR,
   PROPERTY_INDEX_SIGNAL_STRENGTH,
   PROPERTY_INDEX_SIM_LOCK,
+  PROPERTY_INDEX_SSID,
   PROPERTY_INDEX_STATE,
   PROPERTY_INDEX_SUPPORT_NETWORK_SCAN,
   PROPERTY_INDEX_TECHNOLOGY_FAMILY,
   PROPERTY_INDEX_TYPE,
   PROPERTY_INDEX_UI_DATA,
   PROPERTY_INDEX_UNKNOWN,
   PROPERTY_INDEX_USAGE_URL,
   PROPERTY_INDEX_OLP,
   PROPERTY_INDEX_OPEN_VPN_USER,
   PROPERTY_INDEX_OPEN_VPN_PASSWORD,
@@ skipping 522 matching lines @@
                             const base::Value& value,
                             PropertyIndex* index);
 
  protected:
   Network(const std::string& service_path,
           ConnectionType type);
 
   NetworkParser* network_parser() { return network_parser_.get(); }
   void SetNetworkParser(NetworkParser* parser);
 
+  // Updates property_map_ for the corresponding property index.
+  void UpdatePropertyMap(PropertyIndex index, const base::Value& value);
+
   // Set the state and update flags if necessary.
   void SetState(ConnectionState state);
 
   // Parse name/value pairs from libcros.
   virtual void ParseInfo(const base::DictionaryValue& info);
 
   // Erase cached credentials, used when "Save password" is unchecked.
   virtual void EraseCredentials();
 
   // Calculate a unique identifier for the network.
   virtual void CalculateUniqueId();
 
   // Methods to asynchronously set network service properties
   virtual void SetStringProperty(const char* prop, const std::string& str,
                                  std::string* dest);
   virtual void SetBooleanProperty(const char* prop, bool b, bool* dest);
   virtual void SetIntegerProperty(const char* prop, int i, int* dest);
   virtual void SetValueProperty(const char* prop, base::Value* val);
   virtual void ClearProperty(const char* prop);
 
   // This will clear the property if string is empty. Otherwise, it will set it.
   virtual void SetOrClearStringProperty(const char* prop,
                                         const std::string& str,
                                         std::string* dest);
 
   void set_unique_id(const std::string& unique_id) { unique_id_ = unique_id; }
   DictionaryValue* ui_data() { return &ui_data_; }
 
  private:
+  typedef std::map<PropertyIndex, base::Value*> PropertyMap;
+
   // This allows NetworkParser and its subclasses access to device
   // privates so that they can be reconstituted during parsing.  The
   // parsers only access things through the private set_ functions so
   // that this class can evolve without having to change all the
   // parsers.
   friend class NetworkParser;
   friend class NativeNetworkParser;
   friend class NativeVirtualNetworkParser;
   friend class OncNetworkParser;
   friend class OncVirtualNetworkParser;
@@ skipping 74 matching lines @@
 
   // UI-level state that is opaque to the connection manager. It's kept in a
   // DictionaryValue to allow for simple addition of new settings. The value is
   // stored in JSON-serialized from in the connection manager.
   DictionaryValue ui_data_;
 
   // This is the parser we use to parse messages from the native
   // network layer.
   scoped_ptr<NetworkParser> network_parser_;
 
+  // This map stores the set of properties for the network.
+  // Not all properties in this map are exposed via get methods.
+  PropertyMap property_map_;
+
   DISALLOW_COPY_AND_ASSIGN(Network);
 };
 
 // Class for networks of TYPE_ETHERNET.
 class EthernetNetwork : public Network {
  public:
   explicit EthernetNetwork(const std::string& service_path);
  private:
   // This allows the implementation classes access to privates.
   NETWORK_LIBRARY_IMPL_FRIENDS;
@@ skipping 932 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_