Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Unified Diff: chrome/browser/policy/configuration_policy_provider_mac.h

Issue 8258018: Generate Chrome policy definition list from policy_templates.json. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the unittest fix Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/policy/configuration_policy_provider_mac.h
diff --git a/chrome/browser/policy/configuration_policy_provider_mac.h b/chrome/browser/policy/configuration_policy_provider_mac.h
index 531335fd52b390abd1a19bcc2af2b15b0c246b81..95f737b8f8504c7432e73201179888fe7bf4ee7a 100644
--- a/chrome/browser/policy/configuration_policy_provider_mac.h
+++ b/chrome/browser/policy/configuration_policy_provider_mac.h
@@ -20,7 +20,7 @@ class MacPreferencesPolicyProviderDelegate
// Takes ownership of |preferences|.
MacPreferencesPolicyProviderDelegate(
MacPreferences* preferences,
- const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list);
+ const PolicyDefinitionList* policy_list);
virtual ~MacPreferencesPolicyProviderDelegate();
// FileBasedPolicyLoader::Delegate implementation.
@@ -33,7 +33,7 @@ class MacPreferencesPolicyProviderDelegate
// Unfortunately, we cannot get the policy list at load time from the
// provider, because the loader may outlive the provider, so we store our own
// pointer to the list.
- const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list_;
+ const PolicyDefinitionList* policy_list_;
scoped_ptr<MacPreferences> preferences_;
@@ -45,11 +45,10 @@ class MacPreferencesPolicyProviderDelegate
class ConfigurationPolicyProviderMac : public FileBasedPolicyProvider {
public:
explicit ConfigurationPolicyProviderMac(
- const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list);
+ const PolicyDefinitionList* policy_list);
// For testing; takes ownership of |preferences|.
- ConfigurationPolicyProviderMac(
- const ConfigurationPolicyProvider::PolicyDefinitionList* policy_list,
- MacPreferences* preferences);
+ ConfigurationPolicyProviderMac(const PolicyDefinitionList* policy_list,
+ MacPreferences* preferences);
DISALLOW_COPY_AND_ASSIGN(ConfigurationPolicyProviderMac);
};

Powered by Google App Engine
This is Rietveld 408576698