| Index: chrome/browser/policy/configuration_policy_pref_store.h
|
| diff --git a/chrome/browser/policy/configuration_policy_pref_store.h b/chrome/browser/policy/configuration_policy_pref_store.h
|
| index 83ab847b1e2f4ee7b3d75f89a9cadff47d3c08e2..85edeec4eb4a311edaca7027e6f0650d39232acb 100644
|
| --- a/chrome/browser/policy/configuration_policy_pref_store.h
|
| +++ b/chrome/browser/policy/configuration_policy_pref_store.h
|
| @@ -41,9 +41,9 @@ class ConfigurationPolicyPrefStore : public PrefStore,
|
| // Creates a ConfigurationPolicyPrefStore that reads recommended policy.
|
| static ConfigurationPolicyPrefStore* CreateRecommendedPolicyPrefStore();
|
|
|
| - // Returns the default policy value map for Chrome.
|
| - static ConfigurationPolicyProvider::StaticPolicyValueMap
|
| - GetChromePolicyValueMap();
|
| + // Returns the default policy definition list for Chrome.
|
| + static ConfigurationPolicyProvider::PolicyDefinitionList*
|
| + GetChromePolicyDefinitionList();
|
|
|
| typedef std::set<const char*> ProxyPreferenceSet;
|
|
|
| @@ -64,8 +64,8 @@ class ConfigurationPolicyPrefStore : public PrefStore,
|
| static const PolicyToPreferenceMapEntry simple_policy_map_[];
|
| static const PolicyToPreferenceMapEntry proxy_policy_map_[];
|
| static const PolicyToPreferenceMapEntry default_search_policy_map_[];
|
| - static const ConfigurationPolicyProvider::StaticPolicyValueMap
|
| - policy_value_map_;
|
| + static const ConfigurationPolicyProvider::PolicyDefinitionList
|
| + policy_definition_list_;
|
|
|
| ConfigurationPolicyProvider* provider_;
|
| scoped_ptr<DictionaryValue> prefs_;
|
|
|