Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chromeos / network / network_profile_handler.h

diff --git a/src/chromeos/network/network_profile_handler.h b/src/chromeos/network/network_profile_handler.h
index dcbbea9..4d088bd 100644 (file)
--- a/src/chromeos/network/network_profile_handler.h
+++ b/src/chromeos/network/network_profile_handler.h
@@ -5,6 +5,7 @@
 #ifndef CHROMEOS_NETWORK_NETWORK_PROFILE_HANDLER_H_
 #define CHROMEOS_NETWORK_NETWORK_PROFILE_HANDLER_H_
 
+#include <set>
 #include <string>
 #include <vector>
 
@@ -42,7 +43,7 @@ class CHROMEOS_EXPORT NetworkProfileHandler
 
   // ShillPropertyChangedObserver overrides
   virtual void OnPropertyChanged(const std::string& name,
-                                 const base::Value& value) OVERRIDE;
+                                 const base::Value& value) override;
 
   void GetProfilePropertiesCallback(const std::string& profile_path,
                                     const base::DictionaryValue& properties);
@@ -60,6 +61,7 @@ class CHROMEOS_EXPORT NetworkProfileHandler
   static std::string GetSharedProfilePath();
 
  protected:
+  friend class AutoConnectHandlerTest;
   friend class ClientCertResolverTest;
   friend class NetworkConnectionHandlerTest;
   friend class NetworkHandler;
@@ -73,6 +75,11 @@ class CHROMEOS_EXPORT NetworkProfileHandler
 
  private:
   ProfileList profiles_;
+
+  // Contains the profile paths for which properties were requested. Once the
+  // properties are retrieved and the path is still in this set, a new profile
+  // object is created.
+  std::set<std::string> pending_profile_creations_;
   ObserverList<NetworkProfileObserver> observers_;
 
   // For Shill client callbacks