Autoconnect policy for CrOS.

chromeos/network/policy_applicator.h

Index: chromeos/network/policy_applicator.h
diff --git a/chromeos/network/policy_applicator.h b/chromeos/network/policy_applicator.h
index ea423f6455b4e99707a071cd1b89260ba4ca85cb..f433233c095386cd840d1e5cf4eaf490127abb02 100644
--- a/chromeos/network/policy_applicator.h
+++ b/chromeos/network/policy_applicator.h
@@ -11,12 +11,9 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
+#include "base/values.h"
 #include "chromeos/network/network_profile.h"
 
-namespace base {
-class DictionaryValue;
-}
-
 namespace chromeos {
 
 // This class compares (entry point is Run()) |modified_policies| with the
@@ -36,6 +33,10 @@ class PolicyApplicator : public base::RefCounted<PolicyApplicator> {
      virtual void CreateConfigurationFromPolicy(
          const base::DictionaryValue& shill_properties) = 0;
 
+     virtual void UpdateExistingConfigurationWithPropertiesFromPolicy(
+         const base::DictionaryValue& existing_properties,
+         const base::DictionaryValue& new_properties) = 0;
+
     private:
      DISALLOW_ASSIGN(ConfigurationHandler);
   };
@@ -46,6 +47,7 @@ class PolicyApplicator : public base::RefCounted<PolicyApplicator> {
   PolicyApplicator(base::WeakPtr<ConfigurationHandler> handler,
                    const NetworkProfile& profile,
                    const GuidToPolicyMap& all_policies,
+                   const base::DictionaryValue& global_network_config,
                    std::set<std::string>* modified_policies);
 
   void Run();
@@ -74,6 +76,13 @@ class PolicyApplicator : public base::RefCounted<PolicyApplicator> {
       const base::DictionaryValue& policy,
       const base::DictionaryValue* user_settings);
 
+  // Adds properties to |properties_to_update|, which are enforced on unamaged
+  // networks by the global network config of the policy. |entry_properties| are

[bartfab (slow), 2013/10/17 11:57:58]

Nit: The comment talks about "unmanaged networks" in the plural but the
properties it returns are actually applicable to the specific network whose
|entry_properties| were provided as an input.

+  // the current properties read from the network's profile entry.
+  void GetPropertiesForUnmanagedEntry(
+      const base::DictionaryValue& entry_properties,
+      base::DictionaryValue* properties_to_update) const;
+
   // Called once all Profile entries are processed. Calls
   // ApplyRemainingPolicies.
   virtual ~PolicyApplicator();
@@ -86,6 +95,7 @@ class PolicyApplicator : public base::RefCounted<PolicyApplicator> {
   base::WeakPtr<ConfigurationHandler> handler_;
   NetworkProfile profile_;
   GuidToPolicyMap all_policies_;
+  base::DictionaryValue global_network_config_;
 
   DISALLOW_COPY_AND_ASSIGN(PolicyApplicator);
 };