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

Unified Diff: components/policy/core/common/cloud/cloud_policy_validator.h

Issue 108563005: Move the cloud policy protobufs into the component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixes Created 7 years 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: components/policy/core/common/cloud/cloud_policy_validator.h
diff --git a/components/policy/core/common/cloud/cloud_policy_validator.h b/components/policy/core/common/cloud/cloud_policy_validator.h
index 6e43b91c42f6107ead2581e7e37bb90cdf36861b..9f2870d724a48c7883c6b0ce1a8ddec5745edf40 100644
--- a/components/policy/core/common/cloud/cloud_policy_validator.h
+++ b/components/policy/core/common/cloud/cloud_policy_validator.h
@@ -15,10 +15,13 @@
#include "base/memory/scoped_ptr.h"
#include "base/sequenced_task_runner.h"
#include "base/time/time.h"
-#include "chrome/browser/policy/proto/cloud/chrome_extension_policy.pb.h"
#include "components/policy/policy_export.h"
#include "policy/proto/cloud_policy.pb.h"
+#if !defined(OS_ANDROID)
+#include "policy/proto/chrome_extension_policy.pb.h"
+#endif
+
namespace base {
class MessageLoopProxy;
}
@@ -296,8 +299,11 @@ class POLICY_EXPORT CloudPolicyValidator : public CloudPolicyValidatorBase {
typedef CloudPolicyValidator<enterprise_management::CloudPolicySettings>
UserCloudPolicyValidator;
+
+#if !defined(OS_ANDROID)
typedef CloudPolicyValidator<enterprise_management::ExternalPolicyData>
ComponentCloudPolicyValidator;
+#endif
} // namespace policy

Powered by Google App Engine
This is Rietveld 408576698